* POSSIBILITY OF SUCH DAMAGE.
*/
+/* \summary: ASCII packet dump printer */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.17 2005-07-06 20:53:32 guy Exp $";
-#endif
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdio.h>
#include "netdissect.h"
+#include "extract.h"
#define ASCII_LINELENGTH 300
#define HEXDUMP_BYTES_PER_LINE 16
#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
-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) ? ndo->ndo_snapend - cp : 0;
+ if (length > caplength)
+ length = caplength;
+ ND_PRINT("\n");
while (length > 0) {
- s = *cp++;
+ s = EXTRACT_U_1(cp);
+ cp++;
length--;
- if (!isgraph(s) &&
- (s != '\t' && s != ' ' && s != '\n' && s != '\r'))
- putchar('.');
- else
- putchar(s);
+ if (s == '\r') {
+ /*
+ * Don't print CRs at the end of the line; they
+ * don't belong at the ends of lines on UN*X,
+ * and the standard I/O library will give us one
+ * on Windows so we don't need to print one
+ * ourselves.
+ *
+ * In the middle of a line, just print a '.'.
+ */
+ if (length > 1 && EXTRACT_U_1(cp) != '\n')
+ ND_PRINT(".");
+ } else {
+ if (!ND_ISGRAPH(s) &&
+ (s != '\t' && s != ' ' && s != '\n'))
+ ND_PRINT(".");
+ else
+ 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;
+ 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;
- while (--nshorts >= 0) {
- s1 = *cp++;
- s2 = *cp++;
- (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+ while (nshorts != 0) {
+ s1 = EXTRACT_U_1(cp);
+ cp++;
+ s2 = EXTRACT_U_1(cp);
+ cp++;
+ (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
" %02x%02x", s1, s2);
hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
- *(asp++) = (isgraph(s1) ? s1 : '.');
- *(asp++) = (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';
- (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;
}
+ nshorts--;
}
if (length & 1) {
- s1 = *cp++;
- (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+ s1 = EXTRACT_U_1(cp);
+ cp++;
+ (void)nd_snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
" %02x", s1);
hsp += 3;
- *(asp++) = (isgraph(s1) ? s1 : '.');
+ *(asp++) = (char)(ND_ISGRAPH(s1) ? s1 : '.');
++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
-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);
}
/*
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) ? ndo->ndo_snapend - cp : 0;
+ if (length > caplength)
+ length = caplength;
+ nshorts = length / sizeof(u_short);
i = 0;
- while (--nshorts >= 0) {
+ while (nshorts != 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 = EXTRACT_U_1(cp);
+ cp++;
+ ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp));
+ cp++;
+ nshorts--;
}
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", EXTRACT_U_1(cp));
}
}
projects / tcpdump / blobdiff