better print the IP addresses native than using getname();

[tcpdump] / util.c

diff --git a/util.c b/util.c
index 9571cbb594782be0fa6efc46a9a55c981866bd6b..3c396a2399c2619b140dee1ae62f911f4e60b4bb 100644 (file)
--- a/util.c
+++ b/util.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.66 2000-06-10 08:11:12 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.76 2002-07-18 00:04:12 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -38,16 +38,9 @@ static const char rcsid[] =
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif

 #include <pcap.h>
 #include <stdio.h>
 #include <pcap.h>
 #include <stdio.h>

-#if __STDC__

 #include <stdarg.h>
 #include <stdarg.h>

-#else
-#include <varargs.h>
-#endif

 #include <stdlib.h>
 #include <string.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <stdlib.h>
 #include <string.h>
 #ifdef TIME_WITH_SYS_TIME


@@ -152,7 +145,7 @@ ts_print(register const struct timeval *tvp)
                } else {
                        int d_usec = tvp->tv_usec - b_usec;
                        int d_sec = tvp->tv_sec - b_sec;
                } 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--;
                        while (d_usec < 0) {
                                d_usec += 1000000;
                                d_sec--;


@@ -185,15 +178,19 @@ ts_print(register const struct timeval *tvp)
 void
 relts_print(int secs)
 {
 void
 relts_print(int secs)
 {

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

 
 

-       if (secs <= 0) {
+       if (secs == 0) {

                (void)printf("0s");
                return;
        }
                (void)printf("0s");
                return;
        }

+       if (secs < 0) {
+               (void)printf("-");
+               secs = -secs;
+       }

        while (secs > 0) {
                if (secs >= *s) {
                        (void)printf("%d%s", secs / *s, *l);
        while (secs > 0) {
                if (secs >= *s) {
                        (void)printf("%d%s", secs / *s, *l);


@@ -204,6 +201,34 @@ relts_print(int secs)
        }
 }
 
        }
 }
 

+/*
+ *  this is a generic routine for printing unknown data;
+ *  we pass on the linefeed plus indentation string to
+ *  get a proper output - returns 0 on error
+ */
+
+int
+print_unknown_data(const u_char *cp,const char *lf,int len)
+{
+        int i;
+
+       printf("%s0x0000: ",lf);
+       for(i=0;i<len;i++) {
+           if (!TTEST2(*(cp+i), 1)) {
+              printf("%spacket exceeded snapshot",lf);
+              return(0);
+            }
+           printf("%02x",*(cp+i));
+           if (i%2)
+               printf(" ");
+           if (i/16!=(i+1)/16) {
+               if (i<(len-1))
+                   printf("%s0x%04x: ",lf,i);
+           }
+       }
+       return(1); /* everything is ok */
+}
+

 /*
  * Convert a token value to a string; use "fmt" if not found.
  */
 /*
  * Convert a token value to a string; use "fmt" if not found.
  */


@@ -224,25 +249,34 @@ tok2str(register const struct tok *lp, register const char *fmt,
        return (buf);
 }
 
        return (buf);
 }
 

+/*
+ * Convert a value to a string using an array; the macro
+ * tok2strary() in <interface.h> is the public interface to
+ * this function and ensures that the second argument is
+ * correct for bounds-checking.
+ */
+const char *
+tok2strary_internal(register const char **lp, int n, register const char *fmt,
+       register int v)
+{
+       static char buf[128];
+
+       if (v >= 0 && v < n && lp[v] != NULL)
+               return lp[v];
+       if (fmt == NULL)
+               fmt = "#%d";
+       (void)snprintf(buf, sizeof(buf), fmt, v);
+       return (buf);
+}

 
 /* VARARGS */
 
 /* VARARGS */

-__dead void
-#if __STDC__
+void

 error(const char *fmt, ...)
 error(const char *fmt, ...)

-#else
-error(fmt, va_alist)
-       const char *fmt;
-       va_dcl
-#endif

 {
        va_list ap;
 
        (void)fprintf(stderr, "%s: ", program_name);
 {
        va_list ap;
 
        (void)fprintf(stderr, "%s: ", program_name);

-#if __STDC__

        va_start(ap, fmt);
        va_start(ap, fmt);

-#else
-       va_start(ap);
-#endif

        (void)vfprintf(stderr, fmt, ap);
        va_end(ap);
        if (*fmt) {
        (void)vfprintf(stderr, fmt, ap);
        va_end(ap);
        if (*fmt) {


@@ -256,22 +290,12 @@ error(fmt, va_alist)
 
 /* VARARGS */
 void
 
 /* VARARGS */
 void

-#if __STDC__

 warning(const char *fmt, ...)
 warning(const char *fmt, ...)

-#else
-warning(fmt, va_alist)
-       const char *fmt;
-       va_dcl
-#endif

 {
        va_list ap;
 
        (void)fprintf(stderr, "%s: WARNING: ", program_name);
 {
        va_list ap;
 
        (void)fprintf(stderr, "%s: WARNING: ", program_name);

-#if __STDC__

        va_start(ap, fmt);
        va_start(ap, fmt);

-#else
-       va_start(ap);
-#endif

        (void)vfprintf(stderr, fmt, ap);
        va_end(ap);
        if (*fmt) {
        (void)vfprintf(stderr, fmt, ap);
        va_end(ap);
        if (*fmt) {


@@ -330,7 +354,10 @@ read_infile(char *fname)
                error("can't stat %s: %s", fname, pcap_strerror(errno));
 
        cp = malloc((u_int)buf.st_size + 1);
                error("can't stat %s: %s", fname, pcap_strerror(errno));
 
        cp = malloc((u_int)buf.st_size + 1);

-       cc = read(fd, cp, (int)buf.st_size);
+       if (cp == NULL)
+               error("malloc(%d) for %s: %s", (u_int)buf.st_size + 1,
+                       fname, pcap_strerror(errno));
+       cc = read(fd, cp, (u_int)buf.st_size);

        if (cc < 0)
                error("read %s: %s", fname, pcap_strerror(errno));
        if (cc != buf.st_size)
        if (cc < 0)
                error("read %s: %s", fname, pcap_strerror(errno));
        if (cc != buf.st_size)


@@ -355,8 +382,8 @@ safeputchar(int c)
        unsigned char ch;
 
        ch = (unsigned char)(c & 0xff);
        unsigned char ch;
 
        ch = (unsigned char)(c & 0xff);

-       if (c < 0x80 && isprint(c))
-               printf("\\%03o", c & 0xff);
+       if (ch < 0x80 && isprint(ch))
+               printf("%c", ch);

        else
        else

-               printf("%c", c & 0xff);
+               printf("\\%03o", ch);

 }
 }