Regenerate config files.

[tcpdump] / print-sll.c

diff --git a/print-sll.c b/print-sll.c
index af14a4e2ba1596e2bcc4971cc0d6cba453fe5ebd..6148569ec160802ca48001223953ff1a16716b1e 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -18,22 +18,16 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.19 2005-11-13 12:12:43 guy Exp $ (LBL)";
-#endif
+
+/* \summary: Linux cooked sockets capture printer */

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

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <pcap.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"


@@ -85,11 +79,11 @@ static const char rcsid[] _U_ =
 #define SLL_ADDRLEN    8               /* length of address field */
 
 struct sll_header {
 #define SLL_ADDRLEN    8               /* length of address field */
 
 struct sll_header {

-       u_int16_t       sll_pkttype;    /* packet type */
-       u_int16_t       sll_hatype;     /* link-layer address type */
-       u_int16_t       sll_halen;      /* link-layer address length */
-       u_int8_t        sll_addr[SLL_ADDRLEN];  /* link-layer address */
-       u_int16_t       sll_protocol;   /* protocol */
+       uint16_t        sll_pkttype;    /* packet type */
+       uint16_t        sll_hatype;     /* link-layer address type */
+       uint16_t        sll_halen;      /* link-layer address length */
+       uint8_t         sll_addr[SLL_ADDRLEN];  /* link-layer address */
+       uint16_t        sll_protocol;   /* protocol */

 };
 
 /*
 };
 
 /*


@@ -138,11 +132,11 @@ static const struct tok sll_pkttype_values[] = {
 };
 
 static inline void
 };
 
 static inline void

-sll_print(register const struct sll_header *sllp, u_int length)
+sll_print(netdissect_options *ndo, register const struct sll_header *sllp, u_int length)

 {
        u_short ether_type;
 
 {
        u_short ether_type;
 

-        printf("%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_16BITS(&sllp->sll_pkttype)));
+        ND_PRINT((ndo, "%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_16BITS(&sllp->sll_pkttype))));

 
        /*
         * XXX - check the link-layer address type value?
 
        /*
         * XXX - check the link-layer address type value?


@@ -150,9 +144,9 @@ sll_print(register const struct sll_header *sllp, u_int length)
         * XXX - print others as strings of hex?
         */
        if (EXTRACT_16BITS(&sllp->sll_halen) == 6)
         * XXX - print others as strings of hex?
         */
        if (EXTRACT_16BITS(&sllp->sll_halen) == 6)

-               (void)printf("%s ", etheraddr_string(sllp->sll_addr));
+               ND_PRINT((ndo, "%s ", etheraddr_string(ndo, sllp->sll_addr)));

 
 

-       if (!qflag) {
+       if (!ndo->ndo_qflag) {

                ether_type = EXTRACT_16BITS(&sllp->sll_protocol);
 
                if (ether_type <= ETHERMTU) {
                ether_type = EXTRACT_16BITS(&sllp->sll_protocol);
 
                if (ether_type <= ETHERMTU) {


@@ -165,30 +159,30 @@ sll_print(register const struct sll_header *sllp, u_int length)
                                /*
                                 * Ethernet_802.3 IPX frame.
                                 */
                                /*
                                 * Ethernet_802.3 IPX frame.
                                 */

-                               (void)printf("802.3");
+                               ND_PRINT((ndo, "802.3"));

                                break;
 
                        case LINUX_SLL_P_802_2:
                                /*
                                 * 802.2.
                                 */
                                break;
 
                        case LINUX_SLL_P_802_2:
                                /*
                                 * 802.2.
                                 */

-                               (void)printf("802.2");
+                               ND_PRINT((ndo, "802.2"));

                                break;
 
                        default:
                                /*
                                 * What is it?
                                 */
                                break;
 
                        default:
                                /*
                                 * What is it?
                                 */

-                               (void)printf("ethertype Unknown (0x%04x)",
-                                   ether_type);
+                               ND_PRINT((ndo, "ethertype Unknown (0x%04x)",
+                                   ether_type));

                                break;
                        }
                } else {
                                break;
                        }
                } else {

-                       (void)printf("ethertype %s (0x%04x)",
+                       ND_PRINT((ndo, "ethertype %s (0x%04x)",

                            tok2str(ethertype_values, "Unknown", ether_type),
                            tok2str(ethertype_values, "Unknown", ether_type),

-                           ether_type);
+                           ether_type));

                }
                }

-               (void)printf(", length %u: ", length);
+               ND_PRINT((ndo, ", length %u: ", length));

        }
 }
 
        }
 }
 


@@ -199,13 +193,14 @@ sll_print(register const struct sll_header *sllp, u_int length)
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-sll_if_print(const struct pcap_pkthdr *h, const u_char *p)
+sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int caplen = h->caplen;
        u_int length = h->len;
        register const struct sll_header *sllp;
        u_short ether_type;
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
        register const struct sll_header *sllp;
        u_short ether_type;

-       u_short extracted_ethertype;
+       int llc_hdrlen;
+       u_int hdrlen;

 
        if (caplen < SLL_HDR_LEN) {
                /*
 
        if (caplen < SLL_HDR_LEN) {
                /*


@@ -213,14 +208,14 @@ sll_if_print(const struct pcap_pkthdr *h, const u_char *p)
                 * adds this many bytes of header to every packet in a
                 * cooked socket capture.
                 */
                 * adds this many bytes of header to every packet in a
                 * cooked socket capture.
                 */

-               printf("[|sll]");
+               ND_PRINT((ndo, "[|sll]"));

                return (caplen);
        }
 
        sllp = (const struct sll_header *)p;
 
                return (caplen);
        }
 
        sllp = (const struct sll_header *)p;
 

