Changeset 212 for trunk/src/sh_portcheck.c

Timestamp:

Feb 17, 2009, 10:37:42 PM (16 years ago)

Author:

katerina

Message:

Lock baseline database (ticket #139) and allow list as input for PortCheckInterface (ticket #140).

File:

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

trunk/src/sh_portcheck.c

@@ -1218 +1218 @@
 /* Subroutine to add an interface
  */
+static void * sh_dummy_str    = NULL; /* fix clobbered by.. warning */
+
 static int sh_portchk_add_interface (const char * str)
 {
   struct in_addr   haddr;
   char errbuf[256];
+  char buf[64];
+
+  sh_dummy_str    = (void*) &str;
 
   if (iface_initialized == 0)
@@ -1229 +1234 @@
     }
 
-  if (0 == inet_aton(str, &haddr))
-    return -1;
-
-  if (iface_list.used == SH_IFACE_MAX)
-    return -1;
-
-  sl_snprintf(errbuf, sizeof(errbuf), _("interface: %s"), inet_ntoa(haddr));
-  SH_MUTEX_LOCK(mutex_thread_nolog);
-  sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, 0, MSG_E_SUBGEN, 
-                  errbuf, _("sh_portchk_add_interface"));
-  SH_MUTEX_UNLOCK(mutex_thread_nolog);
-
-  memcpy (&(iface_list.iface[iface_list.used].s_addr), &(haddr.s_addr), sizeof(in_addr_t));
-  ++iface_list.used;
+  do {
+
+    while (*str == ',' || *str == ' ' || *str == '\t') ++str;
+
+    if (*str)
+      {
+        unsigned int i = 0;
+        while (*str && i < (sizeof(buf)-1) && *str != ',' && *str != ' ' && *str != '\t')
+          {
+            buf[i] = *str; ++str; ++i;
+          }
+        buf[i] = '\0';
+
+        if (0 == inet_aton(buf, &haddr))
+          return -1;
+
+        if (iface_list.used == SH_IFACE_MAX)
+          return -1;
+
+        sl_snprintf(errbuf, sizeof(errbuf), _("interface: %s"), inet_ntoa(haddr));
+        SH_MUTEX_LOCK(mutex_thread_nolog);
+        sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, 0, MSG_E_SUBGEN, 
+                        errbuf, _("sh_portchk_add_interface"));
+        SH_MUTEX_UNLOCK(mutex_thread_nolog);
+        
+        memcpy (&(iface_list.iface[iface_list.used].s_addr), &(haddr.s_addr), sizeof(in_addr_t));
+        ++iface_list.used;
+      }
+  } while (*str);
 
   return 0;