Changeset 298 for trunk

Timestamp:

Nov 1, 2010, 12:13:47 AM (14 years ago)

Author:

katerina

Message:

Fix for minor issue with IPv6 in port check.

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• src/sh_port2proc.c (modified) (3 diffs)

trunk/Makefile.in

@@ -1754 +1754 @@
 dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h 
 t-test1.o: $(srcsrc)/t-test1.c Makefile config.h $(srcinc)/malloc.h 
-sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h 
+sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h 
 sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
 sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 

trunk/src/sh_port2proc.c

@@ -352 +352 @@
       unsigned int n, i, port, niface, inode, istatus;
       char line[512];
+      char ip_port[128];
       char iface[SH_IP_BUF];
 
@@ -363 +364 @@
 #endif
 
-          if (5 == sscanf(line, 
-                          "%u: %s:%X %*X:%*X %X %*X:%*X %*X:%*X %*X %*d %*d %u %*s",
-                          &n, iface, &port, &istatus, &inode))
+          if (4 == sscanf(line, 
+                          "%u: %127s %*X:%*X %X %*X:%*X %*X:%*X %*X %*d %*d %u %*s",
+                          &n, ip_port, &istatus, &inode))
             {
               struct sockaddr_in  addr4;
@@ -371 +372 @@
               struct sh_sockaddr  ss;
               
+              char * p;
+
+              ip_port[127] = '\0';
+
+              p = strchr(ip_port, ':');
+
+              if (p)
+                {
+                  *p = '\0'; ++p;
+                  port = (unsigned int) strtoul(p, NULL, 16);
+                  sl_strlcpy(iface, ip_port, sizeof(iface));
+                }
+              else
+                {
+                  continue;
+                }
+
               niface = 0;