-       if (eflag)
-               sll_print(sllp, length);
+       if (ndo->ndo_eflag)
+               sll_print(ndo, sllp, length);

 
        /*
         * Go past the cooked-mode header.
 
        /*
         * Go past the cooked-mode header.


@@ -228,6 +223,7 @@ sll_if_print(const struct pcap_pkthdr *h, const u_char *p)
        length -= SLL_HDR_LEN;
        caplen -= SLL_HDR_LEN;
        p += SLL_HDR_LEN;
        length -= SLL_HDR_LEN;
        caplen -= SLL_HDR_LEN;
        p += SLL_HDR_LEN;

+       hdrlen = SLL_HDR_LEN;

 
        ether_type = EXTRACT_16BITS(&sllp->sll_protocol);
 
 
        ether_type = EXTRACT_16BITS(&sllp->sll_protocol);
 


@@ -246,7 +242,7 @@ recurse:
                        /*
                         * Ethernet_802.3 IPX frame.
                         */
                        /*
                         * Ethernet_802.3 IPX frame.
                         */

-                       ipx_print(p, length);
+                       ipx_print(ndo, p, length);

                        break;
 
                case LINUX_SLL_P_802_2:
                        break;
 
                case LINUX_SLL_P_802_2:


@@ -254,25 +250,19 @@ recurse:
                         * 802.2.
                         * Try to print the LLC-layer header & higher layers.
                         */
                         * 802.2.
                         * Try to print the LLC-layer header & higher layers.
                         */

-                       if (llc_print(p, length, caplen, NULL, NULL,
-                           &extracted_ethertype) == 0)
+                       llc_hdrlen = llc_print(ndo, p, length, caplen, NULL, NULL);
+                       if (llc_hdrlen < 0)

                                goto unknown;   /* unknown LLC type */
                                goto unknown;   /* unknown LLC type */

+                       hdrlen += llc_hdrlen;

                        break;
 
                default:
                        break;
 
                default:

-                       extracted_ethertype = 0;

                        /*FALLTHROUGH*/
 
                unknown:
                        /*FALLTHROUGH*/
 
                unknown:

-                       /* ether_type not known, print raw packet */
-                       if (!eflag)
-                               sll_print(sllp, length + SLL_HDR_LEN);
-                       if (extracted_ethertype) {
-                               printf("(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype)));
-                       }
-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+                       /* packet type not known, print raw packet */
+                       if (!ndo->ndo_suppress_default_print)
+                               ND_DEFAULTPRINT(p, caplen);

                        break;
                }
        } else if (ether_type == ETHERTYPE_8021Q) {
                        break;
                }
        } else if (ether_type == ETHERTYPE_8021Q) {


@@ -280,39 +270,41 @@ recurse:
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */

-               if (caplen < 4 || length < 4) {
-                       printf("[|vlan]");
-                       return (SLL_HDR_LEN);
+               if (caplen < 4) {
+                       ND_PRINT((ndo, "[|vlan]"));
+                       return (hdrlen + caplen);
+               }
+               if (length < 4) {
+                       ND_PRINT((ndo, "[|vlan]"));
+                       return (hdrlen + length);

                }
                }

-               if (eflag) {
-                       u_int16_t tag = EXTRACT_16BITS(p);
+               if (ndo->ndo_eflag) {
+                       uint16_t tag = EXTRACT_16BITS(p);

 
 

-                       printf("vlan %u, p %u%s, ",
-                           tag & 0xfff,
-                           tag >> 13,
-                           (tag & 0x1000) ? ", CFI" : "");
+                       ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));

                }
 
                ether_type = EXTRACT_16BITS(p + 2);
                if (ether_type <= ETHERMTU)
                        ether_type = LINUX_SLL_P_802_2;
                }
 
                ether_type = EXTRACT_16BITS(p + 2);
                if (ether_type <= ETHERMTU)
                        ether_type = LINUX_SLL_P_802_2;

-               if (!qflag) {
-                       (void)printf("ethertype %s, ",
-                           tok2str(ethertype_values, "Unknown", ether_type));
+               if (!ndo->ndo_qflag) {
+                       ND_PRINT((ndo, "ethertype %s, ",
+                           tok2str(ethertype_values, "Unknown", ether_type)));

                }
                p += 4;
                length -= 4;
                caplen -= 4;
                }
                p += 4;
                length -= 4;
                caplen -= 4;

+               hdrlen += 4;

                goto recurse;
        } else {
                goto recurse;
        } else {

-               if (ethertype_print(gndo, ether_type, p, length, caplen) == 0) {
+               if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {

                        /* ether_type not known, print raw packet */
                        /* ether_type not known, print raw packet */

-                       if (!eflag)
-                               sll_print(sllp, length + SLL_HDR_LEN);
-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+                       if (!ndo->ndo_eflag)
+                               sll_print(ndo, sllp, length + SLL_HDR_LEN);
+                       if (!ndo->ndo_suppress_default_print)
+                               ND_DEFAULTPRINT(p, caplen);

                }
        }
 
                }
        }
 

-       return (SLL_HDR_LEN);
+       return (hdrlen);

 }
 }