document SIGUSR1 in manual page

[tcpdump] / print-llc.c

diff --git a/print-llc.c b/print-llc.c
index 9a1f9dcfd7d7ace8bf3c563bb66c0adb388592f6..e8a3314c5c79b9c305c06736fefc72b4a88b383e 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -22,15 +22,13 @@
  *     with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 
  *     with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 

+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <string.h>
-

 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */


@@ -126,7 +124,7 @@ static const struct tok null_values[] = {
 };
 
 struct oui_tok {
 };
 
 struct oui_tok {

-       u_int32_t       oui;
+       uint32_t        oui;

        const struct tok *tok;
 };
 
        const struct tok *tok;
 };
 


@@ -143,20 +141,20 @@ static const struct oui_tok oui_to_tok[] = {
  * Returns non-zero IFF it succeeds in printing the header
  */
 int
  * Returns non-zero IFF it succeeds in printing the header
  */
 int

-llc_print(const u_char *p, u_int length, u_int caplen,
+llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,

          const u_char *esrc, const u_char *edst, u_short *extracted_ethertype)
 {
          const u_char *esrc, const u_char *edst, u_short *extracted_ethertype)
 {

-       u_int8_t dsap_field, dsap, ssap_field, ssap;
-       u_int16_t control;
+       uint8_t dsap_field, dsap, ssap_field, ssap;
+       uint16_t control;

        int is_u;
        register int ret;
 
        *extracted_ethertype = 0;
 
        int is_u;
        register int ret;
 
        *extracted_ethertype = 0;
 

-       if (caplen < 3) {
-               (void)printf("[|llc]");
-               default_print((u_char *)p, caplen);
-               return(0);
+       if (caplen < 3 || length < 3) {
+               ND_PRINT((ndo, "[|llc]"));
+               ND_DEFAULTPRINT((u_char *)p, caplen);
+               return (1);

        }
 
        dsap_field = *p;
        }
 
        dsap_field = *p;


@@ -179,10 +177,10 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * The control field in I and S frames is
                 * 2 bytes...
                 */
                 * The control field in I and S frames is
                 * 2 bytes...
                 */

-               if (caplen < 4) {
-                       (void)printf("[|llc]");
-                       default_print((u_char *)p, caplen);
-                       return(0);
+               if (caplen < 4 || length < 4) {
+                       ND_PRINT((ndo, "[|llc]"));
+                       ND_DEFAULTPRINT((u_char *)p, caplen);
+                       return (1);

                }
 
                /*
                }
 
                /*


@@ -208,41 +206,46 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * least one capture file.)
                 */
 
                 * least one capture file.)
                 */
 

-            if (eflag)
-               printf("IPX 802.3: ");
+            if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "IPX 802.3: "));

 
 

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

             return (1);
        }
 
        dsap = dsap_field & ~LLC_IG;
        ssap = ssap_field & ~LLC_GSAP;
 
             return (1);
        }
 
        dsap = dsap_field & ~LLC_IG;
        ssap = ssap_field & ~LLC_GSAP;
 

