Default to first interface from pcap_findalldevs()

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 18d5d0fb312ec564816103581f0c5b55f2a6b084..6fefb966856c13123f77f7d67f4ea231bf59f901 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,11 +40,10 @@
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 #include <stdio.h>
 
 #include "netdissect.h"
-#include "interface.h"
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
@@ -54,11 +53,16 @@
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
 void
-ascii_print(register const u_char *cp, register u_int length)
+ascii_print(netdissect_options *ndo,
+            const u_char *cp, u_int length)
 {
-       register int s;
+       u_int caplength;
+       register u_char s;
 
-       putchar('\n');
+       caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;
+       ND_PRINT((ndo, "\n"));
        while (length > 0) {
                s = *cp++;
                length--;
@@ -73,27 +77,31 @@ ascii_print(register const u_char *cp, register u_int length)
                         * In the middle of a line, just print a '.'.
                         */
                        if (length > 1 && *cp != '\n')
-                               putchar('.');
+                               ND_PRINT((ndo, "."));
                } else {
                        if (!ND_ISGRAPH(s) &&
                            (s != '\t' && s != ' ' && s != '\n'))
-                               putchar('.');
+                               ND_PRINT((ndo, "."));
                        else
-                               putchar(s);
+                               ND_PRINT((ndo, "%c", s));
                }
        }
 }
 
 void
-hex_and_ascii_print_with_offset(register const char *ident,
+hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
     register const u_char *cp, register u_int length, register u_int oset)
 {
+       u_int caplength;
        register u_int i;
        register int s1, s2;
        register int nshorts;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
 
+       caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;
@@ -108,9 +116,9 @@ hex_and_ascii_print_with_offset(register const char *ident,
                i++;
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
-                       (void)printf("%s0x%04x: %-*s  %s",
+                       ND_PRINT((ndo, "%s0x%04x: %-*s  %s",
                            ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                           hexstuff, asciistuff);
+                           hexstuff, asciistuff));
                        i = 0; hsp = hexstuff; asp = asciistuff;
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
@@ -125,17 +133,17 @@ hex_and_ascii_print_with_offset(register const char *ident,
        }
        if (i > 0) {
                *hsp = *asp = '\0';
-               (void)printf("%s0x%04x: %-*s  %s",
+               ND_PRINT((ndo, "%s0x%04x: %-*s  %s",
                     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                    hexstuff, asciistuff);
+                    hexstuff, asciistuff));
        }
 }
 
 void
-hex_and_ascii_print(register const char *ident, register const u_char *cp,
-    register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, register const char *ident,
+    register const u_char *cp, register u_int length)
 {
-       hex_and_ascii_print_with_offset(ident, cp, length, 0);
+       hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
 }
 
 /*
@@ -146,23 +154,27 @@ hex_print_with_offset(netdissect_options *ndo,
                       const char *ident, const u_char *cp, u_int length,
                      u_int oset)
 {
+       u_int caplength;
        register u_int i, s;
        register int nshorts;
 
+       caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;
        nshorts = (u_int) length / sizeof(u_short);
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {
-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-                  oset += HEXDUMP_BYTES_PER_LINE;
+                       ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
+                       oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;
-               (void)ND_PRINT((ndo," %02x%02x", s, *cp++));
+               ND_PRINT((ndo," %02x%02x", s, *cp++));
        }
        if (length & 1) {
                if ((i % 8) == 0)
-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-               (void)ND_PRINT((ndo," %02x", *cp));
+                       ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
+               ND_PRINT((ndo," %02x", *cp));
        }
 }