[Slim-Checkins] r11452 - /trunk/server/Slim/Networking/UPnP/ControlPoint.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Thu Feb 15 13:52:41 2007
New Revision: 11452

URL: http://svn.slimdevices.com?rev=11452&view=rev
Log:
Drop the use of SIGALRM when recv'ing from the UPnP socket

Modified:
    trunk/server/Slim/Networking/UPnP/ControlPoint.pm

Modified: trunk/server/Slim/Networking/UPnP/ControlPoint.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Networking/UPnP/ControlPoint.pm?rev=11452&r1=11451&r2=11452&view=diff
==============================================================================
--- trunk/server/Slim/Networking/UPnP/ControlPoint.pm (original)
+++ trunk/server/Slim/Networking/UPnP/ControlPoint.pm Thu Feb 15 13:52:41 2007
@@ -102,16 +102,10 @@
 	my $ssdp_res_msg;
 	my $log = logger('network.upnp');
 	
-	eval {
-		local $SIG{ALRM} = sub { die "recv timed out"; };
-		alarm 1;
-		$sock->recv( $ssdp_res_msg, 4096 ) or die "recv failed: $!";
-		alarm 0;
-	};
-
-	if ( $@ ) {
-
-		$log->warn("Read search result failed: $@");
+	my $addr = recv( $sock, $ssdp_res_msg, 4096, 0 );
+
+	if ( !defined $addr ) {
+		$log->warn("Read search result failed: $!");
 		return;
 	}