Introduce --time-stamp-precision

[tcpdump] / print-llc.c

diff --git a/print-llc.c b/print-llc.c
index ee729dc1a8c692363fab729f7a372dfec7f95de4..e78378d05b5afb5db7531cde88175b953ff6e7eb 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -124,7 +124,7 @@ static const struct tok null_values[] = {
 };
 
 struct oui_tok {
-       u_int32_t       oui;
+       uint32_t        oui;
        const struct tok *tok;
 };
 
@@ -144,8 +144,8 @@ int
 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)
 {
-       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;
 
@@ -153,7 +153,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 
        if (caplen < 3) {
                ND_PRINT((ndo, "[|llc]"));
-               default_print((u_char *)p, caplen);
+               ND_DEFAULTPRINT((u_char *)p, caplen);
                return(0);
        }
 
@@ -179,7 +179,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                 */
                if (caplen < 4) {
                        ND_PRINT((ndo, "[|llc]"));
-                       default_print((u_char *)p, caplen);
+                       ND_DEFAULTPRINT((u_char *)p, caplen);
                        return(0);
                }
 
@@ -284,13 +284,13 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                        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) {
-               isoclns_print(p + 3, length - 3, caplen - 3);
+               isoclns_print(ndo, p + 3, length - 3, caplen - 3);
                return (1);
        }
 
@@ -312,8 +312,8 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                                ND_PRINT((ndo, "%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                        else
                                ND_PRINT((ndo, "%s > %s %s ",
-                                               etheraddr_string(esrc),
-                                               etheraddr_string(edst),
+                                               etheraddr_string(ndo, esrc),
+                                               etheraddr_string(ndo, edst),
                                                tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                } else {
                        if (esrc == NULL || edst == NULL)
@@ -322,9 +322,9 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                                        tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                        else
                                ND_PRINT((ndo, "%s %s > %s %s ",
-                                       etheraddr_string(esrc),
+                                       etheraddr_string(ndo, esrc),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
-                                       etheraddr_string(edst),
+                                       etheraddr_string(ndo, edst),
                                        tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                }
        }
@@ -363,7 +363,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 int
 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;
 
@@ -425,7 +425,7 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
        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:
                         dtp_print(ndo, p, length);
@@ -443,6 +443,7 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                 default:
                         break;
                 }
+               break;
 
        case OUI_RFC2684:
                switch (et) {