In ip_log.c, we see:
#  if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
        (defined(OpenBSD) && (OpenBSD >= 199603)) || \
        (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
        strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ);
#  else
        ipfl.fl_unit = (u_char)ifp->if_unit;
        strncpy(ipfl.fl_ifname, ifp->if_name, MIN(sizeof(ipfl.fl_ifname),
                                                  sizeof(ifp->if_name)));
#  endif

The corresponding parsing code in ipmon.c reads:
#if (SOLARIS || \
        (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
        (defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux)
        {
        char    ifname[sizeof(ipf->fl_ifname) + 1];
        
        strncpy(ifname, (char *)ipf->fl_ifname, sizeof(ipf->fl_ifname));
        ifname[sizeof(ipf->fl_ifname)] = '\0';
        (void) sprintf(t, "%s", ifname);
        t += strlen(t);
# if SOLARIS
        ....
# endif
        }
#else
        for (len = 0; len < 3; len++)
                if (ipf->fl_ifname[len] == '\0')
                        break;
        if (ipf->fl_ifname[len])
                len++;
        (void) sprintf(t, "%*.*s%u", len, len, ipf->fl_ifname, ipf->fl_unit);
        t += strlen(t);
#endif

Clearly that is wrong. Patch below.

-Guido
--- /usr/src/contrib/ipfilter/ipmon.c   Sat Feb 15 07:32:47 2003
+++ ./ipmon.c   Fri Jan  2 11:16:24 2004
@@ -922,6 +922,7 @@
        }
 #if (SOLARIS || \
        (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
+       (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) ||
        (defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux)
        {
        char    ifname[sizeof(ipf->fl_ifname) + 1];

Reply via email to