Update some tests files if the packet time is > 2038-01-19 03:14:07 UTC

[tcpdump] / print-isoclns.c

diff --git a/print-isoclns.c b/print-isoclns.c
index b1986b3f97d23508d3bd9553b378079bdb5f0395..cb06e19a07a78c3fd5412116f263ce72396102ef 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -207,7 +207,7 @@ static const struct tok esis_option_values[] = {
     { ESIS_OPTION_SECURITY,        "Security" },
     { ESIS_OPTION_ES_CONF_TIME,    "ES Configuration Time" },
     { ESIS_OPTION_PRIORITY,        "Priority" },
-    { ESIS_OPTION_ADDRESS_MASK,    "Addressk Mask" },
+    { ESIS_OPTION_ADDRESS_MASK,    "Address Mask" },
     { ESIS_OPTION_SNPA_MASK,       "SNPA Mask" },
     { 0, NULL }
 };
@@ -612,7 +612,7 @@ static const struct tok isis_lsp_istype_values[] = {
 #define ISIS_PTP_ADJ_INIT 1
 #define ISIS_PTP_ADJ_DOWN 2
 
-static const struct tok isis_ptp_adjancey_values[] = {
+static const struct tok isis_ptp_adjacency_values[] = {
     { ISIS_PTP_ADJ_UP,    "Up" },
     { ISIS_PTP_ADJ_INIT,  "Initializing" },
     { ISIS_PTP_ADJ_DOWN,  "Down" },
@@ -1125,9 +1125,10 @@ clnp_print(netdissect_options *ndo,
 
         default:
             /* dump the PDU specific data */
-            if (length > ND_BYTES_BETWEEN(pptr, optr)) {
+            if (length > ND_BYTES_BETWEEN(optr, pptr)) {
                 ND_PRINT("\n\t  undecoded non-header data, length %u", length-li);
-                print_unknown_data(ndo, pptr, "\n\t  ", length - ND_BYTES_BETWEEN(pptr, optr));
+                print_unknown_data(ndo, pptr, "\n\t  ",
+                                   length - ND_BYTES_BETWEEN(optr, pptr));
             }
         }
 
@@ -1507,8 +1508,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
     /* Make sure the entire subTLV is in the captured data */
     ND_TCHECK_LEN(tptr, stlv_len);
 
-    switch (stlv_type)
-    {
+    switch (stlv_type) {
       case ISIS_SUBTLV_SPB_MCID:
       {
        if (stlv_len < ISIS_SUBTLV_SPB_MCID_MIN_LEN)
@@ -1634,8 +1634,7 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
     /* Make sure the entire subTLV is in the captured data */
     ND_TCHECK_LEN(tptr, stlv_len);
 
-    switch (stlv_type)
-    {
+    switch (stlv_type) {
       case ISIS_SUBTLV_SPB_INSTANCE:
           if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN)
             goto subtlv_too_short;
@@ -3149,7 +3148,7 @@ isis_print(netdissect_options *ndo,
            tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;
            if(tlen>=1) {
                ND_PRINT("\n\t      Adjacency State: %s (%u)",
-                      tok2str(isis_ptp_adjancey_values, "unknown", GET_U_1(tptr)),
+                      tok2str(isis_ptp_adjacency_values, "unknown", GET_U_1(tptr)),
                       GET_U_1(tptr));
                tlen--;
            }