Force -t on in TESTonce.

[tcpdump] / print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index d329f867969f46e777063f5a130a52d667fdd761..1b096dcfe579289b90be9521dafaad86df1e136e 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -519,6 +519,7 @@ asn1_parse(netdissect_options *ndo,
                ND_PRINT((ndo, "[id?%c/%s/%d]", *Form[form], Class[class].name, id));
                return -1;
        }
+       ND_TCHECK2(*p, elem->asnlen);
 
        switch (form) {
        case PRIMITIVE:
@@ -539,7 +540,6 @@ asn1_parse(netdissect_options *ndo,
                                        ND_PRINT((ndo, "[asnlen=0]"));
                                        return -1;
                                }
-                               ND_TCHECK2(*p, elem->asnlen);
                                if (*p & ASN_BIT8)      /* negative */
                                        data = -1;
                                for (i = elem->asnlen; i-- > 0; p++)
@@ -577,7 +577,6 @@ asn1_parse(netdissect_options *ndo,
                        case GAUGE:
                        case TIMETICKS: {
                                register uint32_t data;
-                               ND_TCHECK2(*p, elem->asnlen);
                                elem->type = BE_UNS;
                                data = 0;
                                for (i = elem->asnlen; i-- > 0; p++)
@@ -588,7 +587,6 @@ asn1_parse(netdissect_options *ndo,
 
                        case COUNTER64: {
                                register uint64_t data64;
-                               ND_TCHECK2(*p, elem->asnlen);
                                elem->type = BE_UNS64;
                                data64 = 0;
                                for (i = elem->asnlen; i-- > 0; p++)
@@ -627,7 +625,6 @@ asn1_parse(netdissect_options *ndo,
 
                default:
                        ND_PRINT((ndo, "[P/%s/%s]", Class[class].name, Class[class].Id[id]));
-                       ND_TCHECK2(*p, elem->asnlen);
                        elem->type = BE_OCTET;
                        elem->data.raw = (const uint8_t *)p;
                        break;
@@ -751,51 +748,49 @@ asn1_print(netdissect_options *ndo,
 
                p = (const u_char *)elem->data.raw;
                i = asnlen;
-               if (!nd_smi_module_loaded) {
-                       if (!ndo->ndo_nflag && asnlen > 2) {
-                               const struct obj_abrev *a = &obj_abrev_list[0];
-                               for (; a->node; a++) {
-                                       if (i < a->oid_len)
-                                               continue;
-                                       if (!ND_TTEST2(*p, a->oid_len))
-                                               continue;
-                                       if (memcmp(a->oid, p, a->oid_len) == 0) {
-                                               objp = a->node->child;
-                                               i -= a->oid_len;
-                                               p += a->oid_len;
-                                               ND_PRINT((ndo, "%s", a->prefix));
-                                               first = 1;
-                                               break;
-                                       }
+               if (!ndo->ndo_nflag && asnlen > 2) {
+                       const struct obj_abrev *a = &obj_abrev_list[0];
+                       for (; a->node; a++) {
+                               if (i < a->oid_len)
+                                       continue;
+                               if (!ND_TTEST2(*p, a->oid_len))
+                                       continue;
+                               if (memcmp(a->oid, p, a->oid_len) == 0) {
+                                       objp = a->node->child;
+                                       i -= a->oid_len;
+                                       p += a->oid_len;
+                                       ND_PRINT((ndo, "%s", a->prefix));
+                                       first = 1;
+                                       break;
                                }
                        }
+               }
 
-                       for (; i-- > 0; p++) {
-                               ND_TCHECK(*p);
-                               o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
-                               if (*p & ASN_LONGLEN)
-                                       continue;
-
-                               /*
-                                * first subitem encodes two items with
-                                * 1st*OIDMUX+2nd
-                                * (see X.690:1997 clause 8.19 for the details)
-                                */
-                               if (first < 0) {
-                                       int s;
-                                       if (!ndo->ndo_nflag)
-                                               objp = mibroot;
-                                       first = 0;
-                                       s = o / OIDMUX;
-                                       if (s > 2) s = 2;
-                                       OBJ_PRINT(s, first);
-                                       o -= s * OIDMUX;
-                               }
-                               OBJ_PRINT(o, first);
-                               if (--first < 0)
-                                       first = 0;
-                               o = 0;
+               for (; i-- > 0; p++) {
+                       ND_TCHECK(*p);
+                       o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
+                       if (*p & ASN_LONGLEN)
+                               continue;
+
+                       /*
+                        * first subitem encodes two items with
+                        * 1st*OIDMUX+2nd
+                        * (see X.690:1997 clause 8.19 for the details)
+                        */
+                       if (first < 0) {
+                               int s;
+                               if (!ndo->ndo_nflag)
+                                       objp = mibroot;
+                               first = 0;
+                               s = o / OIDMUX;
+                               if (s > 2) s = 2;
+                               OBJ_PRINT(s, first);
+                               o -= s * OIDMUX;
                        }
+                       OBJ_PRINT(o, first);
+                       if (--first < 0)
+                               first = 0;
+                       o = 0;
                }
                break;
        }
@@ -923,31 +918,29 @@ smi_decode_oid(netdissect_options *ndo,
        int o = 0, first = -1, i = asnlen;
        unsigned int firstval;
 
-       if (nd_smi_module_loaded) {
-               for (*oidlen = 0; i-- > 0; p++) {
-                       ND_TCHECK(*p);
-                       o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
-                       if (*p & ASN_LONGLEN)
-                           continue;
+       for (*oidlen = 0; i-- > 0; p++) {
+               ND_TCHECK(*p);
+               o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
+               if (*p & ASN_LONGLEN)
+                   continue;
 
-                       /*
-                        * first subitem encodes two items with 1st*OIDMUX+2nd
-                        * (see X.690:1997 clause 8.19 for the details)
-                        */
-                       if (first < 0) {
-                               first = 0;
-                               firstval = o / OIDMUX;
-                               if (firstval > 2) firstval = 2;
-                               o -= firstval * OIDMUX;
-                               if (*oidlen < oidsize) {
-                                   oid[(*oidlen)++] = firstval;
-                               }
-                       }
+               /*
+                * first subitem encodes two items with 1st*OIDMUX+2nd
+                * (see X.690:1997 clause 8.19 for the details)
+                */
+               if (first < 0) {
+                       first = 0;
+                       firstval = o / OIDMUX;
+                       if (firstval > 2) firstval = 2;
+                       o -= firstval * OIDMUX;
                        if (*oidlen < oidsize) {
-                               oid[(*oidlen)++] = o;
+                           oid[(*oidlen)++] = firstval;
                        }
-                       o = 0;
                }
+               if (*oidlen < oidsize) {
+                       oid[(*oidlen)++] = o;
+               }
+               o = 0;
        }
        return 0;
 
@@ -1054,6 +1047,10 @@ smi_print_variable(netdissect_options *ndo,
        SmiNode *smiNode = NULL;
        unsigned int i;
 
+       if (!nd_smi_module_loaded) {
+               *status = asn1_print(ndo, elem);
+               return NULL;
+       }
        *status = smi_decode_oid(ndo, elem, oid, sizeof(oid) / sizeof(unsigned int),
            &oidlen);
        if (*status < 0)
@@ -1139,22 +1136,24 @@ smi_print_value(netdissect_options *ndo,
                if (smiType->basetype == SMI_BASETYPE_BITS) {
                        /* print bit labels */
                } else {
-                       smi_decode_oid(ndo, elem, oid,
-                                      sizeof(oid)/sizeof(unsigned int),
-                                      &oidlen);
-                       smiNode = smiGetNodeByOID(oidlen, oid);
-                       if (smiNode) {
-                               if (ndo->ndo_vflag) {
-                                       ND_PRINT((ndo, "%s::", smiGetNodeModule(smiNode)->name));
-                               }
-                               ND_PRINT((ndo, "%s", smiNode->name));
-                               if (smiNode->oidlen < oidlen) {
-                                       for (i = smiNode->oidlen;
-                                            i < oidlen; i++) {
-                                               ND_PRINT((ndo, ".%u", oid[i]));
+                       if (nd_smi_module_loaded &&
+                           smi_decode_oid(ndo, elem, oid,
+                                          sizeof(oid)/sizeof(unsigned int),
+                                          &oidlen) == 0) {
+                               smiNode = smiGetNodeByOID(oidlen, oid);
+                               if (smiNode) {
+                                       if (ndo->ndo_vflag) {
+                                               ND_PRINT((ndo, "%s::", smiGetNodeModule(smiNode)->name));
+                                       }
+                                       ND_PRINT((ndo, "%s", smiNode->name));
+                                       if (smiNode->oidlen < oidlen) {
+                                               for (i = smiNode->oidlen;
+                                                    i < oidlen; i++) {
+                                                       ND_PRINT((ndo, ".%u", oid[i]));
+                                               }
                                        }
+                                       done++;
                                }
-                               done++;
                        }
                }
                break;