Merge pull request #760 from leres/master

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 18d5d0fb312ec564816103581f0c5b55f2a6b084..63f15f0f14215fe6708188a4b479494597dc7b88 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -36,15 +36,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

+/* \summary: ASCII packet dump printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

 #include <stdio.h>
 
 #include "netdissect.h"
 #include <stdio.h>
 
 #include "netdissect.h"

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

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


@@ -53,14 +55,23 @@
 #define HEXDUMP_HEXSTUFF_PER_LINE \
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
 #define HEXDUMP_HEXSTUFF_PER_LINE \
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 

+static void hex_and_ascii_print_with_offset(netdissect_options *, const char *, const u_char *, u_int, u_int);
+

 void
 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;
+       u_char s;

 
 

-       putchar('\n');
+       ndo->ndo_protocol = "ascii";
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       if (length > caplength)
+               length = caplength;
+       ND_PRINT("\n");

        while (length > 0) {
        while (length > 0) {

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

                length--;
                if (s == '\r') {
                        /*
                length--;
                if (s == '\r') {
                        /*


@@ -72,70 +83,78 @@ ascii_print(register const u_char *cp, register u_int length)
                         *
                         * In the middle of a line, just print a '.'.
                         */
                         *
                         * In the middle of a line, just print a '.'.
                         */

-                       if (length > 1 && *cp != '\n')
-                               putchar('.');
+                       if (length > 1 && GET_U_1(cp) != '\n')
+                               ND_PRINT(".");

                } else {
                        if (!ND_ISGRAPH(s) &&
                            (s != '\t' && s != ' ' && s != '\n'))
                } else {
                        if (!ND_ISGRAPH(s) &&
                            (s != '\t' && s != ' ' && s != '\n'))

-                               putchar('.');
+                               ND_PRINT(".");

                        else
                        else

-                               putchar(s);
+                               ND_PRINT("%c", s);

                }
        }
 }
 
                }
        }
 }
 

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

 {
 {

-       register u_int i;
-       register int s1, s2;
-       register int nshorts;
+       u_int caplength;
+       u_int i;
+       u_int s1, s2;
+       u_int nshorts;

        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) ? ND_BYTES_AVAILABLE_AFTER(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;

-       while (--nshorts >= 0) {
-               s1 = *cp++;
-               s2 = *cp++;
-               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+       while (nshorts != 0) {
+               s1 = GET_U_1(cp);
+               cp++;
+               s2 = GET_U_1(cp);
+               cp++;
+               (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),

                    " %02x%02x", s1, s2);
                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
                    " %02x%02x", s1, s2);
                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;

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

                i++;
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
                i++;
                if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';

-                       (void)printf("%s0x%04x: %-*s  %s",
+                       ND_PRINT("%s0x%04x: %-*s  %s",

                            ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                            hexstuff, asciistuff);
                        i = 0; hsp = hexstuff; asp = asciistuff;
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
                            ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                            hexstuff, asciistuff);
                        i = 0; hsp = hexstuff; asp = asciistuff;
                        oset += HEXDUMP_BYTES_PER_LINE;
                }

+               nshorts--;

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

-               s1 = *cp++;
-               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+               s1 = GET_U_1(cp);
+               cp++;
+               (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),

                    " %02x", s1);
                hsp += 3;
                    " %02x", s1);
                hsp += 3;

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

                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';
                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';

-               (void)printf("%s0x%04x: %-*s  %s",
+               ND_PRINT("%s0x%04x: %-*s  %s",

                     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                     hexstuff, asciistuff);
        }
 }
 
 void
                     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                     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, const char *ident,
+    const u_char *cp, 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 +165,30 @@ 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)
 {

-       register u_int i, s;
-       register int nshorts;
+       u_int caplength;
+       u_int i, s;
+       u_int nshorts;

 
 

-       nshorts = (u_int) length / sizeof(u_short);
+       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       if (length > caplength)
+               length = caplength;
+       nshorts = length / sizeof(u_short);

        i = 0;
        i = 0;

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

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

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

                }
                }

-               s = *cp++;
-               (void)ND_PRINT((ndo," %02x%02x", s, *cp++));
+               s = GET_U_1(cp);
+               cp++;
+               ND_PRINT(" %02x%02x", s, GET_U_1(cp));
+               cp++;
+               nshorts--;

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

-                  (void)ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-               (void)ND_PRINT((ndo," %02x", *cp));
+                       ND_PRINT("%s0x%04x: ", ident, oset);
+               ND_PRINT(" %02x", GET_U_1(cp));

        }
 }
 
        }
 }