Remove unneeded #includes

[tcpdump] / print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index 48ebe4d09996fec0a8f9cef2509663883de050af..7b91b62fdd0699b1540effe0b8e007994a69a76a 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -45,7 +45,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.44 2000-11-10 17:34:10 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.48 2001-04-23 19:29:21 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -428,16 +428,11 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
        elem->form = form;
        elem->class = class;
        elem->id = id;
-       if (vflag > 1)
-               printf("|%.2x", *p);
        p++; len--; hdr = 1;
        /* extended tag field */
        if (id == ASN_ID_EXT) {
-               for (id = 0; *p & ASN_BIT8 && len > 0; len--, hdr++, p++) {
-                       if (vflag > 1)
-                               printf("|%.2x", *p);
+               for (id = 0; *p & ASN_BIT8 && len > 0; len--, hdr++, p++)
                        id = (id << 7) | (*p & ~ASN_BIT8);
-               }
                if (len == 0 && *p & ASN_BIT8) {
                        ifNotTruncated fputs("[Xtagfield?]", stdout);
                        return -1;
@@ -452,8 +447,6 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
                return -1;
        }
        elem->asnlen = *p;
-       if (vflag > 1)
-               printf("|%.2x", *p);
        p++; len--; hdr++;
        if (elem->asnlen & ASN_BIT8) {
                int noct = elem->asnlen % ASN_BIT8;
@@ -462,11 +455,8 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
                        ifNotTruncated printf("[asnlen? %d<%d]", len, noct);
                        return -1;
                }
-               for (; noct-- > 0; len--, hdr++) {
-                       if (vflag > 1)
-                               printf("|%.2x", *p);
+               for (; noct-- > 0; len--, hdr++)
                        elem->asnlen = (elem->asnlen << ASN_SHIFT8) | *p++;
-               }
        }
        if (len < elem->asnlen) {
                if (!truncated) {
@@ -720,7 +710,7 @@ asn1_print(struct be *elem)
                d = elem->data.uns64.high * 4294967296.0;       /* 2^32 */
                if (elem->data.uns64.high <= 0x1fffff) { 
                        d += elem->data.uns64.low;
-#if 0 /*is looks illegal, but what is the intention???*/
+#if 0 /*is looks illegal, but what is the intention?*/
                        printf("%.f", d);
 #else
                        printf("%f", d);
@@ -728,7 +718,7 @@ asn1_print(struct be *elem)
                        break;
                }
                d += (elem->data.uns64.low & 0xfffff000);
-#if 0 /*is looks illegal, but what is the intention???*/
+#if 0 /*is looks illegal, but what is the intention?*/
                snprintf(first, sizeof(first), "%.f", d);
 #else
                snprintf(first, sizeof(first), "%f", d);
@@ -837,25 +827,6 @@ asn1_decode(u_char *p, u_int length)
 
 #ifdef LIBSMI
 
-#if (SMI_VERSION_MAJOR == 0 && SMI_VERSION_MINOR >= 2) || (SMI_VERSION_MAJOR > 0)
-#define LIBSMI_API_V2
-#else
-#define LIBSMI_API_V1
-#endif
-
-#ifdef LIBSMI_API_V1
-/* Some of the API revisions introduced new calls that can be
- * represented by macros.
- */
-#define        smiGetNodeType(n)       smiGetType((n)->typemodule, (n)->typename)
-
-#else
-/* These calls in the V1 API were removed in V2. */
-#define        smiFreeRange(r)
-#define        smiFreeType(r)
-#define        smiFreeNode(r)
-#endif
-
 struct smi2be {
     SmiBasetype basetype;
     int be;
@@ -878,7 +849,7 @@ static struct smi2be smi2betab[] = {
 };
 
 static void smi_decode_oid(struct be *elem, unsigned int *oid,
-                          unsigned int *oidlen)
+                          unsigned int oidsize, unsigned int *oidlen)
 {
        u_char *p = (u_char *)elem->data.raw;
        u_int32_t asnlen = elem->asnlen;
@@ -894,10 +865,14 @@ static void smi_decode_oid(struct be *elem, unsigned int *oid,
                 */
                if (first < 0) {
                        first = 0;
-                       oid[(*oidlen)++] = o/OIDMUX;
+                       if (*oidlen < oidsize) {
+                           oid[(*oidlen)++] = o/OIDMUX;
+                       }
                        o %= OIDMUX;
                }
-               oid[(*oidlen)++] = o;
+               if (*oidlen < oidsize) {
+                   oid[(*oidlen)++] = o;
+               }
                o = 0;
        }
 }
@@ -966,37 +941,22 @@ static int smi_check_range(SmiType *smiType, struct be *elem)
         SmiRange *smiRange;
        int ok = 1;
 
-#ifdef LIBSMI_API_V1
-       for (smiRange = smiGetFirstRange(smiType->module, smiType->name);
-#else
        for (smiRange = smiGetFirstRange(smiType);
-#endif
             smiRange;
             smiRange = smiGetNextRange(smiRange)) {
 
            ok = smi_check_a_range(smiType, smiRange, elem);
 
            if (ok) {
-               smiFreeRange(smiRange);
                break;
            }
        }
 
-       if (ok
-#ifdef LIBSMI_API_V1
-               && smiType->parentmodule && smiType->parentname
-#endif
-               ) {
+       if (ok) {
            SmiType *parentType;
-#ifdef LIBSMI_API_V1
-           parentType = smiGetType(smiType->parentmodule,
-                                   smiType->parentname);
-#else
            parentType = smiGetParentType(smiType);
-#endif
            if (parentType) {
                ok = smi_check_range(parentType, elem);
-               smiFreeType(parentType);
            }
        }
 
@@ -1009,18 +969,14 @@ static SmiNode *smi_print_variable(struct be *elem)
        SmiNode *smiNode = NULL;
        int i;
 
-       smi_decode_oid(elem, oid, &oidlen);
+       smi_decode_oid(elem, oid, sizeof(oid)/sizeof(unsigned int), &oidlen);
        smiNode = smiGetNodeByOID(oidlen, oid);
        if (! smiNode) {
                asn1_print(elem);
                return NULL;
        }
        if (vflag) {
-#ifdef LIBSMI_API_V1
-               fputs(smiNode->module, stdout);
-#else
                fputs(smiGetNodeModule(smiNode)->name, stdout);
-#endif
                fputs("::", stdout);
        }
        fputs(smiNode->name, stdout);
@@ -1069,21 +1025,13 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
            fputs("[noAccess]", stdout);
        }
 
-#ifdef LIBSMI_API_V1
-       smiType = smiGetType(smiNode->typemodule, smiNode->typename);
-#else
        smiType = smiGetNodeType(smiNode);
-#endif
        if (! smiType) {
            asn1_print(elem);
            return;
        }
 
-#ifdef LIBSMI_API_V1
-       if (! smi_check_type(smiNode->basetype, elem->type)) {
-#else
        if (! smi_check_type(smiType->basetype, elem->type)) {
-#endif
            fputs("[wrongType]", stdout);
        }
 
@@ -1104,15 +1052,13 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
                if (smiType->basetype == SMI_BASETYPE_BITS) {
                        /* print bit labels */
                } else {
-                       smi_decode_oid(elem, oid, &oidlen);
+                       smi_decode_oid(elem, oid,
+                                      sizeof(oid)/sizeof(unsigned int),
+                                      &oidlen);
                        smiNode = smiGetNodeByOID(oidlen, oid);
                        if (smiNode) {
                                if (vflag) {
-#ifdef LIBSMI_API_V1
-                                       fputs(smiNode->module, stdout);
-#else
                                        fputs(smiGetNodeModule(smiNode)->name, stdout);
-#endif
                                        fputs("::", stdout);
                                }
                                fputs(smiNode->name, stdout);
@@ -1128,15 +1074,8 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
                break;
 
        case BE_INT:
-#ifdef LIBSMI_API_V1
-               if (smiNode->basetype == SMI_BASETYPE_ENUM
-                   && smiNode->typemodule && smiNode->typename) {
-                       for (nn = smiGetFirstNamedNumber(smiNode->typemodule,
-                                                        smiNode->typename);
-#else
                if (smiType->basetype == SMI_BASETYPE_ENUM) {
                        for (nn = smiGetFirstNamedNumber(smiType);
-#endif
                             nn;
                             nn = smiGetNextNamedNumber(nn)) {
                                 if (nn->value.value.integer32
@@ -1154,10 +1093,6 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
        if (! done) {
                asn1_print(elem);
        }
-
-       if (smiType) {
-               smiFreeType(smiType);
-       }
 }
 #endif
 
@@ -1273,7 +1208,6 @@ varbind_print(u_char pduid, const u_char *np, u_int length)
                        if (elem.type != BE_NULL) {
 #ifdef LIBSMI
                                smi_print_value(smiNode, pduid, &elem);
-                               smiFreeNode(smiNode);
 #else
                                asn1_print(&elem);
 #endif