-       if (eflag) {
-                printf("LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",
+       if (ndo->ndo_eflag) {
+                ND_PRINT((ndo, "LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",

                        tok2str(llc_values, "Unknown", dsap),
                        dsap,
                        tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG),
                        tok2str(llc_values, "Unknown", ssap),
                        ssap,
                        tok2str(llc_values, "Unknown", dsap),
                        dsap,
                        tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG),
                        tok2str(llc_values, "Unknown", ssap),
                        ssap,

-                       tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP));
+                       tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP)));

 
                if (is_u) {
 
                if (is_u) {

-                       printf(", ctrl 0x%02x: ", control);
+                       ND_PRINT((ndo, ", ctrl 0x%02x: ", control));

                } else {
                } else {

-                       printf(", ctrl 0x%04x: ", control);
+                       ND_PRINT((ndo, ", ctrl 0x%04x: ", control));

                }
        }
 
        if (ssap == LLCSAP_8021D && dsap == LLCSAP_8021D &&
            control == LLC_UI) {
                }
        }
 
        if (ssap == LLCSAP_8021D && dsap == LLCSAP_8021D &&
            control == LLC_UI) {

-               stp_print(p+3, length-3);
+               stp_print(ndo, p+3, length-3);

                return (1);
        }
 
        if (ssap == LLCSAP_IP && dsap == LLCSAP_IP &&
            control == LLC_UI) {
                return (1);
        }
 
        if (ssap == LLCSAP_IP && dsap == LLCSAP_IP &&
            control == LLC_UI) {

-               ip_print(gndo, p+4, length-4);
+               if (caplen < 4 || length < 4) {
+                       ND_PRINT((ndo, "[|llc]"));
+                       ND_DEFAULTPRINT((u_char *)p, caplen);
+                       return (1);
+               }
+               ip_print(ndo, p+4, length-4);

                return (1);
        }
 
                return (1);
        }
 


@@ -255,10 +258,10 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 *
                 * Skip DSAP, LSAP, and control field.
                 */
                 *
                 * Skip DSAP, LSAP, and control field.
                 */

-                if (eflag)
-                        printf("IPX 802.2: ");
+                if (ndo->ndo_eflag)
+                        ND_PRINT((ndo, "IPX 802.2: "));

 
 

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

                return (1);
        }
 
                return (1);
        }
 


@@ -286,13 +289,13 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                        p += 4;
                        length -= 4;
                }
                        p += 4;
                        length -= 4;
                }

-               netbeui_print(control, p, length);
+               netbeui_print(ndo, control, p, length);

                return (1);
        }
 #endif
        if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
            && control == LLC_UI) {
                return (1);
        }
 #endif
        if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
            && control == LLC_UI) {

-               isoclns_print(p + 3, length - 3, caplen - 3);
+               isoclns_print(ndo, p + 3, length - 3, caplen - 3);

                return (1);
        }
 
                return (1);
        }
 


@@ -303,77 +306,79 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * Does anybody ever bridge one form of LAN traffic
                 * over a networking type that uses 802.2 LLC?
                 */
                 * Does anybody ever bridge one form of LAN traffic
                 * over a networking type that uses 802.2 LLC?
                 */

-               ret = snap_print(p+3, length-3, caplen-3, 2);
+               ret = snap_print(ndo, p+3, length-3, caplen-3, 2);

                if (ret)
                        return (ret);
        }
 
                if (ret)
                        return (ret);
        }
 

-       if (!eflag) {
+       if (!ndo->ndo_eflag) {

                if (ssap == dsap) {
                        if (esrc == NULL || edst == NULL)
                if (ssap == dsap) {
                        if (esrc == NULL || edst == NULL)

-                               (void)printf("%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                               ND_PRINT((ndo, "%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));

                        else
                        else

-                               (void)printf("%s > %s %s ",
-                                               etheraddr_string(esrc),
-                                               etheraddr_string(edst),
-                                               tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                               ND_PRINT((ndo, "%s > %s %s ",
+                                               etheraddr_string(ndo, esrc),
+                                               etheraddr_string(ndo, edst),
+                                               tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));

                } else {
                        if (esrc == NULL || edst == NULL)
                } else {
                        if (esrc == NULL || edst == NULL)

-                               (void)printf("%s > %s ",
+                               ND_PRINT((ndo, "%s > %s ",

                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),

-                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));

                        else
                        else

-                               (void)printf("%s %s > %s %s ",
-                                       etheraddr_string(esrc),
+                               ND_PRINT((ndo, "%s %s > %s %s ",
+                                       etheraddr_string(ndo, esrc),

                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),

-                                       etheraddr_string(edst),
-                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                                       etheraddr_string(ndo, edst),
+                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));

                }
        }
 
        if (is_u) {
                }
        }
 
        if (is_u) {

-               printf("Unnumbered, %s, Flags [%s], length %u",
+               ND_PRINT((ndo, "Unnumbered, %s, Flags [%s], length %u",

                        tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)),
                        tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)),
                        tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)),
                        tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)),

