Changeset 170 for trunk/src/sh_portcheck.c

Timestamp:

Apr 30, 2008, 11:56:45 PM (17 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

File:

• trunk/src/sh_portcheck.c (modified) (21 diffs)

trunk/src/sh_portcheck.c

@@ -179 +179 @@
     }
 
-  val = (val <= 0 ? 60 : val);
-
   sh_portchk_interval = (time_t) val;
   SL_RETURN(0, _("sh_portchk_set_interval"));
@@ -251 +249 @@
 /* Interface to initialize port check
  */
-int sh_portchk_init ();
+int sh_portchk_init (struct mod_type * arg);
 
 /* Interface to reset port check
  */
-int sh_portchk_reset ();
+int sh_portchk_reset (void);
 
 /* Interface to run port check
  */
-int sh_portchk_check ();
+int sh_portchk_check (void);
 
 
@@ -317 +315 @@
  * Thereafter, we check for entries that are still UNKN.
  */
-static void sh_portchk_reset_lists ()
+static void sh_portchk_reset_lists (void)
 {
   struct sh_portentry * portlist;
@@ -364 +362 @@
 }
   
+/* These variables are not used anywhere. They only exist
+ * to assign &pre, &ptr to them, which keeps gcc from
+ * putting it into a register, and avoids the 'clobbered
+ * by longjmp' warning. And no, 'volatile' proved insufficient.
+ */
+static void * sh_dummy_pre = NULL;
+static void * sh_dummy_ptr = NULL;
+
 /* check the list of open ports for any that are marked as UNKN
  */
@@ -372 +378 @@
   char errbuf[256];
 
+  /* Take the address to keep gcc from putting them into registers. 
+   * Avoids the 'clobbered by longjmp' warning. 
+   */
+  sh_dummy_pre = (void*) &pre;
+  sh_dummy_ptr = (void*) &ptr;
+ 
   while (ptr)
     {
@@ -817 +829 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("SSH-2.0-Foobar"), 14);
-          write (fd, "\r\n", 2);
+          retval = write (fd, _("SSH-2.0-Foobar"), 14);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
         }
       else if (port == 25)  /* smtp */
@@ -824 +836 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("QUIT"), 4);
-          write (fd, "\r\n", 2);
+          retval = write (fd, _("QUIT"), 4);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
         }
       else if (port == 79)  /* finger */
@@ -831 +843 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, "\r\n", 2);
+          retval = write (fd, "\r\n", 2);
         }
       else if (port == 110) /* pop3 */
@@ -837 +849 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("QUIT"), 4);
-          write (fd, "\r\n", 2);
+          retval = write (fd, _("QUIT"), 4);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
         }
       else if (port == 143) /* imap */
@@ -844 +856 @@
           flags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
           retry_fcntl(FIL__, __LINE__, fd, F_SETFL, flags | O_NONBLOCK);
-          write (fd, _("A01 LOGOUT"), 10);
-          write (fd, "\r\n", 2);
-        }
+          retval = write (fd, _("A01 LOGOUT"), 10);
+          if (retval > 0) retval = write (fd, "\r\n", 2);
+        }
+
+      if (portchk_debug && retval < 0)
+        fprintf(stderr, _("check port: error writing to port %5d\n"), 
+                port);
      }
   close (fd);
@@ -878 +894 @@
 {
   struct hostent * hent;
-  int              i = 0;
+  volatile int     i; /* might be clobbered by ‘longjmp’ or ‘vfork’*/
   char errbuf[256];
 
@@ -899 +915 @@
   SH_MUTEX_LOCK(mutex_resolv);
   hent = sh_gethostbyname(portchk_hostname);
-
+  i = 0;
   while (hent && hent->h_addr_list[i] && (iface_list.used < SH_IFACE_MAX))
     {
@@ -945 +961 @@
 
 #if !defined(TEST_ONLY)
-int sh_portchk_reconf ()
+int sh_portchk_reconf (void)
 {
   SH_MUTEX_LOCK(mutex_port_check);
@@ -962 +978 @@
 }
 
-int sh_portchk_cleanup ()
+int sh_portchk_cleanup (void)
 {
   return sh_portchk_reconf ();
@@ -983 +999 @@
 static int check_port_generic (int port, int type, int protocol)
 {
-  int              i    =  0;
+  volatile int     i    =  0;
   int              sock = -1;
   int              flag =  1; /* non-zero to enable an option */
@@ -1002 +1018 @@
       if ((sock = socket(AF_INET, type, protocol)) < 0 )
         {
+          ++i;
 #ifdef TEST_ONLY
           if (portchk_debug)
@@ -1010 +1027 @@
                           sh_error_message(errno, errbuf, sizeof(errbuf)), _("socket"));
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
-          ++i;
+#endif
           continue;
-#endif
         }
       if ( setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
                       (void *) &flag, sizeof(flag)) < 0 )
         {
+          ++i;
 #ifdef TEST_ONLY
           if (portchk_debug)
@@ -1026 +1043 @@
           SH_MUTEX_UNLOCK(mutex_thread_nolog);
 #endif
-          ++i;
           continue;
         }
@@ -1056 +1072 @@
 
 
-static int sh_portchk_scan_ports_generic (int min_port, int max_port, int type, int protocol)
+static int sh_portchk_scan_ports_generic (int min_port, int max_port_arg, int type, int protocol)
 {
   /*
@@ -1063 +1079 @@
   */
 
-  int port;
+  volatile int port; /*  might be clobbered by ‘longjmp’ or ‘vfork’*/
+  volatile int max_port = max_port_arg;
   int retval;
   int sock   = -1;
@@ -1444 +1461 @@
 int sh_portchk_check ()
 {
-  int min_port = 0;
+  volatile int min_port;
 
   SH_MUTEX_LOCK(mutex_port_check);
+
+  min_port = 0;
+
   if (sh_portchk_active != S_FALSE)
     {