Backout CHANGES update - wrong branch

[tcpdump] / print-sl.c

diff --git a/print-sl.c b/print-sl.c
index c8d5b86b1d184ad35d376110be53e4ad19e783e4..f00d3943d320a6d4613f8ad9265210fa4238eb6a 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -20,39 +20,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.42 1999-10-07 23:47:12 mcr Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.65 2005-04-06 21:32:42 mcr Exp $ (LBL)";

 #endif
 
 #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;
+#ifdef HAVE_CONFIG_H
+#include "config.h"

 #endif
 #endif

-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-
-#include <net/slcompress.h>
-#include <net/slip.h>
-
-#include <ctype.h>
-#include <netdb.h>
+
+#include <tcpdump-stdinc.h>
+

 #include <pcap.h>
 #include <stdio.h>
 
 #include <pcap.h>
 #include <stdio.h>
 


@@ -60,42 +37,28 @@ struct rtentry;
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
 
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
 

+#include "ip.h"
+#include "tcp.h"
+#include "slip.h"
+#include "slcompress.h"
+

 static u_int lastlen[2][256];
 static u_int lastconn = 255;
 
 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 u_int lastlen[2][256];
 static u_int lastconn = 255;
 
 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);
 

-/* 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
-
-/* XXX needs more hacking to work right */
-
-void
-sl_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+sl_if_print(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;
 
 {
        register u_int caplen = h->caplen;
        register u_int length = h->len;
        register const struct ip *ip;
 

-       ts_print(&h->ts);
-

        if (caplen < SLIP_HDRLEN) {
                printf("[|slip]");
        if (caplen < SLIP_HDRLEN) {
                printf("[|slip]");

-               goto out;
+               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;
 


@@ -104,35 +67,33 @@ sl_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        if (eflag)
                sliplink_print(p, ip, length);
 
        if (eflag)
                sliplink_print(p, ip, length);
 

-       ip_print((u_char *)ip, length);
+       switch (IP_V(ip)) {
+       case 4:
+               ip_print(gndo, (u_char *)ip, length);
+               break;
+#ifdef INET6
+       case 6:
+               ip6_print((u_char *)ip, length);
+               break;
+#endif
+       default:
+               printf ("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(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;
 
 {
        register u_int caplen = h->caplen;
        register u_int length = h->len;
        register const struct ip *ip;
 

-       ts_print(&h->ts);
-

        if (caplen < SLIP_HDRLEN) {
                printf("[|slip]");
        if (caplen < SLIP_HDRLEN) {
                printf("[|slip]");

-               goto out;
+               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;
 


@@ -143,12 +104,9 @@ sl_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                sliplink_print(p, ip, length);
 #endif
 
                sliplink_print(p, ip, length);
 #endif
 

-       ip_print((u_char *)ip, length);
+       ip_print(gndo, (u_char *)ip, length);

 
 

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

 }
 
 static void
 }
 
 static void


@@ -184,8 +142,8 @@ sliplink_print(register const u_char *p, register const struct ip *ip,
                 * has restored the IP header copy to IPPROTO_TCP.
                 */
                lastconn = ((struct ip *)&p[SLX_CHDR])->ip_p;
                 * 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;
+               hlen = IP_HL(ip);
+               hlen += TH_OFF((struct tcphdr *)&((int *)ip)[hlen]);

                lastlen[dir][lastconn] = length - (hlen << 2);
                printf("utcp %d: ", lastconn);
                break;
                lastlen[dir][lastconn] = length - (hlen << 2);
                printf("utcp %d: ", lastconn);
                break;


@@ -274,33 +232,8 @@ compressed_sl_print(const u_char *chdr, const struct ip *ip,
         * 'cp - chdr' is the length of the compressed header.
         * 'length - hlen' is the amount of data in the packet.
         */
         * '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((struct tcphdr *)&((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 */
-}
-
-void
-sl_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
-{
-
-       error("not configured for slip");
-       /* NOTREACHED */
+       printf(" %d (%ld)", lastlen[dir][lastconn], (long)(cp - chdr));

 }
 }

-#endif