Default to first interface from pcap_findalldevs()

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 96410da8faf65b5026dc63347a2b292f134b94c3..6fefb966856c13123f77f7d67f4ea231bf59f901 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -36,15 +36,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

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

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

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

-#include "interface.h"
+#include "netdissect.h"

 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16


@@ -57,8 +56,12 @@ void
 ascii_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {
 ascii_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {

+       u_int caplength;

        register u_char s;
 
        register u_char s;
 

+       caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;

        ND_PRINT((ndo, "\n"));
        while (length > 0) {
                s = *cp++;
        ND_PRINT((ndo, "\n"));
        while (length > 0) {
                s = *cp++;


@@ -89,12 +92,16 @@ void
 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)
 {
 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;
 
        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;
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;


@@ -147,9 +154,13 @@ hex_print_with_offset(netdissect_options *ndo,
                       const char *ident, const u_char *cp, u_int length,
                      u_int oset)
 {
                       const char *ident, const u_char *cp, u_int length,
                      u_int oset)
 {

+       u_int caplength;

        register u_int i, s;
        register int nshorts;
 
        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) {
        nshorts = (u_int) length / sizeof(u_short);
        i = 0;
        while (--nshorts >= 0) {