-                       length);
+                       length));

 
                p += 3;
 
                if ((control & ~LLC_U_POLL) == LLC_XID) {
                        if (*p == LLC_XID_FI) {
 
                p += 3;
 
                if ((control & ~LLC_U_POLL) == LLC_XID) {
                        if (*p == LLC_XID_FI) {

-                               printf(": %02x %02x", p[1], p[2]);
+                               ND_PRINT((ndo, ": %02x %02x", p[1], p[2]));

                        }
                }
        } else {
                if ((control & LLC_S_FMT) == LLC_S_FMT) {
                        }
                }
        } else {
                if ((control & LLC_S_FMT) == LLC_S_FMT) {

-                       (void)printf("Supervisory, %s, rcv seq %u, Flags [%s], length %u",
+                       ND_PRINT((ndo, "Supervisory, %s, rcv seq %u, Flags [%s], length %u",

                                tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
                                tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),

-                                length);
+                                length));

                } else {
                } else {

-                       (void)printf("Information, send seq %u, rcv seq %u, Flags [%s], length %u",
+                       ND_PRINT((ndo, "Information, send seq %u, rcv seq %u, Flags [%s], length %u",

                                LLC_I_NS(control),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
                                LLC_I_NS(control),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),

-                                length);
+                                length));

                }
        }
        return(1);
 }
 
 int
                }
        }
        return(1);
 }
 
 int

-snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
+snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, u_int bridge_pad)

 {
 {

-       u_int32_t orgcode;
+       uint32_t orgcode;

        register u_short et;
        register int ret;
 
        register u_short et;
        register int ret;
 

-       TCHECK2(*p, 5);
+       ND_TCHECK2(*p, 5);
+       if (caplen < 5 || length < 5)
+               goto trunc;

        orgcode = EXTRACT_24BITS(p);
        et = EXTRACT_16BITS(p + 3);
 
        orgcode = EXTRACT_24BITS(p);
        et = EXTRACT_16BITS(p + 3);
 

-       if (eflag) {
+       if (ndo->ndo_eflag) {

                const struct tok *tok = null_values;
                const struct oui_tok *otp;
 
                const struct tok *tok = null_values;
                const struct oui_tok *otp;
 


@@ -383,12 +388,12 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                                break;
                        }
                }
                                break;
                        }
                }

-               (void)printf("oui %s (0x%06x), %s %s (0x%04x): ",
+               ND_PRINT((ndo, "oui %s (0x%06x), %s %s (0x%04x): ",

                     tok2str(oui_values, "Unknown", orgcode),
                     orgcode,
                     (orgcode == 0x000000 ? "ethertype" : "pid"),
                     tok2str(tok, "Unknown", et),
                     tok2str(oui_values, "Unknown", orgcode),
                     orgcode,
                     (orgcode == 0x000000 ? "ethertype" : "pid"),
                     tok2str(tok, "Unknown", et),

-                    et);
+                    et));

        }
        p += 5;
        length -= 5;
        }
        p += 5;
        length -= 5;


@@ -403,7 +408,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                 * Cisco hardware; the protocol ID is
                 * an Ethernet protocol type.
                 */
                 * Cisco hardware; the protocol ID is
                 * an Ethernet protocol type.
                 */

-               ret = ethertype_print(gndo, et, p, length, caplen);
+               ret = ethertype_print(ndo, et, p, length, caplen);

                if (ret)
                        return (ret);
                break;
                if (ret)
                        return (ret);
                break;


@@ -418,7 +423,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                         * but used 0x000000 and an Ethernet
                         * packet type for AARP packets.
                         */
                         * but used 0x000000 and an Ethernet
                         * packet type for AARP packets.
                         */

-                       ret = ethertype_print(gndo, et, p, length, caplen);
+                       ret = ethertype_print(ndo, et, p, length, caplen);

                        if (ret)
                                return (ret);
                }
                        if (ret)
                                return (ret);
                }


