X-Git-Url: http://git.rot13.org/?p=Biblio-RFID.git;a=blobdiff_plain;f=scripts%2FRFID-JSONP-server.pl;fp=scripts%2FRFID-JSONP-server.pl;h=46abca958729fe2e8590780801966f72289f8cd5;hp=f5fc8bf7c4aefbb9e2712e0626bb0432ca71160c;hb=07407d8a1d12e6cf9d50ec84d018d9b4c6a6538d;hpb=ec011dbcb9305fd06c19e4dbd69d49e48eaa5b42

diff --git a/scripts/RFID-JSONP-server.pl b/scripts/RFID-JSONP-server.pl
index f5fc8bf..46abca9 100755
--- a/scripts/RFID-JSONP-server.pl
+++ b/scripts/RFID-JSONP-server.pl
@@ -78,16 +78,36 @@ sub rfid_borrower {
 }
 
 
+sub sip2_socket {
+
+	return $sip2->{sock} if exists $sip2->{sock} && $sip2->{sock}->connected;
+
+	if ( my $server = $sip2->{server} ) {
+		my $sock = $sip2->{sock} = IO::Socket::INET->new( $server ) || die "can't connect to $server: $!";
+		warn "SIP2 server ", $sock->peerhost, ":", $sock->peerport, "\n";
+
+		# login
+		if ( sip2_message("9300CN$sip2->{user}|CO$sip2->{password}|")->{fixed} !~ m/^941/ ) {
+			die "SIP2 login failed";
+		}
+
+	}
+	return $sip2->{sock};
+}
+
 sub sip2_message {
 	my $send = shift;
 
-	my $sock = $sip2->{sock} || die "no sip2 socket";
+send_again:
+	my $sock = sip2_socket || die "no sip2 socket";
 
 	local $/ = "\r";
 
 	$send .= "\r" unless $send =~ m/\r$/;
 	$send .= "\n" unless $send =~ m/\n$/;
 
+
+	my $retry = 0;
 	warn "SIP2 >>>> ",dump($send), "\n";
 	print $sock $send;
 	$sock->flush;
@@ -100,7 +120,16 @@ sub sip2_message {
 	$in =~ s/^\n//;
 	$in =~ s/\r$//;
 
-	die "empty read from SIP server" unless length $in > 1;
+	if ( ! $in ) {
+		$retry++;
+		warn "empty read from SIP server, retry: $retry\n";
+		if ( $retry < 10 ) {
+			close( $sip2->{sock} );
+			goto send_again;
+		}
+		die "aborted";
+	}
+
 
 	die "expected $expect" unless substr($in,0,2) != $expect;
 
@@ -118,16 +147,6 @@ sub sip2_message {
 	return $hash;
 }
 
-if ( my $server = $sip2->{server} ) {
-	my $sock = $sip2->{sock} = IO::Socket::INET->new( $server ) || die "can't connect to $server: $!";
-	warn "SIP2 server ", $sock->peerhost, ":", $sock->peerport, "\n";
-
-	# login
-	if ( sip2_message("9300CN$sip2->{user}|CO$sip2->{password}|")->{fixed} !~ m/^941/ ) {
-		die "SIP2 login failed";
-	}
-
-}
 
 use lib 'lib';
 use Biblio::RFID::RFID501;