Backout CHANGES update - wrong branch

[tcpdump] / print-sl.c

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

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.60 2002-12-18 08:53:24 guy 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
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -48,28 +48,18 @@ 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 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);
 

-void
-sl_if_print(u_char *user _U_, 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;
 

-       ++infodelay;
-       ts_print(&h->ts);
-

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

-               goto out;
+               return (caplen);

        }
 
        }
 

-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-

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


@@ -79,7 +69,7 @@ sl_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
 
        switch (IP_V(ip)) {
        case 4:
 
        switch (IP_V(ip)) {
        case 4:

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

                break;
 #ifdef INET6
        case 6:
                break;
 #ifdef INET6
        case 6:


@@ -90,38 +80,21 @@ sl_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
                printf ("ip v%d", IP_V(ip));
        }
 
                printf ("ip v%d", IP_V(ip));
        }
 

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

 }
 
 }
 

-
-void
-sl_bsdos_if_print(u_char *user _U_, 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;
 

-       ++infodelay;
-       ts_print(&h->ts);
-

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

-               goto out;
+               return (caplen);

        }
 
        }
 

-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-

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


@@ -131,15 +104,9 @@ sl_bsdos_if_print(u_char *user _U_, 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');
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (SLIP_HDRLEN);

 }
 
 static void
 }
 
 static void