From 64c5b64068b72a22e9030a67ebd351d63f83fce3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Fri, 19 Feb 2016 11:04:02 -0500
Subject: [PATCH] Log error before croaking and include port# in the error
 message

---
 .../lib/ZoneMinder/Trigger/Channel/Inet.pm    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
index 6c5f21961..0f977f3da 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
@@ -61,12 +61,21 @@ sub open
 {
     my $self = shift;
     local *sfh;
-    my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
-    socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') )
-        or croak( "Can't open socket: $!" );
+    if ( ! socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) ) {
+        Error( "Can't open socket: $!" );
+        croak( "Can't open socket: $!" );
+	}
     setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
-    bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-    listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
+
+    my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
+    if ( ! bind( *sfh, $saddr ) ) {
+		Error( "Can't bind to port $$self{port}: $!" );
+		croak( "Can't bind to port $$self{port}: $!" );
+	}
+    if ( ! listen( *sfh, SOMAXCONN ) ) {
+		Error( "Can't listen: $!" );
+		croak( "Can't listen: $!" );
+	}
     $self->{state} = 'open';
     $self->{handle} = *sfh;
 }
@@ -95,7 +104,7 @@ __END__
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Trigger::Channel::Inet
 
 =head1 SYNOPSIS