Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index bd87f6ac7ffb2e03c0eff49661e7002ea7fbaa19..64b40424333fe7daefde0a74e33d647ee622cee1 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -43,8 +43,11 @@
 #endif
 
 #include "netdissect-stdinc.h"
 #endif
 
 #include "netdissect-stdinc.h"

+

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

+#include "netdissect-ctype.h"
+

 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"
 


@@ -61,13 +64,17 @@ ascii_print(netdissect_options *ndo,
 {
        u_int caplength;
        u_char s;
 {
        u_int caplength;
        u_char s;

+       int truncated = FALSE;

 
 

-       caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
-       if (length > caplength)
+       ndo->ndo_protocol = "ascii";
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       if (length > caplength) {

                length = caplength;
                length = caplength;

+               truncated = TRUE;
+       }

        ND_PRINT("\n");
        while (length > 0) {
        ND_PRINT("\n");
        while (length > 0) {

-               s = EXTRACT_U_1(cp);
+               s = GET_U_1(cp);

                cp++;
                length--;
                if (s == '\r') {
                cp++;
                length--;
                if (s == '\r') {


@@ -80,77 +87,85 @@ ascii_print(netdissect_options *ndo,
                         *
                         * In the middle of a line, just print a '.'.
                         */
                         *
                         * In the middle of a line, just print a '.'.
                         */

-                       if (length > 1 && EXTRACT_U_1(cp) != '\n')
+                       if (length > 1 && GET_U_1(cp) != '\n')

                                ND_PRINT(".");
                } else {
                                ND_PRINT(".");
                } else {

-                       if (!ND_ISGRAPH(s) &&
+                       if (!ND_ASCII_ISGRAPH(s) &&

                            (s != '\t' && s != ' ' && s != '\n'))
                                ND_PRINT(".");
                        else
                                ND_PRINT("%c", s);
                }
        }
                            (s != '\t' && s != ' ' && s != '\n'))
                                ND_PRINT(".");
                        else
                                ND_PRINT("%c", s);
                }
        }

+       if (truncated)
+               nd_trunc_longjmp(ndo);

 }
 
 }
 

-void
-hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
-    const u_char *cp, u_int length, u_int oset)
+static void
+hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
+                               const u_char *cp, u_int length, u_int offset)

 {
        u_int caplength;
        u_int i;
 {
        u_int caplength;
        u_int i;

-       int s1, s2;
-       int nshorts;
+       u_int s1, s2;
+       u_int nshorts;
+       int truncated = FALSE;

        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
 
        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)
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       if (length > caplength) {

                length = caplength;
                length = caplength;

+               truncated = TRUE;
+       }

        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;

-       while (--nshorts >= 0) {
-               s1 = EXTRACT_U_1(cp);
+       while (nshorts != 0) {
+               s1 = GET_U_1(cp);

                cp++;
                cp++;

-               s2 = EXTRACT_U_1(cp);
+               s2 = GET_U_1(cp);

                cp++;
                (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
                    " %02x%02x", s1, s2);
                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
                cp++;
                (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
                    " %02x%02x", s1, s2);
                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;

-               *(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
-               *(asp++) = (ND_ISGRAPH(s2) ? s2 : '.');
+               *(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');
+               *(asp++) = (char)(ND_ASCII_ISGRAPH(s2) ? s2 : '.');

                i++;
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
                        ND_PRINT("%s0x%04x: %-*s  %s",
                i++;
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
                        ND_PRINT("%s0x%04x: %-*s  %s",

-                           ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                           indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,

                            hexstuff, asciistuff);
                        i = 0; hsp = hexstuff; asp = asciistuff;
                            hexstuff, asciistuff);
                        i = 0; hsp = hexstuff; asp = asciistuff;

-                       oset += HEXDUMP_BYTES_PER_LINE;
+                       offset += HEXDUMP_BYTES_PER_LINE;

                }
                }

+               nshorts--;

        }
        if (length & 1) {
        }
        if (length & 1) {

-               s1 = EXTRACT_U_1(cp);
+               s1 = GET_U_1(cp);

                cp++;
                (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
                    " %02x", s1);
                hsp += 3;
                cp++;
                (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
                    " %02x", s1);
                hsp += 3;

-               *(asp++) = (ND_ISGRAPH(s1) ? s1 : '.');
+               *(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');

                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';
                ND_PRINT("%s0x%04x: %-*s  %s",
                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';
                ND_PRINT("%s0x%04x: %-*s  %s",

-                    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                    indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,

                     hexstuff, asciistuff);
        }
                     hexstuff, asciistuff);
        }

+       if (truncated)
+               nd_trunc_longjmp(ndo);

 }
 
 void
 }
 
 void

-hex_and_ascii_print(netdissect_options *ndo, const char *ident,
-    const u_char *cp, u_int length)
+hex_and_ascii_print(netdissect_options *ndo, const char *indent,
+                   const u_char *cp, u_int length)

 {
 {

-       hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
+       hex_and_ascii_print_with_offset(ndo, indent, cp, length, 0);

 }
 
 /*
 }
 
 /*


@@ -158,42 +173,46 @@ hex_and_ascii_print(netdissect_options *ndo, const char *ident,
  */
 void
 hex_print_with_offset(netdissect_options *ndo,
  */
 void
 hex_print_with_offset(netdissect_options *ndo,

-                      const char *ident, const u_char *cp, u_int length,
-                     u_int oset)
+                      const char *indent, const u_char *cp, u_int length,
+                     u_int offset)

 {
        u_int caplength;
        u_int i, s;
 {
        u_int caplength;
        u_int i, s;

-       int nshorts;
+       u_int nshorts;
+       int truncated = FALSE;

 
 

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

                length = caplength;
                length = caplength;

-       nshorts = (u_int) length / sizeof(u_short);
+               truncated = TRUE;
+       }
+       nshorts = length / sizeof(u_short);

        i = 0;
        i = 0;

-       while (--nshorts >= 0) {
+       while (nshorts != 0) {

                if ((i++ % 8) == 0) {
                if ((i++ % 8) == 0) {

-                       ND_PRINT("%s0x%04x: ", ident, oset);
-                       oset += HEXDUMP_BYTES_PER_LINE;
+                       ND_PRINT("%s0x%04x: ", indent, offset);
+                       offset += HEXDUMP_BYTES_PER_LINE;

                }
                }

-               s = EXTRACT_U_1(cp);
+               s = GET_U_1(cp);

                cp++;
                cp++;

-               ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp));
+               ND_PRINT(" %02x%02x", s, GET_U_1(cp));

                cp++;
                cp++;

+               nshorts--;

        }
        if (length & 1) {
                if ((i % 8) == 0)
        }
        if (length & 1) {
                if ((i % 8) == 0)

-                       ND_PRINT("%s0x%04x: ", ident, oset);
-               ND_PRINT(" %02x", EXTRACT_U_1(cp));
+                       ND_PRINT("%s0x%04x: ", indent, offset);
+               ND_PRINT(" %02x", GET_U_1(cp));

        }
        }

+       if (truncated)
+               nd_trunc_longjmp(ndo);

 }
 
 }
 

-/*
- * just for completeness
- */

 void
 void

-hex_print(netdissect_options *ndo,const char *ident, const u_char *cp, u_int length)
+hex_print(netdissect_options *ndo,
+         const char *indent, const u_char *cp, u_int length)

 {
 {

-  hex_print_with_offset(ndo, ident, cp, length, 0);
+       hex_print_with_offset(ndo, indent, cp, length, 0);

 }
 
 #ifdef MAIN
 }
 
 #ifdef MAIN