linux.c: Do NAT detection using address-independent machinery.

diff --git a/linux.c b/linux.c
index b0db5f1c19c251120f2976e0782ba55c0a7e5dd2..87da9fae915b95f992c40d68f21483cfc0498811 100644 (file)
--- a/linux.c
+++ b/linux.c
@@ -36,15 +36,18 @@ static FILE *natfp;
 
 struct addrops_sys {
   const char *procfile;
 
 struct addrops_sys {
   const char *procfile;

+  const char *nfl3name;

   int (*parseaddr)(char **, union addr *);
 };
 
 #define PROCFILE_IPV4 "/proc/net/tcp"
   int (*parseaddr)(char **, union addr *);
 };
 
 #define PROCFILE_IPV4 "/proc/net/tcp"

+#define NFL3NAME_IPV4 "ipv4"

 
 static int parseaddr_ipv4(char **pp, union addr *a)
   { a->ipv4.s_addr = strtoul(*pp, pp, 16); return (0); }
 
 #define PROCFILE_IPV6 "/proc/net/tcp6"
 
 static int parseaddr_ipv4(char **pp, union addr *a)
   { a->ipv4.s_addr = strtoul(*pp, pp, 16); return (0); }
 
 #define PROCFILE_IPV6 "/proc/net/tcp6"

+#define NFL3NAME_IPV6 "ipv6"

 
 static int parseaddr_ipv6(char **pp, union addr *a)
 {
 
 static int parseaddr_ipv6(char **pp, union addr *a)
 {


@@ -71,7 +74,7 @@ static int parseaddr_ipv6(char **pp, union addr *a)
 
 #define DEFOPSYS(ty, TY)                                               \
   const struct addrops_sys addrops_sys_##ty = {                                \
 
 #define DEFOPSYS(ty, TY)                                               \
   const struct addrops_sys addrops_sys_##ty = {                                \

-    PROCFILE_##TY, parseaddr_##ty                                      \
+    PROCFILE_##TY, NFL3NAME_##TY, parseaddr_##ty                       \

   };
 ADDRTYPES(DEFOPSYS)
 #undef DEFOPSYS
   };
 ADDRTYPES(DEFOPSYS)
 #undef DEFOPSYS


@@ -247,13 +250,17 @@ void identify(struct query *q)
     goto err_unk;
   }
 
     goto err_unk;
   }
 

-  if (natfp && q->ao->af == AF_INET) {
+  if (natfp) {

     rewind(natfp);
 
     for (;;) {
       DRESET(&d);
       if (dstr_putline(&d, natfp) == EOF) break;
       pp = d.buf;
     rewind(natfp);
 
     for (;;) {
       DRESET(&d);
       if (dstr_putline(&d, natfp) == EOF) break;
       pp = d.buf;

+
+      NEXTFIELD; if (!*p) break;
+      if (strcmp(p, q->ao->sys->nfl3name)) continue;
+      NEXTFIELD; if (!*p) break;

       NEXTFIELD; if (!*p) break;
       if (strcmp(p, "tcp") != 0) continue;
       i = 0;
       NEXTFIELD; if (!*p) break;
       if (strcmp(p, "tcp") != 0) continue;
       i = 0;


@@ -263,10 +270,10 @@ void identify(struct query *q)
        if (strcmp(p, "ESTABLISHED") == 0)
          fl |= F_ESTAB;
        else if (strncmp(p, "src=", 4) == 0) {
        if (strcmp(p, "ESTABLISHED") == 0)
          fl |= F_ESTAB;
        else if (strncmp(p, "src=", 4) == 0) {

-         inet_pton(AF_INET, p + 4, &s[i].addr);
+         inet_pton(q->ao->af, p + 4, &s[i].addr);

          fl |= F_SADDR;
        } else if (strncmp(p, "dst=", 4) == 0) {
          fl |= F_SADDR;
        } else if (strncmp(p, "dst=", 4) == 0) {

-         inet_pton(AF_INET, p + 4, &s[i + 1].addr);
+         inet_pton(q->ao->af, p + 4, &s[i + 1].addr);

          fl |= F_DADDR;
        } else if (strncmp(p, "sport=", 6) == 0) {
          s[i].port = atoi(p + 6);
          fl |= F_DADDR;
        } else if (strncmp(p, "sport=", 6) == 0) {
          s[i].port = atoi(p + 6);


@@ -313,8 +320,9 @@ void identify(struct query *q)
       goto done;
     }
 
       goto done;
     }
 

+    /* Reached the end of the NAT file. */

     if (ferror(natfp)) {
     if (ferror(natfp)) {

-      logmsg(q, LOG_ERR, "failed to read `/proc/net/ip_conntrack': %s",
+      logmsg(q, LOG_ERR, "failed to read `/proc/net/nf_conntrack': %s",

             strerror(errno));
       goto err_unk;
     }
             strerror(errno));
       goto err_unk;
     }


@@ -336,9 +344,9 @@ done:
 
 void init_sys(void)
 {
 
 void init_sys(void)
 {

-  if ((natfp = fopen("/proc/net/ip_conntrack", "r")) == 0 &&
+  if ((natfp = fopen("/proc/net/nf_conntrack", "r")) == 0 &&

       errno != ENOENT) {
       errno != ENOENT) {

-    die(1, "failed to open `/proc/net/ip_conntrack' for reading: %s",
+    die(1, "failed to open `/proc/net/nf_conntrack' for reading: %s",

        strerror(errno));
   }
 }
        strerror(errno));
   }
 }