X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/486704db7c840dcfb51f70f1812d9c3ad37ad39c..4a2fb51da7ada0cecf94a5a94c7146bc36dd72b0:/print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index f348cd3b..83d4090e 100644
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -56,11 +56,13 @@
  #	@(#)snmp.awk.x	1.1 (LANL) 1/15/90
  */
 
+/* \summary: Simple Network Management Protocol (SNMP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -69,7 +71,7 @@
 #include <smi.h>
 #endif
 
-#include "interface.h"
+#include "netdissect.h"
 
 #undef OPAQUE  /* defined in <wingdi.h> */
 
@@ -679,46 +681,49 @@ asn1_print(netdissect_options *ndo,
 		int o = 0, first = -1;
 
 		i = asnlen;
-		if (!ndo->ndo_sflag && !ndo->ndo_nflag && asnlen > 2) {
-			const struct obj_abrev *a = &obj_abrev_list[0];
-			size_t a_len = strlen(a->oid);
-			for (; a->node; a++) {
-				ND_TCHECK2(*p, a_len);
-				if (memcmp(a->oid, p, a_len) == 0) {
-					objp = a->node->child;
-					i -= strlen(a->oid);
-					p += strlen(a->oid);
-					ND_PRINT((ndo, "%s", a->prefix));
-					first = 1;
-					break;
+		if (!nd_smi_module_loaded) {
+			if (!ndo->ndo_nflag && asnlen > 2) {
+				const struct obj_abrev *a = &obj_abrev_list[0];
+				size_t a_len = strlen(a->oid);
+				for (; a->node; a++) {
+					ND_TCHECK2(*p, a_len);
+					if (memcmp(a->oid, p, a_len) == 0) {
+						objp = a->node->child;
+						i -= strlen(a->oid);
+						p += strlen(a->oid);
+						ND_PRINT((ndo, "%s", a->prefix));
+						first = 1;
+						break;
+					}
 				}
 			}
-		}
-
-		for (; !ndo->ndo_sflag && 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;
+			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;
 			}
-			OBJ_PRINT(o, first);
-			if (--first < 0)
-				first = 0;
-			o = 0;
 		}
 		break;
 	}
@@ -901,29 +906,31 @@ smi_decode_oid(netdissect_options *ndo,
 	int o = 0, first = -1, i = asnlen;
 	unsigned int firstval;
 
-	for (*oidlen = 0; ndo->ndo_sflag && i-- > 0; p++) {
-		ND_TCHECK(*p);
-	        o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
-		if (*p & ASN_LONGLEN)
-		    continue;
+	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;
 
-		/*
-		 * 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;
+			/*
+			 * 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;
+				}
+			}
 			if (*oidlen < oidsize) {
-			    oid[(*oidlen)++] = firstval;
+				oid[(*oidlen)++] = o;
 			}
+			o = 0;
 		}
-		if (*oidlen < oidsize) {
-			oid[(*oidlen)++] = o;
-		}
-		o = 0;
 	}
 	return 0;
 
@@ -1054,7 +1061,7 @@ smi_print_variable(netdissect_options *ndo,
 
 static int
 smi_print_value(netdissect_options *ndo,
-                SmiNode *smiNode, u_char pduid, struct be *elem)
+                SmiNode *smiNode, u_short pduid, struct be *elem)
 {
 	unsigned int i, oid[128], oidlen;
 	SmiType *smiType;
@@ -1197,7 +1204,7 @@ smi_print_value(netdissect_options *ndo,
  */
 static void
 varbind_print(netdissect_options *ndo,
-              u_char pduid, const u_char *np, u_int length)
+              u_short pduid, const u_char *np, u_int length)
 {
 	struct be elem;
 	int count = 0, ind;