Changeset 250

Timestamp:

Sep 22, 2009, 9:22:14 PM (15 years ago)

Author:

katerina

Message:

Proper reporting for udp6 sockets (ticket #168).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_port2proc.c (modified) (2 diffs)

trunk/docs/Changelog

@@ -2 +2 @@
         * remove stale file record when creating handle, and raise diagnostic
           error to find origin of stale record
+        * sh_port2proc.c: check /proc/net/upd6 for IPv6-only UDP sockets
 
 2.5.9a:

trunk/src/sh_port2proc.c

@@ -320 +320 @@
 /* returns the command and fills the 'user' array 
  */
-char * sh_port2proc_query(int proto, struct in_addr * saddr, int sport, unsigned long * pid,
-                          char * user, size_t userlen)
+static char * port2proc_query(char * file, int proto, struct in_addr * saddr, int sport, 
+                              unsigned long * pid, char * user, size_t userlen)
 {
   FILE * fd;
 
-  if (proto == IPPROTO_TCP)
-    fd = fopen("/proc/net/tcp", "r");
-  else
-    fd = fopen("/proc/net/udp", "r");
+  fd = fopen(file, "r");
 
   *pid = 0;
@@ -377 +374 @@
   sl_strlcpy(user, "-", userlen);
   return sh_util_strdup("-");
+}
+
+/* returns the command and fills the 'user' array 
+ */
+char * sh_port2proc_query(int proto, struct in_addr * saddr, int sport, 
+                          unsigned long * pid, char * user, size_t userlen)
+{
+  char file[32];
+
+  if (proto == IPPROTO_TCP)
+    {
+      sl_strlcpy(file, _("/proc/net/tcp"), sizeof(file));
+      return port2proc_query(file, proto, saddr, sport, pid, user, userlen);
+    }
+  else
+    {
+      char * ret;
+      sl_strlcpy(file, _("/proc/net/udp"), sizeof(file));
+      ret = port2proc_query(file, proto, saddr, sport, pid, user, userlen);
+      if (ret[0] == '-' && ret[1] == '\0')
+        {
+          SH_FREE(ret);
+          sl_strlcpy(file, _("/proc/net/udp6"), sizeof(file));
+          ret = port2proc_query(file, proto, saddr, sport, pid, user, userlen);
+        }
+      return ret;
+    }
 }