Add EXTRACT_ calls.

[tcpdump] / print-sl.c

diff --git a/print-sl.c b/print-sl.c
index fabedc516b1ec571df6be420f9f76c445422fc91..1805904133f7ad7acdc80ac25036f8d8af180efe 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -19,174 +19,146 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.45 1999-11-21 09:37:01 fenner Exp $ (LBL)";
-#endif
+/* \summary: Compressed Serial Line Internet Protocol printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifdef HAVE_NET_SLIP_H
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct rtentry;
-#endif
-#include <net/if.h>
+#include <netdissect-stdinc.h>

 
 

-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
+#include "netdissect.h"
+#include "extract.h"

 
 

-#include <net/slcompress.h>
-#include <net/slip.h>
+#include "ip.h"
+#include "tcp.h"
+#include "slcompress.h"

 
 

-#include <ctype.h>
-#include <netdb.h>
-#include <pcap.h>
-#include <stdio.h>
+/*
+ * definitions of the pseudo- link-level header attached to slip
+ * packets grabbed by the packet filter (bpf) traffic monitor.
+ */
+#define SLIP_HDRLEN 16

 
 

-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"                   /* must come after interface.h */
+#define SLX_DIR 0
+#define SLX_CHDR 1
+#define CHDR_LEN 15

 
 

-static u_int lastlen[2][256];
-static u_int lastconn = 255;
+#define SLIPDIR_IN 0
+#define SLIPDIR_OUT 1

 
 

-static void sliplink_print(const u_char *, const struct ip *, u_int);
-static void compressed_sl_print(const u_char *, const struct ip *, u_int, int);
+static const char tstr[] = "[|slip]";

 
 

-/* XXX BSD/OS 2.1 compatibility */
-#if !defined(SLIP_HDRLEN) && defined(SLC_BPFHDR)
-#define SLIP_HDRLEN SLC_BPFHDR
-#define SLX_DIR 0
-#define SLX_CHDR (SLC_BPFHDRLEN - 1)
-#define CHDR_LEN (SLC_BPFHDR - SLC_BPFHDRLEN)
-#endif
+static u_int lastlen[2][256];
+static u_int lastconn = 255;

 
 

-/* XXX needs more hacking to work right */
+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);

 
 

-void
-sl_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+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;
-
-       ts_print(&h->ts);
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+       const struct ip *ip;

 
 

-       if (caplen < SLIP_HDRLEN) {
-               printf("[|slip]");
-               goto out;
+       if (caplen < SLIP_HDRLEN || length < SLIP_HDRLEN) {
+               ND_PRINT((ndo, "%s", tstr));
+               return (caplen);

        }
        }

-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;

 
 

+       caplen -= SLIP_HDRLEN;

        length -= SLIP_HDRLEN;
 
        length -= SLIP_HDRLEN;
 

-       ip = (struct ip *)(p + SLIP_HDRLEN);
+       ip = (const struct ip *)(p + SLIP_HDRLEN);

 
 

-       if (eflag)
-               sliplink_print(p, ip, length);
+       if (ndo->ndo_eflag)
+               sliplink_print(ndo, p, ip, length);

 
 

-       switch (ip->ip_v) {
+       if (caplen < 1 || length < 1) {
+               ND_PRINT((ndo, "%s", tstr));
+               return (caplen + SLIP_HDRLEN);
+       }
+
+       switch (IP_V(ip)) {

        case 4:
        case 4:

-               ip_print((u_char *)ip, length);
+               ip_print(ndo, (const u_char *)ip, length);

                break;
                break;

-#ifdef INET6

        case 6:
        case 6:

-               ipv6_print((u_char *)ip, length);
+               ip6_print(ndo, (const u_char *)ip, length);

                break;
                break;

-#endif

        default:
        default:

-               printf ("ip v%d", ip->ip_v);
+               ND_PRINT((ndo, "ip v%d", IP_V(ip)));

        }
 
        }
 

-       if (xflag)
-               default_print((u_char *)ip, caplen - SLIP_HDRLEN);
- out:
-       putchar('\n');
+       return (SLIP_HDRLEN);

 }
 
 }
 

-
-void
-sl_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+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;
-
-       ts_print(&h->ts);
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+       const struct ip *ip;

 
        if (caplen < SLIP_HDRLEN) {
 
        if (caplen < SLIP_HDRLEN) {

-               printf("[|slip]");
-               goto out;
+               ND_PRINT((ndo, "%s", tstr));
+               return (caplen);

        }
        }

-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;

 
        length -= SLIP_HDRLEN;
 
 
        length -= SLIP_HDRLEN;
 

-       ip = (struct ip *)(p + SLIP_HDRLEN);
+       ip = (const struct ip *)(p + SLIP_HDRLEN);

 
 #ifdef notdef
 
 #ifdef notdef

