Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / util.c

diff --git a/util.c b/util.c
index 69015610e3a5ae4cea33f99d4ea3c75c22e60fda..5731ca7b376a95751d9e9448d65092429eef14d7 100644 (file)
--- a/util.c
+++ b/util.c
@@ -19,11 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.90 2003-12-29 11:07:17 hannes Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED

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


@@ -32,11 +28,9 @@ static const char rcsid[] _U_ =
 
 #include <sys/stat.h>
 
 
 #include <sys/stat.h>
 

-#include <errno.h>

 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

-#include <pcap.h>

 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>


@@ -45,12 +39,13 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 
 /*
 #include "interface.h"
 
 /*

- * Print out a filename (or other ascii string).
+ * Print out a null-terminated filename (or other ascii string).

  * If ep is NULL, assume no truncation check is needed.
  * Return true if truncated.
  */
 int
  * If ep is NULL, assume no truncation check is needed.
  * Return true if truncated.
  */
 int

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

 {
        register int ret;
        register u_char c;
 {
        register int ret;
        register u_char c;


@@ -62,16 +57,15 @@ fn_print(register const u_char *s, register const u_char *ep)
                        ret = 0;
                        break;
                }
                        ret = 0;
                        break;
                }

-               if (!isascii(c)) {
-                       c = toascii(c);
-                       putchar('M');
-                       putchar('-');
+               if (!ND_ISASCII(c)) {
+                       c = ND_TOASCII(c);
+                       ND_PRINT((ndo, "M-"));

                }
                }

-               if (!isprint(c)) {
+               if (!ND_ISPRINT(c)) {

                        c ^= 0x40;      /* DEL to ?, others to alpha */
                        c ^= 0x40;      /* DEL to ?, others to alpha */

-                       putchar('^');
+                       ND_PRINT((ndo, "^"));

                }
                }

-               putchar(c);
+               ND_PRINT((ndo, "%c", c));

        }
        return(ret);
 }
        }
        return(ret);
 }


@@ -82,81 +76,160 @@ fn_print(register const u_char *s, register const u_char *ep)
  * Return true if truncated.
  */
 int
  * Return true if truncated.
  */
 int

-fn_printn(register const u_char *s, register u_int n,
-         register const u_char *ep)
+fn_printn(netdissect_options *ndo,
+          register const u_char *s, register u_int n, register const u_char *ep)

 {
        register u_char c;
 
        while (n > 0 && (ep == NULL || s < ep)) {
                n--;
                c = *s++;
 {
        register u_char c;
 
        while (n > 0 && (ep == NULL || s < ep)) {
                n--;
                c = *s++;

-               if (!isascii(c)) {
-                       c = toascii(c);
-                       putchar('M');
-                       putchar('-');
+               if (!ND_ISASCII(c)) {
+                       c = ND_TOASCII(c);
+                       ND_PRINT((ndo, "M-"));

                }
                }

-               if (!isprint(c)) {
+               if (!ND_ISPRINT(c)) {

                        c ^= 0x40;      /* DEL to ?, others to alpha */
                        c ^= 0x40;      /* DEL to ?, others to alpha */

-                       putchar('^');
+                       ND_PRINT((ndo, "^"));

                }
                }

-               putchar(c);
+               ND_PRINT((ndo, "%c", c));

        }
        return (n == 0) ? 0 : 1;
 }
 
        }
        return (n == 0) ? 0 : 1;
 }
 

