Introduce --time-stamp-precision

[tcpdump] / addrtoname.c

diff --git a/addrtoname.c b/addrtoname.c
index 895f149245b74080fc781afbe17a987ce12c68f5..eb0b2aeefe1f7c423a1bf43c6277c6ce592f660e 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -21,11 +21,8 @@
  *  Internet, ethernet, port, and protocol string to address
  *  and address to string conversion routines
  */
  *  Internet, ethernet, port, and protocol string to address
  *  and address to string conversion routines
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp $ (LBL)";
-#endif

 
 

+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -81,7 +78,7 @@ extern int ether_ntohost(char *, const struct ether_addr *);
 #define HASHNAMESIZE 4096
 
 struct hnamemem {
 #define HASHNAMESIZE 4096
 
 struct hnamemem {

-       u_int32_t addr;
+       uint32_t addr;

        const char *name;
        struct hnamemem *nxt;
 };
        const char *name;
        struct hnamemem *nxt;
 };


@@ -158,7 +155,7 @@ static struct enamemem nsaptable[HASHNAMESIZE];
 static struct enamemem bytestringtable[HASHNAMESIZE];
 
 struct protoidmem {
 static struct enamemem bytestringtable[HASHNAMESIZE];
 
 struct protoidmem {

-       u_int32_t p_oui;
+       uint32_t p_oui;

        u_short p_proto;
        const char *p_name;
        struct protoidmem *p_nxt;
        u_short p_proto;
        const char *p_name;
        struct protoidmem *p_nxt;


@@ -170,7 +167,7 @@ static struct protoidmem protoidtable[HASHNAMESIZE];
  * A faster replacement for inet_ntoa().
  */
 const char *
  * A faster replacement for inet_ntoa().
  */
 const char *

-intoa(u_int32_t addr)
+intoa(uint32_t addr)

 {
        register char *cp;
        register u_int byte;
 {
        register char *cp;
        register u_int byte;


@@ -199,8 +196,8 @@ intoa(u_int32_t addr)
        return cp + 1;
 }
 
        return cp + 1;
 }
 

-static u_int32_t f_netmask;
-static u_int32_t f_localnet;
+static uint32_t f_netmask;
+static uint32_t f_localnet;

 
 /*
  * Return a name for the IP address pointed to by ap.  This address
 
 /*
  * Return a name for the IP address pointed to by ap.  This address


@@ -222,10 +219,10 @@ static u_int32_t f_localnet;
  * also needs to check whether they're present in the packet buffer.
  */
 const char *
  * also needs to check whether they're present in the packet buffer.
  */
 const char *

-getname(const u_char *ap)
+getname(netdissect_options *ndo, const u_char *ap)

 {
        register struct hostent *hp;
 {
        register struct hostent *hp;

-       u_int32_t addr;
+       uint32_t addr;

        static struct hnamemem *p;              /* static for longjmp() */
 
        memcpy(&addr, ap, sizeof(addr));
        static struct hnamemem *p;              /* static for longjmp() */
 
        memcpy(&addr, ap, sizeof(addr));


@@ -244,14 +241,14 @@ getname(const u_char *ap)
         *          given, f_netmask and f_localnet are 0 and the test
         *          evaluates to true)
         */
         *          given, f_netmask and f_localnet are 0 and the test
         *          evaluates to true)
         */

-       if (!nflag &&
+       if (!ndo->ndo_nflag &&

            (addr & f_netmask) == f_localnet) {
                hp = gethostbyaddr((char *)&addr, 4, AF_INET);
                if (hp) {
                        char *dotp;
 
                        p->name = strdup(hp->h_name);
            (addr & f_netmask) == f_localnet) {
                hp = gethostbyaddr((char *)&addr, 4, AF_INET);
                if (hp) {
                        char *dotp;
 
                        p->name = strdup(hp->h_name);

-                       if (Nflag) {
+                       if (ndo->ndo_Nflag) {

                                /* Remove domain qualifications */
                                dotp = strchr(p->name, '.');
                                if (dotp)
                                /* Remove domain qualifications */
                                dotp = strchr(p->name, '.');
                                if (dotp)


@@ -270,33 +267,39 @@ getname(const u_char *ap)
  * is assumed to be in network byte order.
  */
 const char *
  * is assumed to be in network byte order.
  */
 const char *

-getname6(const u_char *ap)
+getname6(netdissect_options *ndo, const u_char *ap)

 {
        register struct hostent *hp;
 {
        register struct hostent *hp;

-       struct in6_addr addr;
+       union {
+               struct in6_addr addr;
+               struct for_hash_addr {
+                       char fill[14];
+                       uint16_t d;
+               } addra;
+       } addr;

        static struct h6namemem *p;             /* static for longjmp() */
        register const char *cp;
        char ntop_buf[INET6_ADDRSTRLEN];
 
        memcpy(&addr, ap, sizeof(addr));
        static struct h6namemem *p;             /* static for longjmp() */
        register const char *cp;
        char ntop_buf[INET6_ADDRSTRLEN];
 
        memcpy(&addr, ap, sizeof(addr));

-       p = &h6nametable[*(u_int16_t *)&addr.s6_addr[14] & (HASHNAMESIZE-1)];
+       p = &h6nametable[addr.addra.d & (HASHNAMESIZE-1)];

        for (; p->nxt; p = p->nxt) {
                if (memcmp(&p->addr, &addr, sizeof(addr)) == 0)
                        return (p->name);
        }
        for (; p->nxt; p = p->nxt) {
                if (memcmp(&p->addr, &addr, sizeof(addr)) == 0)
                        return (p->name);
        }

-       p->addr = addr;
+       p->addr = addr.addr;

        p->nxt = newh6namemem();
 
        /*
         * Do not print names if -n was given.
         */
        p->nxt = newh6namemem();
 
        /*
         * Do not print names if -n was given.
         */

-       if (!nflag) {
+       if (!ndo->ndo_nflag) {

                hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
                if (hp) {
                        char *dotp;
 
                        p->name = strdup(hp->h_name);
                hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
                if (hp) {
                        char *dotp;
 
                        p->name = strdup(hp->h_name);

-                       if (Nflag) {
+                       if (ndo->ndo_Nflag) {

                                /* Remove domain qualifications */
                                dotp = strchr(p->name, '.');
                                if (dotp)
                                /* Remove domain qualifications */
                                dotp = strchr(p->name, '.');
                                if (dotp)


@@ -381,6 +384,9 @@ lookup_bytestring(register const u_char *bs, const unsigned int nlen)
        tp->e_addr2 = k;
 
        tp->e_bs = (u_char *) calloc(1, nlen + 1);
        tp->e_addr2 = k;
 
        tp->e_bs = (u_char *) calloc(1, nlen + 1);

+       if (tp->e_bs == NULL)
+               error("lookup_bytestring: calloc");
+

        memcpy(tp->e_bs, bs, nlen);
        tp->e_nxt = (struct enamemem *)calloc(1, sizeof(*tp));
        if (tp->e_nxt == NULL)
        memcpy(tp->e_bs, bs, nlen);
        tp->e_nxt = (struct enamemem *)calloc(1, sizeof(*tp));
        if (tp->e_nxt == NULL)


@@ -461,7 +467,7 @@ lookup_protoid(const u_char *pi)
 }
 
 const char *
 }
 
 const char *

-etheraddr_string(register const u_char *ep)
+etheraddr_string(netdissect_options *ndo, register const u_char *ep)

 {
        register int i;
        register char *cp;
 {
        register int i;
        register char *cp;


@@ -473,7 +479,7 @@ etheraddr_string(register const u_char *ep)
        if (tp->e_name)
                return (tp->e_name);
 #ifdef USE_ETHER_NTOHOST
        if (tp->e_name)
                return (tp->e_name);
 #ifdef USE_ETHER_NTOHOST

-       if (!nflag) {
+       if (!ndo->ndo_nflag) {

                char buf2[BUFSIZE];
 
                /*
                char buf2[BUFSIZE];
 
                /*


@@ -498,7 +504,7 @@ etheraddr_string(register const u_char *ep)
                *cp++ = hex[*ep++ & 0xf];
        }
 
                *cp++ = hex[*ep++ & 0xf];
        }
 

-       if (!nflag) {
+       if (!ndo->ndo_nflag) {

                snprintf(cp, BUFSIZE - (2 + 5*3), " (oui %s)",
                    tok2str(oui_values, "Unknown", oui));
        } else
                snprintf(cp, BUFSIZE - (2 + 5*3), " (oui %s)",
                    tok2str(oui_values, "Unknown", oui));
        } else


@@ -508,19 +514,48 @@ etheraddr_string(register const u_char *ep)
 }
 
 const char *
 }
 
 const char *

-linkaddr_string(const u_char *ep, const unsigned int type, const unsigned int len)
+le64addr_string(const u_char *ep)
+{
+       const unsigned int len = 8;
+       register u_int i;
+       register char *cp;
+       register struct enamemem *tp;
+       char buf[BUFSIZE];
+
+       tp = lookup_bytestring(ep, len);
+       if (tp->e_name)
+               return (tp->e_name);
+
+       cp = buf;
+       for (i = len; i > 0 ; --i) {
+               *cp++ = hex[*(ep + i - 1) >> 4];
+               *cp++ = hex[*(ep + i - 1) & 0xf];
+               *cp++ = ':';
+       }
+       cp --;
+
+       *cp = '\0';
+
+       tp->e_name = strdup(buf);
+
+       return (tp->e_name);
+}
+
+const char *
+linkaddr_string(netdissect_options *ndo, const u_char *ep, const unsigned int type, const unsigned int len)

 {
        register u_int i;
        register char *cp;
        register struct enamemem *tp;
 
 {
        register u_int i;
        register char *cp;
        register struct enamemem *tp;
 

-       if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN) {
-            return etheraddr_string(ep);
-        }
+       if (len == 0)
+               return ("<empty>");
+
+       if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN)
+               return (etheraddr_string(ndo, ep));

 
 

-        if (type == LINKADDR_FRELAY) {
-            return q922_string(ep);
-        }
+       if (type == LINKADDR_FRELAY)
+               return (q922_string(ep));

 
        tp = lookup_bytestring(ep, len);
        if (tp->e_name)
 
        tp = lookup_bytestring(ep, len);
        if (tp->e_name)


@@ -545,7 +580,7 @@ etherproto_string(u_short port)
 {
        register char *cp;
        register struct hnamemem *tp;
 {
        register char *cp;
        register struct hnamemem *tp;

-       register u_int32_t i = port;
+       register uint32_t i = port;

        char buf[sizeof("0000")];
 
        for (tp = &eprototable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
        char buf[sizeof("0000")];
 
        for (tp = &eprototable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)


@@ -628,7 +663,7 @@ const char *
 tcpport_string(u_short port)
 {
        register struct hnamemem *tp;
 tcpport_string(u_short port)
 {
        register struct hnamemem *tp;

-       register u_int32_t i = port;
+       register uint32_t i = port;

        char buf[sizeof("00000")];
 
        for (tp = &tporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
        char buf[sizeof("00000")];
 
        for (tp = &tporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)


@@ -647,7 +682,7 @@ const char *
 udpport_string(register u_short port)
 {
        register struct hnamemem *tp;
 udpport_string(register u_short port)
 {
        register struct hnamemem *tp;

-       register u_int32_t i = port;
+       register uint32_t i = port;

        char buf[sizeof("00000")];
 
        for (tp = &uporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
        char buf[sizeof("00000")];
 
        for (tp = &uporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)


@@ -667,7 +702,7 @@ ipxsap_string(u_short port)
 {
        register char *cp;
        register struct hnamemem *tp;
 {
        register char *cp;
        register struct hnamemem *tp;

-       register u_int32_t i = port;
+       register uint32_t i = port;

        char buf[sizeof("0000")];
 
        for (tp = &ipxsaptable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
        char buf[sizeof("0000")];
 
        for (tp = &ipxsaptable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)


@@ -689,7 +724,7 @@ ipxsap_string(u_short port)
 }
 
 static void
 }
 
 static void

-init_servarray(void)
+init_servarray(netdissect_options *ndo)

 {
        struct servent *sv;
        register struct hnamemem *table;
 {
        struct servent *sv;
        register struct hnamemem *table;


@@ -708,7 +743,7 @@ init_servarray(void)
 
                while (table->name)
                        table = table->nxt;
 
                while (table->name)
                        table = table->nxt;

-               if (nflag) {
+               if (ndo->ndo_nflag) {

                        (void)snprintf(buf, sizeof(buf), "%d", port);
                        table->name = strdup(buf);
                } else
                        (void)snprintf(buf, sizeof(buf), "%d", port);
                        table->name = strdup(buf);
                } else


@@ -721,7 +756,7 @@ init_servarray(void)
 
 /* in libpcap.a (nametoaddr.c) */
 #if defined(WIN32) && !defined(USE_STATIC_LIBPCAP)
 
 /* in libpcap.a (nametoaddr.c) */
 #if defined(WIN32) && !defined(USE_STATIC_LIBPCAP)

-__declspec(dllimport)
+extern __declspec(dllimport)

 #else
 extern
 #endif
 #else
 extern
 #endif


@@ -1097,32 +1132,32 @@ init_ipxsaparray(void)
 
 /*
  * Initialize the address to name translation machinery.  We map all
 
 /*
  * Initialize the address to name translation machinery.  We map all

- * non-local IP addresses to numeric addresses if fflag is true (i.e.,
- * to prevent blocking on the nameserver).  localnet is the IP address
+ * non-local IP addresses to numeric addresses if ndo->ndo_fflag is true
+ * (i.e., to prevent blocking on the nameserver).  localnet is the IP address

  * of the local network.  mask is its subnet mask.
  */
 void
  * of the local network.  mask is its subnet mask.
  */
 void

-init_addrtoname(u_int32_t localnet, u_int32_t mask)
+init_addrtoname(netdissect_options *ndo, uint32_t localnet, uint32_t mask)

 {
 {

-       if (fflag) {
+       if (ndo->ndo_fflag) {

                f_localnet = localnet;
                f_netmask = mask;
        }
                f_localnet = localnet;
                f_netmask = mask;
        }

-       if (nflag)
+       if (ndo->ndo_nflag)

                /*
                 * Simplest way to suppress names.
                 */
                return;
 
        init_etherarray();
                /*
                 * Simplest way to suppress names.
                 */
                return;
 
        init_etherarray();

-       init_servarray();
+       init_servarray(ndo);

        init_eprotoarray();
        init_protoidarray();
        init_ipxsaparray();
 }
 
 const char *
        init_eprotoarray();
        init_protoidarray();
        init_ipxsaparray();
 }
 
 const char *

-dnaddr_string(u_short dnaddr)
+dnaddr_string(netdissect_options *ndo, u_short dnaddr)

 {
        register struct hnamemem *tp;
 
 {
        register struct hnamemem *tp;
 


@@ -1133,7 +1168,7 @@ dnaddr_string(u_short dnaddr)
 
        tp->addr = dnaddr;
        tp->nxt = newhnamemem();
 
        tp->addr = dnaddr;
        tp->nxt = newhnamemem();

-       if (nflag)
+       if (ndo->ndo_nflag)

                tp->name = dnnum_string(dnaddr);
        else
                tp->name = dnname_string(dnaddr);
                tp->name = dnnum_string(dnaddr);
        else
                tp->name = dnname_string(dnaddr);