X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/da20bc56d6100b5275d6f85c4a25bac1dab4e57e..cda9bf8c5f842fc7110fbbf2234bcc898f78c0bd:/print-sl.c

diff --git a/print-sl.c b/print-sl.c
index 1e329cf4..14f9bc1b 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -22,10 +22,10 @@
 /* \summary: Compressed Serial Line Internet Protocol printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -47,24 +47,24 @@
 #define SLIPDIR_IN 0
 #define SLIPDIR_OUT 1
 
-static const char tstr[] = "[|slip]";
 
 static u_int lastlen[2][256];
 static u_int lastconn = 255;
 
-static void sliplink_print(netdissect_options *, const u_char *, const struct ip *, u_int);
-static void compressed_sl_print(netdissect_options *, const u_char *, const struct ip *, u_int, int);
+static int sliplink_print(netdissect_options *, const u_char *, const struct ip *, u_int);
+static int compressed_sl_print(netdissect_options *, const u_char *, const struct ip *, u_int, int);
 
 u_int
 sl_if_print(netdissect_options *ndo,
             const struct pcap_pkthdr *h, const u_char *p)
 {
-	register u_int caplen = h->caplen;
-	register u_int length = h->len;
-	register const struct ip *ip;
+	u_int caplen = h->caplen;
+	u_int length = h->len;
+	const struct ip *ip;
 
-	if (caplen < SLIP_HDRLEN || length < SLIP_HDRLEN) {
-		ND_PRINT((ndo, "%s", tstr));
+	ndo->ndo_protocol = "sl_if";
+	if (caplen < SLIP_HDRLEN) {
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 
@@ -74,10 +74,13 @@ sl_if_print(netdissect_options *ndo,
 	ip = (const struct ip *)(p + SLIP_HDRLEN);
 
 	if (ndo->ndo_eflag)
-		sliplink_print(ndo, p, ip, length);
+		if (sliplink_print(ndo, p, ip, length) == -1) {
+			nd_print_trunc(ndo);
+			return (caplen + SLIP_HDRLEN);
+		}
 
-	if (caplen < 1 || length < 1) {
-		ND_PRINT((ndo, "%s", tstr));
+	if (caplen < 1) {
+		nd_print_trunc(ndo);
 		return (caplen + SLIP_HDRLEN);
 	}
 
@@ -89,7 +92,7 @@ sl_if_print(netdissect_options *ndo,
 		ip6_print(ndo, (const u_char *)ip, length);
 		break;
 	default:
-		ND_PRINT((ndo, "ip v%d", IP_V(ip)));
+		ND_PRINT("ip v%u", IP_V(ip));
 	}
 
 	return (SLIP_HDRLEN);
@@ -99,12 +102,13 @@ u_int
 sl_bsdos_if_print(netdissect_options *ndo,
                   const struct pcap_pkthdr *h, const u_char *p)
 {
-	register u_int caplen = h->caplen;
-	register u_int length = h->len;
-	register const struct ip *ip;
+	u_int caplen = h->caplen;
+	u_int length = h->len;
+	const struct ip *ip;
 
+	ndo->ndo_protocol = "sl_bsdos_if";
 	if (caplen < SLIP_HDRLEN) {
-		ND_PRINT((ndo, "%s", tstr));
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 
@@ -122,43 +126,34 @@ sl_bsdos_if_print(netdissect_options *ndo,
 	return (SLIP_HDRLEN);
 }
 
-static void
+static int
 sliplink_print(netdissect_options *ndo,
-               register const u_char *p, register const struct ip *ip,
-               register u_int length)
+               const u_char *p, const struct ip *ip,
+               u_int length)
 {
 	int dir;
 	u_int hlen;
 
-	dir = p[SLX_DIR];
+	dir = GET_U_1(p + SLX_DIR);
 	switch (dir) {
 
 	case SLIPDIR_IN:
-		ND_PRINT((ndo, "I "));
+		ND_PRINT("I ");
 		break;
 
 	case SLIPDIR_OUT:
-		ND_PRINT((ndo, "O "));
+		ND_PRINT("O ");
 		break;
 
 	default:
-		ND_PRINT((ndo, "Invalid direction %d ", dir));
+		ND_PRINT("Invalid direction %d ", dir);
 		dir = -1;
 		break;
 	}
-	if (ndo->ndo_nflag) {
-		/* XXX just dump the header */
-		register int i;
-
-		for (i = SLX_CHDR; i < SLX_CHDR + CHDR_LEN - 1; ++i)
-			ND_PRINT((ndo, "%02x.", p[i]));
-		ND_PRINT((ndo, "%02x: ", p[SLX_CHDR + CHDR_LEN - 1]));
-		return;
-	}
-	switch (p[SLX_CHDR] & 0xf0) {
+	switch (GET_U_1(p + SLX_CHDR) & 0xf0) {
 
 	case TYPE_IP:
-		ND_PRINT((ndo, "ip %d: ", length + SLIP_HDRLEN));
+		ND_PRINT("ip %u: ", length + SLIP_HDRLEN);
 		break;
 
 	case TYPE_UNCOMPRESSED_TCP:
@@ -167,13 +162,15 @@ sliplink_print(netdissect_options *ndo,
 		 * Get it from the link layer since sl_uncompress_tcp()
 		 * has restored the IP header copy to IPPROTO_TCP.
 		 */
-		lastconn = ((const struct ip *)&p[SLX_CHDR])->ip_p;
-		ND_PRINT((ndo, "utcp %d: ", lastconn));
+		lastconn = GET_U_1(((const struct ip *)(p + SLX_CHDR))->ip_p);
+		ND_PRINT("utcp %u: ", lastconn);
 		if (dir == -1) {
 			/* Direction is bogus, don't use it */
-			return;
+			return 0;
 		}
+		ND_TCHECK_SIZE(ip);
 		hlen = IP_HL(ip);
+		ND_TCHECK_SIZE((const struct tcphdr *)&((const int *)ip)[hlen]);
 		hlen += TH_OFF((const struct tcphdr *)&((const int *)ip)[hlen]);
 		lastlen[dir][lastconn] = length - (hlen << 2);
 		break;
@@ -181,75 +178,81 @@ sliplink_print(netdissect_options *ndo,
 	default:
 		if (dir == -1) {
 			/* Direction is bogus, don't use it */
-			return;
+			return 0;
 		}
-		if (p[SLX_CHDR] & TYPE_COMPRESSED_TCP) {
-			compressed_sl_print(ndo, &p[SLX_CHDR], ip,
-			    length, dir);
-			ND_PRINT((ndo, ": "));
+		if (GET_U_1(p + SLX_CHDR) & TYPE_COMPRESSED_TCP) {
+			if (compressed_sl_print(ndo, p + SLX_CHDR, ip,
+					        length, dir) == -1)
+				goto trunc;
+			ND_PRINT(": ");
 		} else
-			ND_PRINT((ndo, "slip-%d!: ", p[SLX_CHDR]));
+			ND_PRINT("slip-%u!: ", GET_U_1(p + SLX_CHDR));
 	}
+	return 0;
+trunc:
+	return -1;
 }
 
 static const u_char *
 print_sl_change(netdissect_options *ndo,
-                const char *str, register const u_char *cp)
+                const char *str, const u_char *cp)
 {
-	register u_int i;
+	u_int i;
 
-	if ((i = *cp++) == 0) {
-		i = EXTRACT_BE_U_2(cp);
+	if ((i = GET_U_1(cp)) == 0) {
+		cp++;
+		i = GET_BE_U_2(cp);
 		cp += 2;
 	}
-	ND_PRINT((ndo, " %s%d", str, i));
+	ND_PRINT(" %s%u", str, i);
 	return (cp);
 }
 
 static const u_char *
 print_sl_winchange(netdissect_options *ndo,
-                   register const u_char *cp)
+                   const u_char *cp)
 {
-	register short i;
+	int16_t i;
 
-	if ((i = *cp++) == 0) {
-		i = EXTRACT_BE_U_2(cp);
+	if ((i = GET_U_1(cp)) == 0) {
+		cp++;
+		i = GET_BE_S_2(cp);
 		cp += 2;
 	}
 	if (i >= 0)
-		ND_PRINT((ndo, " W+%d", i));
+		ND_PRINT(" W+%d", i);
 	else
-		ND_PRINT((ndo, " W%d", i));
+		ND_PRINT(" W%d", i);
 	return (cp);
 }
 
-static void
+static int
 compressed_sl_print(netdissect_options *ndo,
                     const u_char *chdr, const struct ip *ip,
                     u_int length, int dir)
 {
-	register const u_char *cp = chdr;
-	register u_int flags, hlen;
+	const u_char *cp = chdr;
+	u_int flags, hlen;
 
-	flags = EXTRACT_U_1(cp);
+	flags = GET_U_1(cp);
 	cp++;
 	if (flags & NEW_C) {
-		lastconn = EXTRACT_U_1(cp);
+		lastconn = GET_U_1(cp);
 		cp++;
-		ND_PRINT((ndo, "ctcp %d", lastconn));
+		ND_PRINT("ctcp %u", lastconn);
 	} else
-		ND_PRINT((ndo, "ctcp *"));
+		ND_PRINT("ctcp *");
 
 	/* skip tcp checksum */
 	cp += 2;
 
 	switch (flags & SPECIALS_MASK) {
 	case SPECIAL_I:
-		ND_PRINT((ndo, " *SA+%d", lastlen[dir][lastconn]));
+		ND_PRINT(" *SA+%u", lastlen[dir][lastconn]);
 		break;
 
 	case SPECIAL_D:
-		ND_PRINT((ndo, " *S+%d", lastlen[dir][lastconn]));
+		ND_PRINT(" *S+%u", lastlen[dir][lastconn]);
 		break;
 
 	default:
@@ -271,8 +274,13 @@ compressed_sl_print(netdissect_options *ndo,
 	 * 'cp - chdr' is the length of the compressed header.
 	 * 'length - hlen' is the amount of data in the packet.
 	 */
+	ND_TCHECK_SIZE(ip);
 	hlen = IP_HL(ip);
+	ND_TCHECK_SIZE((const struct tcphdr *)&((const int32_t *)ip)[hlen]);
 	hlen += TH_OFF((const struct tcphdr *)&((const int32_t *)ip)[hlen]);
 	lastlen[dir][lastconn] = length - (hlen << 2);
-	ND_PRINT((ndo, " %d (%ld)", lastlen[dir][lastconn], (long)(cp - chdr)));
+	ND_PRINT(" %u (%ld)", lastlen[dir][lastconn], (long)(cp - chdr));
+	return 0;
+trunc:
+	return -1;
 }