+/*
+ * Print out a null-padded filename (or other ascii string).
+ * If ep is NULL, assume no truncation check is needed.
+ * Return true if truncated.
+ */
+int
+fn_printzp(netdissect_options *ndo,
+           register const u_char *s, register u_int n,
+           register const u_char *ep)
+{
+       register int ret;
+       register u_char c;
+
+       ret = 1;                        /* assume truncated */
+       while (n > 0 && (ep == NULL || s < ep)) {
+               n--;
+               c = *s++;
+               if (c == '\0') {
+                       ret = 0;
+                       break;
+               }
+               if (!ND_ISASCII(c)) {
+                       c = ND_TOASCII(c);
+                       ND_PRINT((ndo, "M-"));
+               }
+               if (!ND_ISPRINT(c)) {
+                       c ^= 0x40;      /* DEL to ?, others to alpha */
+                       ND_PRINT((ndo, "^"));
+               }
+               ND_PRINT((ndo, "%c", c));
+       }
+       return (n == 0) ? 0 : ret;
+}
+
+/*
+ * Format the timestamp
+ */
+static char *
+ts_format(netdissect_options *ndo, int sec, int usec)
+{
+       static char buf[sizeof("00:00:00.000000000")];
+       const char *format;
+
+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+       switch (ndo->ndo_tstamp_precision) {
+
+       case PCAP_TSTAMP_PRECISION_MICRO:
+               format = "%02d:%02d:%02d.%06u";
+               break;
+
+       case PCAP_TSTAMP_PRECISION_NANO:
+               format = "%02d:%02d:%02d.%09u";
+               break;
+
+       default:
+               format = "%02d:%02d:%02d.{unknown precision}";
+               break;
+       }
+#else
+       format = "%02d:%02d:%02d.%06u";
+#endif
+
+       snprintf(buf, sizeof(buf), format,
+                 sec / 3600, (sec % 3600) / 60, sec % 60, usec);
+
+        return buf;
+}
+

 /*
  * Print the timestamp
  */
 void
 /*
  * Print the timestamp
  */
 void