@@ -427,24 +432,25 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
        case OUI_CISCO:
                 switch (et) {
                 case PID_CISCO_CDP:
        case OUI_CISCO:
                 switch (et) {
                 case PID_CISCO_CDP:

-                        cdp_print(p, length, caplen);
+                        cdp_print(ndo, p, length, caplen);

                         return (1);
                 case PID_CISCO_DTP:
                         return (1);
                 case PID_CISCO_DTP:

-                        dtp_print(gndo, p, length);
+                        dtp_print(ndo, p, length);

                         return (1);
                 case PID_CISCO_UDLD:
                         return (1);
                 case PID_CISCO_UDLD:

-                        udld_print(gndo, p, length);
+                        udld_print(ndo, p, length);

                         return (1);
                 case PID_CISCO_VTP:
                         return (1);
                 case PID_CISCO_VTP:

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

                         return (1);
                 case PID_CISCO_PVST:
                 case PID_CISCO_VLANBRIDGE:
                         return (1);
                 case PID_CISCO_PVST:
                 case PID_CISCO_VLANBRIDGE:

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

                         return (1);
                 default:
                         break;
                 }
                         return (1);
                 default:
                         break;
                 }

+               break;

 
        case OUI_RFC2684:
                switch (et) {
 
        case OUI_RFC2684:
                switch (et) {


@@ -458,7 +464,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                        /*
                         * Skip the padding.
                         */
                        /*
                         * Skip the padding.
                         */

-                       TCHECK2(*p, bridge_pad);
+                       ND_TCHECK2(*p, bridge_pad);

                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;
                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;


@@ -466,7 +472,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                        /*
                         * What remains is an Ethernet packet.
                         */
                        /*
                         * What remains is an Ethernet packet.
                         */

-                       ether_print(gndo, p, length, caplen, NULL, NULL);
+                       ether_print(ndo, p, length, caplen, NULL, NULL);

                        return (1);
 
                case PID_RFC2684_802_5_FCS:
                        return (1);
 
                case PID_RFC2684_802_5_FCS:


@@ -479,7 +485,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                         * Skip the padding, but not the Access
                         * Control field.
                         */
                         * Skip the padding, but not the Access
                         * Control field.
                         */

-                       TCHECK2(*p, bridge_pad);
+                       ND_TCHECK2(*p, bridge_pad);

                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;
                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;


@@ -488,7 +494,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                         * What remains is an 802.5 Token Ring
                         * packet.
                         */
                         * What remains is an 802.5 Token Ring
                         * packet.
                         */

-                       token_print(gndo, p, length, caplen);
+                       token_print(ndo, p, length, caplen);

                        return (1);
 
                case PID_RFC2684_FDDI_FCS:
                        return (1);
 
                case PID_RFC2684_FDDI_FCS:


@@ -500,7 +506,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                        /*
                         * Skip the padding.
                         */
                        /*
                         * Skip the padding.
                         */

-                       TCHECK2(*p, bridge_pad + 1);
+                       ND_TCHECK2(*p, bridge_pad + 1);

                        caplen -= bridge_pad + 1;
                        length -= bridge_pad + 1;
                        p += bridge_pad + 1;
                        caplen -= bridge_pad + 1;
                        length -= bridge_pad + 1;
                        p += bridge_pad + 1;


@@ -508,18 +514,18 @@ snap_print(const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
                        /*
                         * What remains is an FDDI packet.
                         */
                        /*
                         * What remains is an FDDI packet.
                         */

-                       fddi_print(gndo, p, length, caplen);
+                       fddi_print(ndo, p, length, caplen);

                        return (1);
 
                case PID_RFC2684_BPDU:
                        return (1);
 
                case PID_RFC2684_BPDU:

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

                        return (1);
                }
        }
        return (0);
 
 trunc:
                        return (1);
                }
        }
        return (0);
 
 trunc:

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

        return (1);
 }
 
        return (1);
 }