-       if (eflag)
-               sliplink_print(p, ip, length);
+       if (ndo->ndo_eflag)
+               sliplink_print(ndo, p, ip, length);

 #endif
 
 #endif
 

-       ip_print((u_char *)ip, length);
+       ip_print(ndo, (const u_char *)ip, length);

 
 

-       if (xflag)
-               default_print((u_char *)ip, caplen - SLIP_HDRLEN);
- out:
-       putchar('\n');
+       return (SLIP_HDRLEN);

 }
 
 static void
 }
 
 static void

-sliplink_print(register const u_char *p, register const struct ip *ip,
-              register u_int length)
+sliplink_print(netdissect_options *ndo,
+               const u_char *p, const struct ip *ip,
+               u_int length)

 {
        int dir;
        u_int hlen;
 
 {
        int dir;
        u_int hlen;
 

-       dir = p[SLX_DIR];
-       putchar(dir == SLIPDIR_IN ? 'I' : 'O');
-       putchar(' ');
+       dir = EXTRACT_U_1(p + SLX_DIR);
+       switch (dir) {
+
+       case SLIPDIR_IN:
+               ND_PRINT((ndo, "I "));
+               break;
+
+       case SLIPDIR_OUT:
+               ND_PRINT((ndo, "O "));
+               break;

 
 

-       if (nflag) {
+       default:
+               ND_PRINT((ndo, "Invalid direction %d ", dir));
+               dir = -1;
+               break;
+       }
+       if (ndo->ndo_nflag) {

                /* XXX just dump the header */
                /* XXX just dump the header */

-               register int i;
+               int i;

 
                for (i = SLX_CHDR; i < SLX_CHDR + CHDR_LEN - 1; ++i)
 
                for (i = SLX_CHDR; i < SLX_CHDR + CHDR_LEN - 1; ++i)

-                       printf("%02x.", p[i]);
-               printf("%02x: ", p[SLX_CHDR + CHDR_LEN - 1]);
+                       ND_PRINT((ndo, "%02x.", EXTRACT_U_1(p + i)));
+               ND_PRINT((ndo, "%02x: ", EXTRACT_U_1(p + SLX_CHDR + CHDR_LEN - 1)));

                return;
        }
                return;
        }

-       switch (p[SLX_CHDR] & 0xf0) {
+       switch (EXTRACT_U_1(p + SLX_CHDR) & 0xf0) {

 
        case TYPE_IP:
 
        case TYPE_IP:

-               printf("ip %d: ", length + SLIP_HDRLEN);
+               ND_PRINT((ndo, "ip %d: ", length + SLIP_HDRLEN));

                break;
 
        case TYPE_UNCOMPRESSED_TCP:
                break;
 
        case TYPE_UNCOMPRESSED_TCP:


@@ -195,124 +167,114 @@ sliplink_print(register const u_char *p, register const struct ip *ip,
                 * Get it from the link layer since sl_uncompress_tcp()
                 * has restored the IP header copy to IPPROTO_TCP.
                 */
                 * 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;
-               hlen = ip->ip_hl;
-               hlen += ((struct tcphdr *)&((int *)ip)[hlen])->th_off;
+               lastconn = EXTRACT_U_1(((const struct ip *)(p + SLX_CHDR))->ip_p);
+               ND_PRINT((ndo, "utcp %d: ", lastconn));
+               if (dir == -1) {
+                       /* Direction is bogus, don't use it */
+                       return;
+               }
+               hlen = IP_HL(ip);
+               hlen += TH_OFF((const struct tcphdr *)&((const int *)ip)[hlen]);

                lastlen[dir][lastconn] = length - (hlen << 2);
                lastlen[dir][lastconn] = length - (hlen << 2);

-               printf("utcp %d: ", lastconn);

                break;
 
        default:
                break;
 
        default:

-               if (p[SLX_CHDR] & TYPE_COMPRESSED_TCP) {
-                       compressed_sl_print(&p[SLX_CHDR], ip,
-                           length, dir);
-                       printf(": ");
+               if (dir == -1) {
+                       /* Direction is bogus, don't use it */
+                       return;
+               }
+               if (EXTRACT_U_1(p + SLX_CHDR) & TYPE_COMPRESSED_TCP) {
+                       compressed_sl_print(ndo, p + SLX_CHDR, ip,
+                                           length, dir);
+                       ND_PRINT((ndo, ": "));

                } else
                } else

-                       printf("slip-%d!: ", p[SLX_CHDR]);
+                       ND_PRINT((ndo, "slip-%d!: ", EXTRACT_U_1(p + SLX_CHDR)));

        }
 }
 
 static const u_char *
        }
 }
 
 static const u_char *

-print_sl_change(const char *str, register const u_char *cp)
+print_sl_change(netdissect_options *ndo,
+                const char *str, const u_char *cp)

 {
 {

-       register u_int i;
+       u_int i;

 
 

-       if ((i = *cp++) == 0) {
-               i = EXTRACT_16BITS(cp);
+       if ((i = EXTRACT_U_1(cp)) == 0) {
+               cp++;
+               i = EXTRACT_BE_U_2(cp);

                cp += 2;
        }
                cp += 2;
        }

-       printf(" %s%d", str, i);
+       ND_PRINT((ndo, " %s%d", str, i));

        return (cp);
 }
 
 static const u_char *
        return (cp);
 }
 
 static const u_char *

-print_sl_winchange(register const u_char *cp)
+print_sl_winchange(netdissect_options *ndo,
+                   const u_char *cp)

 {
 {

-       register short i;
+       short i;

 
 

-       if ((i = *cp++) == 0) {
-               i = EXTRACT_16BITS(cp);
+       if ((i = EXTRACT_U_1(cp)) == 0) {
+               cp++;
+               i = EXTRACT_BE_U_2(cp);

                cp += 2;
        }
        if (i >= 0)
                cp += 2;
        }
        if (i >= 0)

-               printf(" W+%d", i);
+               ND_PRINT((ndo, " W+%d", i));

        else
        else

-               printf(" W%d", i);
+               ND_PRINT((ndo, " W%d", i));

        return (cp);
 }
 
 static void
        return (cp);
 }
 
 static void

-compressed_sl_print(const u_char *chdr, const struct ip *ip,
-                   u_int length, int dir)
+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 = *cp++;
+       flags = EXTRACT_U_1(cp);
+       cp++;

        if (flags & NEW_C) {
        if (flags & NEW_C) {

-               lastconn = *cp++;
-               printf("ctcp %d", lastconn);
+               lastconn = EXTRACT_U_1(cp);
+               cp++;
+               ND_PRINT((ndo, "ctcp %d", lastconn));

        } else
        } else

-               printf("ctcp *");
+               ND_PRINT((ndo, "ctcp *"));

 
        /* skip tcp checksum */
        cp += 2;
 
        switch (flags & SPECIALS_MASK) {
        case SPECIAL_I:
 
        /* skip tcp checksum */
        cp += 2;
 
        switch (flags & SPECIALS_MASK) {
        case SPECIAL_I:

-               printf(" *SA+%d", lastlen[dir][lastconn]);
+               ND_PRINT((ndo, " *SA+%d", lastlen[dir][lastconn]));

                break;
 
        case SPECIAL_D:
                break;
 
        case SPECIAL_D:

-               printf(" *S+%d", lastlen[dir][lastconn]);
+               ND_PRINT((ndo, " *S+%d", lastlen[dir][lastconn]));

                break;
 
        default:
                if (flags & NEW_U)
                break;
 
        default:
                if (flags & NEW_U)

-                       cp = print_sl_change("U=", cp);
+                       cp = print_sl_change(ndo, "U=", cp);

                if (flags & NEW_W)
                if (flags & NEW_W)

-                       cp = print_sl_winchange(cp);
+                       cp = print_sl_winchange(ndo, cp);

                if (flags & NEW_A)
                if (flags & NEW_A)

-                       cp = print_sl_change("A+", cp);
+                       cp = print_sl_change(ndo, "A+", cp);

                if (flags & NEW_S)
                if (flags & NEW_S)

-                       cp = print_sl_change("S+", cp);
+                       cp = print_sl_change(ndo, "S+", cp);

                break;
        }
        if (flags & NEW_I)
                break;
        }
        if (flags & NEW_I)

-               cp = print_sl_change("I+", cp);
+               cp = print_sl_change(ndo, "I+", cp);

 
        /*
         * 'hlen' is the length of the uncompressed TCP/IP header (in words).
         * 'cp - chdr' is the length of the compressed header.
         * 'length - hlen' is the amount of data in the packet.
         */
 
        /*
         * 'hlen' is the length of the uncompressed TCP/IP header (in words).
         * 'cp - chdr' is the length of the compressed header.
         * 'length - hlen' is the amount of data in the packet.
         */

-       hlen = ip->ip_hl;
-       hlen += ((struct tcphdr *)&((int32_t *)ip)[hlen])->th_off;
+       hlen = IP_HL(ip);
+       hlen += TH_OFF((const struct tcphdr *)&((const int32_t *)ip)[hlen]);

        lastlen[dir][lastconn] = length - (hlen << 2);
        lastlen[dir][lastconn] = length - (hlen << 2);

-       printf(" %d (%d)", lastlen[dir][lastconn], cp - chdr);
-}
-#else
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <pcap.h>
-#include <stdio.h>
-
-#include "interface.h"
-
-void
-sl_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
-{
-
-       error("not configured for slip");
-       /* NOTREACHED */
+       ND_PRINT((ndo, " %d (%ld)", lastlen[dir][lastconn], (long)(cp - chdr)));

 }
 }

-
-void
-sl_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
-{
-
-       error("not configured for slip");
-       /* NOTREACHED */
-}
-#endif