-ts_print(register const struct timeval *tvp)
+ts_print(netdissect_options *ndo,
+         register const struct timeval *tvp)

 {
        register int s;
        struct tm *tm;
        time_t Time;
        static unsigned b_sec;
        static unsigned b_usec;
 {
        register int s;
        struct tm *tm;
        time_t Time;
        static unsigned b_sec;
        static unsigned b_usec;

+       int d_usec;
+       int d_sec;
+
+       switch (ndo->ndo_tflag) {

 
 

-       switch(tflag) {
-       case 1: /* Default */
+       case 0: /* Default */

                s = (tvp->tv_sec + thiszone) % 86400;
                s = (tvp->tv_sec + thiszone) % 86400;

-               (void)printf("%02d:%02d:%02d.%06u ",
-                            s / 3600, (s % 3600) / 60, s % 60,
-                            (unsigned)tvp->tv_usec);
+               ND_PRINT((ndo, "%s ", ts_format(ndo, s, tvp->tv_usec)));

                break;
                break;

-       case -1: /* Unix timeval style */
-               (void)printf("%u.%06u ",
+
+       case 1: /* No time stamp */
+               break;
+
+       case 2: /* Unix timeval style */
+               ND_PRINT((ndo, "%u.%06u ",

                             (unsigned)tvp->tv_sec,
                             (unsigned)tvp->tv_sec,

-                            (unsigned)tvp->tv_usec);
+                            (unsigned)tvp->tv_usec));

                break;
                break;

-       case -2:
+
+       case 3: /* Microseconds since previous packet */
+        case 5: /* Microseconds since first packet */

                if (b_sec == 0) {
                if (b_sec == 0) {

-                       printf("000000 ");
-               } else {
-                       int d_usec = tvp->tv_usec - b_usec;
-                       int d_sec = tvp->tv_sec - b_sec;
-
-                       while (d_usec < 0) {
-                               d_usec += 1000000;
-                               d_sec--;
-                       }
-                       if (d_sec)
-                               printf("%d. ", d_sec);
-                       printf("%06d ", d_usec);
-               }
-               b_sec = tvp->tv_sec;
-               b_usec = tvp->tv_usec;
+                        /* init timestamp for first packet */
+                        b_usec = tvp->tv_usec;
+                        b_sec = tvp->tv_sec;
+                }
+
+                d_usec = tvp->tv_usec - b_usec;
+                d_sec = tvp->tv_sec - b_sec;
+
+                while (d_usec < 0) {
+                    d_usec += 1000000;
+                    d_sec--;
+                }
+
+                ND_PRINT((ndo, "%s ", ts_format(ndo, d_sec, d_usec)));
+
+                if (ndo->ndo_tflag == 3) { /* set timestamp for last packet */
+                    b_sec = tvp->tv_sec;
+                    b_usec = tvp->tv_usec;
+                }

                break;
                break;

-       case -3: /* Default + Date*/
+
+       case 4: /* Default + Date*/

                s = (tvp->tv_sec + thiszone) % 86400;
                Time = (tvp->tv_sec + thiszone) - s;
                tm = gmtime (&Time);
                if (!tm)
                s = (tvp->tv_sec + thiszone) % 86400;
                Time = (tvp->tv_sec + thiszone) - s;
                tm = gmtime (&Time);
                if (!tm)

-                       printf("Date fail  ");
+                       ND_PRINT((ndo, "Date fail  "));

                else
                else

-                       printf("%04d-%02d-%02d ",
-                                  tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
-               printf("%02d:%02d:%02d.%06u ",
-                          s / 3600, (s % 3600) / 60, s % 60, (unsigned)tvp->tv_usec);
+                       ND_PRINT((ndo, "%04d-%02d-%02d %s ",
+                               tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+                               ts_format(ndo, s, tvp->tv_usec)));

                break;
        }
 }
                break;
        }
 }


@@ -167,7 +240,8 @@ ts_print(register const struct timeval *tvp)
  * is represented as 1y1w1d1h1m1s.
  */
 void
  * is represented as 1y1w1d1h1m1s.
  */
 void

-relts_print(int secs)
+relts_print(netdissect_options *ndo,
+            int secs)

 {
        static const char *lengths[] = {"y", "w", "d", "h", "m", "s"};
        static const int seconds[] = {31536000, 604800, 86400, 3600, 60, 1};
 {
        static const char *lengths[] = {"y", "w", "d", "h", "m", "s"};
        static const int seconds[] = {31536000, 604800, 86400, 3600, 60, 1};


@@ -175,16 +249,16 @@ relts_print(int secs)
        const int *s = seconds;
 
        if (secs == 0) {
        const int *s = seconds;
 
        if (secs == 0) {

-               (void)printf("0s");
+               ND_PRINT((ndo, "0s"));

                return;
        }
        if (secs < 0) {
                return;
        }
        if (secs < 0) {

-               (void)printf("-");
+               ND_PRINT((ndo, "-"));

                secs = -secs;
        }
        while (secs > 0) {
                if (secs >= *s) {
                secs = -secs;
        }
        while (secs > 0) {
                if (secs >= *s) {

-                       (void)printf("%d%s", secs / *s, *l);
+                       ND_PRINT((ndo, "%d%s", secs / *s, *l));

                        secs -= (secs / *s) * *s;
                }
                s++;
                        secs -= (secs / *s) * *s;
                }
                s++;


@@ -199,9 +273,21 @@ relts_print(int secs)
  */
 
 int
  */
 
 int

-print_unknown_data(const u_char *cp,const char *ident,int len)
+print_unknown_data(netdissect_options *ndo, const u_char *cp,const char *ident,int len)

 {
 {

-        hex_print(ident,cp,len);
+       if (len < 0) {
+          ND_PRINT((ndo,"%sDissector error: print_unknown_data called with negative length",
+                   ident));
+               return(0);
+       }
+       if (ndo->ndo_snapend - cp < len)
+               len = ndo->ndo_snapend - cp;
+       if (len < 0) {
+          ND_PRINT((ndo,"%sDissector error: print_unknown_data called with pointer past end of packet",
+                   ident));
+               return(0);
+       }
+        hex_print(ndo, ident,cp,len);

        return(1); /* everything is ok */
 }
 
        return(1); /* everything is ok */
 }
 


@@ -209,36 +295,55 @@ print_unknown_data(const u_char *cp,const char *ident,int len)
  * Convert a token value to a string; use "fmt" if not found.
  */
 const char *
  * Convert a token value to a string; use "fmt" if not found.
  */
 const char *

-tok2str(register const struct tok *lp, register const char *fmt,
-       register int v)
+tok2strbuf(register const struct tok *lp, register const char *fmt,
+          register u_int v, char *buf, size_t bufsize)

 {
 {

-       static char buf[128];
-
-       while (lp->s != NULL) {
-               if (lp->v == v)
-                       return (lp->s);
-               ++lp;
+       if (lp != NULL) {
+               while (lp->s != NULL) {
+                       if (lp->v == v)
+                               return (lp->s);
+                       ++lp;
+               }

        }
        if (fmt == NULL)
                fmt = "#%d";
        }
        if (fmt == NULL)
                fmt = "#%d";

-       (void)snprintf(buf, sizeof(buf), fmt, v);
-       return (buf);
+
+       (void)snprintf(buf, bufsize, fmt, v);
+       return (const char *)buf;

 }
 
 /*
 }
 
 /*

- * Convert a bit token value to a string; use "fmt" if not found.
- * this is useful for parsing bitfields, the output strings are comma seperated
+ * Convert a token value to a string; use "fmt" if not found.

  */
  */

-char *
-bittok2str(register const struct tok *lp, register const char *fmt,
+const char *
+tok2str(register const struct tok *lp, register const char *fmt,

        register int v)
        register int v)

+{
+       static char buf[4][128];
+       static int idx = 0;
+       char *ret;
+
+       ret = buf[idx];
+       idx = (idx+1) & 3;
+       return tok2strbuf(lp, fmt, v, ret, sizeof(buf[0]));
+}
+
+/*
+ * Convert a bit token value to a string; use "fmt" if not found.
+ * this is useful for parsing bitfields, the output strings are seperated
+ * if the s field is positive.
+ */
+static char *
+bittok2str_internal(register const struct tok *lp, register const char *fmt,
+          register int v, register int sep)

 {
         static char buf[256]; /* our stringbuffer */
         int buflen=0;
         register int rotbit; /* this is the bit we rotate through all bitpositions */
         register int tokval;
 {
         static char buf[256]; /* our stringbuffer */
         int buflen=0;
         register int rotbit; /* this is the bit we rotate through all bitpositions */
         register int tokval;

+        const char * sepstr = "";

 
 

-       while (lp->s != NULL) {
+       while (lp != NULL && lp->s != NULL) {

             tokval=lp->v;   /* load our first value */
             rotbit=1;
             while (rotbit != 0) {
             tokval=lp->v;   /* load our first value */
             rotbit=1;
             while (rotbit != 0) {


@@ -248,7 +353,9 @@ bittok2str(register const struct tok *lp, register const char *fmt,
                  */
                if (tokval == (v&rotbit)) {
                     /* ok we have found something */
                  */
                if (tokval == (v&rotbit)) {
                     /* ok we have found something */

-                    buflen+=snprintf(buf+buflen, sizeof(buf)-buflen, "%s, ",lp->s);
+                    buflen+=snprintf(buf+buflen, sizeof(buf)-buflen, "%s%s",
+                                     sepstr, lp->s);
+                    sepstr = sep ? ", " : "";

                     break;
                 }
                 rotbit=rotbit<<1; /* no match - lets shift and try again */
                     break;
                 }
                 rotbit=rotbit<<1; /* no match - lets shift and try again */


@@ -256,18 +363,32 @@ bittok2str(register const struct tok *lp, register const char *fmt,
             lp++;
        }
 
             lp++;
        }
 

-        if (buflen != 0) { /* did we find anything */
-            /* yep, set the the trailing zero 2 bytes before to eliminate the last comma & whitespace */
-            buf[buflen-2] = '\0';
-            return (buf);
-        }
-        else {
+        if (buflen == 0)

             /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */
             /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */

-            if (fmt == NULL)
-               fmt = "#%d";
-            (void)snprintf(buf, sizeof(buf), fmt, v);
-            return (buf);
-        }
+            (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%d" : fmt, v);
+        return (buf);
+}
+
+/*
+ * Convert a bit token value to a string; use "fmt" if not found.
+ * this is useful for parsing bitfields, the output strings are not seperated.
+ */
+char *
+bittok2str_nosep(register const struct tok *lp, register const char *fmt,
+          register int v)
+{
+    return (bittok2str_internal(lp, fmt, v, 0));
+}
+
+/*
+ * Convert a bit token value to a string; use "fmt" if not found.
+ * this is useful for parsing bitfields, the output strings are comma seperated.
+ */
+char *
+bittok2str(register const struct tok *lp, register const char *fmt,
+          register int v)
+{
+    return (bittok2str_internal(lp, fmt, v, 1));

 }
 
 /*
 }
 
 /*


@@ -297,9 +418,9 @@ tok2strary_internal(register const char **lp, int n, register const char *fmt,
  */
 
 int
  */
 
 int

-mask2plen (u_int32_t mask)
+mask2plen(uint32_t mask)

 {
 {

-       u_int32_t bitmasks[33] = {
+       uint32_t bitmasks[33] = {

                0x00000000,
                0x80000000, 0xc0000000, 0xe0000000, 0xf0000000,
                0xf8000000, 0xfc000000, 0xfe000000, 0xff000000,
                0x00000000,
                0x80000000, 0xc0000000, 0xe0000000, 0xf0000000,
                0xf8000000, 0xfc000000, 0xfe000000, 0xff000000,


@@ -321,6 +442,35 @@ mask2plen (u_int32_t mask)
        return (prefix_len);
 }
 
        return (prefix_len);
 }
 

+#ifdef INET6
+int
+mask62plen(const u_char *mask)
+{
+       u_char bitmasks[9] = {
+               0x00,
+               0x80, 0xc0, 0xe0, 0xf0,
+               0xf8, 0xfc, 0xfe, 0xff
+       };
+       int byte;
+       int cidr_len = 0;
+
+       for (byte = 0; byte < 16; byte++) {
+               u_int bits;
+
+               for (bits = 0; bits < (sizeof (bitmasks) / sizeof (bitmasks[0])); bits++) {
+                       if (mask[byte] == bitmasks[bits]) {
+                               cidr_len += bits;
+                               break;
+                       }
+               }
+
+               if (mask[byte] != 0xff)
+                       break;
+       }
+       return (cidr_len);
+}
+#endif /* INET6 */
+

 /* VARARGS */
 void
 error(const char *fmt, ...)
 /* VARARGS */
 void
 error(const char *fmt, ...)


@@ -437,22 +587,41 @@ read_infile(char *fname)
 }
 
 void
 }
 
 void

-safeputs(const char *s)
+safeputs(netdissect_options *ndo,
+         const u_char *s, const u_int maxlen)

 {
 {

-       while (*s) {
-               safeputchar(*s);
+       u_int idx = 0;
+
+       while (*s && idx < maxlen) {
+               safeputchar(ndo, *s);
+               idx++;

                s++;
        }
 }
 
 void
                s++;
        }
 }
 
 void

-safeputchar(int c)
+safeputchar(netdissect_options *ndo,
+            const u_char c)
+{
+       ND_PRINT((ndo, (c < 0x80 && ND_ISPRINT(c)) ? "%c" : "\\0x%02x", c));
+}
+
+#ifdef LBL_ALIGN
+/*
+ * Some compilers try to optimize memcpy(), using the alignment constraint
+ * on the argument pointer type.  by using this function, we try to avoid the
+ * optimization.
+ */
+void
+unaligned_memcpy(void *p, const void *q, size_t l)

 {
 {

-       unsigned char ch;
+       memcpy(p, q, l);
+}

 
 

-       ch = (unsigned char)(c & 0xff);
-       if (ch < 0x80 && isprint(ch))
-               printf("%c", ch);
-       else
-               printf("\\%03o", ch);
+/* As with memcpy(), so with memcmp(). */
+int
+unaligned_memcmp(const void *p, const void *q, size_t l)
+{
+       return (memcmp(p, q, l));

 }
 }

+#endif