Default to first interface from pcap_findalldevs()

[tcpdump] / util-print.c

diff --git a/util-print.c b/util-print.c
index cfdcfe8c063ee59d3af366729bf4a3d177ff32a3..f11155ad2eb42664887546c78ae56441346ba781 100644 (file)
--- a/util-print.c
+++ b/util-print.c
@@ -39,19 +39,20 @@
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <sys/stat.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
+#include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "ascii_strcasecmp.h"
 #include "timeval-operations.h"
 
@@ -69,6 +70,7 @@ int32_t thiszone;             /* seconds offset from gmt to local time */
  * Print out a null-terminated filename (or other ascii string).
  * If ep is NULL, assume no truncation check is needed.
  * Return true if truncated.
+ * Stop at ep (if given) or before the null char, whichever is first.
  */
 int
 fn_print(netdissect_options *ndo,
@@ -101,6 +103,7 @@ fn_print(netdissect_options *ndo,
  * Print out a counted filename (or other ascii string).
  * If ep is NULL, assume no truncation check is needed.
  * Return true if truncated.
+ * Stop at ep (if given) or after n bytes, whichever is first.
  */
 int
 fn_printn(netdissect_options *ndo,
@@ -128,6 +131,8 @@ fn_printn(netdissect_options *ndo,
  * Print out a null-padded filename (or other ascii string).
  * If ep is NULL, assume no truncation check is needed.
  * Return true if truncated.
+ * Stop at ep (if given) or after n bytes or before the null char,
+ * whichever is first.
  */
 int
 fn_printzp(netdissect_options *ndo,
@@ -280,14 +285,14 @@ ts_print(netdissect_options *ndo,
 #else
                nano_prec = 0;
 #endif
-               if (!(tcpdump_timevalisset(&tv_ref)))
+               if (!(netdissect_timevalisset(&tv_ref)))
                        tv_ref = *tvp; /* set timestamp for first packet */
 
-               negative_offset = tcpdump_timevalcmp(tvp, &tv_ref, <);
+               negative_offset = netdissect_timevalcmp(tvp, &tv_ref, <);
                if (negative_offset)
-                       tcpdump_timevalsub(&tv_ref, tvp, &tv_result, nano_prec);
+                       netdissect_timevalsub(&tv_ref, tvp, &tv_result, nano_prec);
                else
-                       tcpdump_timevalsub(tvp, &tv_ref, &tv_result, nano_prec);
+                       netdissect_timevalsub(tvp, &tv_ref, &tv_result, nano_prec);
 
                ND_PRINT((ndo, (negative_offset ? "-" : " ")));
 
@@ -471,7 +476,7 @@ bittok2str(register const struct tok *lp, register const char *fmt,
 
 /*
  * Convert a value to a string using an array; the macro
- * tok2strary() in <interface.h> is the public interface to
+ * tok2strary() in <netdissect.h> is the public interface to
  * this function and ensures that the second argument is
  * correct for bounds-checking.
  */
@@ -520,7 +525,6 @@ mask2plen(uint32_t mask)
        return (prefix_len);
 }
 
-#ifdef INET6
 int
 mask62plen(const u_char *mask)
 {
@@ -547,7 +551,6 @@ mask62plen(const u_char *mask)
        }
        return (cidr_len);
 }
-#endif /* INET6 */
 
 /*
  * Routine to print out information for text-based protocols such as FTP,