Avoid collison with error(), clean up code a bit.

[tcpdump] / print-sl.c

diff --git a/print-sl.c b/print-sl.c
index 31a9c5ef73182411d31695f1165efb81e550a8e9..87daa47fa3fc2d203dabc6b27ff0f9f9ceda5d0a 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -62,29 +61,27 @@ sl_if_print(netdissect_options *ndo,
        register u_int length = h->len;
        register const struct ip *ip;
 
-       if (caplen < SLIP_HDRLEN) {
+       if (caplen < SLIP_HDRLEN || length < SLIP_HDRLEN) {
                ND_PRINT((ndo, "%s", tstr));
                return (caplen);
        }
 
        length -= SLIP_HDRLEN;
 
-       ip = (struct ip *)(p + SLIP_HDRLEN);
+       ip = (const struct ip *)(p + SLIP_HDRLEN);
 
        if (ndo->ndo_eflag)
                sliplink_print(ndo, p, ip, length);
 
        switch (IP_V(ip)) {
        case 4:
-               ip_print(ndo, (u_char *)ip, length);
+               ip_print(ndo, (const u_char *)ip, length);
                break;
-#ifdef INET6
        case 6:
-               ip6_print(ndo, (u_char *)ip, length);
+               ip6_print(ndo, (const u_char *)ip, length);
                break;
-#endif
        default:
-               printf ("ip v%d", IP_V(ip));
+               ND_PRINT((ndo, "ip v%d", IP_V(ip)));
        }
 
        return (SLIP_HDRLEN);
@@ -105,14 +102,14 @@ sl_bsdos_if_print(netdissect_options *ndo,
 
        length -= SLIP_HDRLEN;
 
-       ip = (struct ip *)(p + SLIP_HDRLEN);
+       ip = (const struct ip *)(p + SLIP_HDRLEN);
 
 #ifdef notdef
        if (ndo->ndo_eflag)
                sliplink_print(ndo, p, ip, length);
 #endif
 
-       ip_print(ndo, (u_char *)ip, length);
+       ip_print(ndo, (const u_char *)ip, length);
 
        return (SLIP_HDRLEN);
 }
@@ -149,9 +146,9 @@ 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 = ((struct ip *)&p[SLX_CHDR])->ip_p;
+               lastconn = ((const struct ip *)&p[SLX_CHDR])->ip_p;
                hlen = IP_HL(ip);
-               hlen += TH_OFF((struct tcphdr *)&((int *)ip)[hlen]);
+               hlen += TH_OFF((const struct tcphdr *)&((const int *)ip)[hlen]);
                lastlen[dir][lastconn] = length - (hlen << 2);
                ND_PRINT((ndo, "utcp %d: ", lastconn));
                break;
@@ -244,7 +241,7 @@ compressed_sl_print(netdissect_options *ndo,
         * 'length - hlen' is the amount of data in the packet.
         */
        hlen = IP_HL(ip);
-       hlen += TH_OFF((struct tcphdr *)&((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)));
 }