[Openvas-commits] r3516 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-05-28 15:07:01 +0200 (Thu, 28 May 2009)
New Revision: 3516

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/openvasmd.c
Log:
	* src/openvasmd.c (read_protocol): Use the right socket.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-05-28 12:48:07 UTC (rev 3515)
+++ trunk/openvas-manager/ChangeLog	2009-05-28 13:07:01 UTC (rev 3516)
@@ -1,5 +1,9 @@
 2009-05-28  Matthew Mundell <mmundell at intevation.de>
 
+	* src/openvasmd.c (read_protocol): Use the right socket.
+
+2009-05-28  Matthew Mundell <mmundell at intevation.de>
+
 	Timeout if reading the protocol takes too long.
 
 	* src/openvasmd.c (READ_PROTOCOL_TIMEOUT): New define.

Modified: trunk/openvas-manager/src/openvasmd.c
===================================================================
--- trunk/openvas-manager/src/openvasmd.c	2009-05-28 12:48:07 UTC (rev 3515)
+++ trunk/openvas-manager/src/openvasmd.c	2009-05-28 13:07:01 UTC (rev 3516)
@@ -309,10 +309,10 @@
       struct timeval timeout;
 
       FD_ZERO (&readfds);
-      FD_SET (manager_socket, &readfds);
+      FD_SET (client_socket, &readfds);
       FD_ZERO (&exceptfds);
-      FD_SET (manager_socket, &exceptfds);
-      nfds = manager_socket + 1;
+      FD_SET (client_socket, &exceptfds);
+      nfds = client_socket + 1;
 
       timeout.tv_usec = 0;
       timeout.tv_sec = READ_PROTOCOL_TIMEOUT - (time (NULL) - start_time);
@@ -331,12 +331,12 @@
         }
       if (select_ret > 0)
         {
-          if (FD_ISSET (manager_socket, &exceptfds))
+          if (FD_ISSET (client_socket, &exceptfds))
             {
               fprintf (stderr, "Exception in select.\n");
               break;
             }
-          if (FD_ISSET (manager_socket, &readfds))
+          if (FD_ISSET (client_socket, &readfds))
             {
               ssize_t count;