get users of oid_resolv to use the new oids, rollout packet-snmp.c

svn path=/trunk/; revision=22651

28 files changed, 29 insertions, 52 deletions

diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index 57c270b470..75a19f7d37 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -30,8 +30,8 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
 #include <epan/asn1.h>
+#include <epan/oids.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index 55df3ab10b..aeb2b6ee6a 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -42,7 +42,7 @@
 #include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index dc7a159de3..fbe7336960 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -41,7 +41,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/tap.h>
 #include <epan/asn1.h>
 #include "epan/expert.h"
diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c
index 718c8e7b7f..0edfeeccbd 100644
--- a/asn1/cdt/packet-cdt-template.c
+++ b/asn1/cdt/packet-cdt-template.c
@@ -32,7 +32,7 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/expert.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index f151595eab..9fc6cb1d5e 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
@@ -206,7 +206,7 @@ void proto_register_cmip(void) {
   proto_register_field_array(proto_cmip, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 #include "packet-cmip-dis-tab.c"
-    add_oid_str_name("2.9.3.2.7.1","discriminatorId(1) ");
+    add_oid_str_name("2.9.3.2.7.1","discriminatorId(1)");
 
 }
 
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index 4a7dde850f..571d7e4ad3 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index 9ed91fff51..e1b496aefe 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 97b7465c5d..5129c83339 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index f0733480ac..3bd7dc91f3 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.c
@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index 56d2f358cb..a0ebb77d76 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.c
@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 7d8317cd98..e8af2164df 100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index a9a95ee092..cc36902fcc 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -44,7 +44,7 @@
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include "epan/expert.h"
 
 #include <stdio.h>
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index 3ee6bea2f5..88490d6bd9 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -44,7 +44,7 @@
 #include <string.h>
 
 #include <epan/prefs.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/next_tvb.h>
 #include <epan/asn1.h>
 #include "tap.h"
diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index 4ff4cfa418..82f75869c2 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 426ded262b..da6ee1a139 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -46,7 +46,7 @@
 #include <epan/prefs.h>
 #include <epan/t35.h>
 #include <epan/emem.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 #include "tap.h"
 #include "packet-tpkt.h"
diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index 3f241d3b04..ba323a5931 100644
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -33,7 +33,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include "epan/expert.h"
 #include <epan/asn1.h>
 
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 648c161f1c..c5ccac317c 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -82,7 +82,7 @@
 #include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/strutil.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/dissectors/packet-windows-common.h>
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c
index 16989ca7e2..4176bb7f47 100644
--- a/asn1/pkcs12/packet-pkcs12-template.c
+++ b/asn1/pkcs12/packet-pkcs12-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/prefs.h>
 
diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c
index eb9b1a71bd..f3939ca0bd 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.c
+++ b/asn1/pkixproxy/packet-pkixproxy-template.c
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 88bb9cb1e0..b57ee00454 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -14,6 +14,7 @@
  *
  * See RFC 3414 for User-based Security Model for SNMPv3
  * See RFC 3826 for  (AES) Cipher Algorithm in the SNMP USM
+ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2)
  * Copyright (C) 2007 Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
  *
  * $Id$
@@ -72,7 +73,6 @@
 #include "packet-ber.h"
 
 #include "packet-snmp.h"
-#include "format-oid.h"
 
 #include <epan/crypt/crypt-sha1.h>
 #include <epan/crypt/crypt-md5.h>
@@ -108,19 +108,6 @@
 static int proto_snmp = -1;
 static int proto_smux = -1;
 
-/* Default MIB modules to load */
-/*
- * XXX - According to Wes Hardaker, we shouldn't do this:
- *       http://www.ethereal.com/lists/ethereal-dev/200412/msg00222.html
- */
-#ifdef _WIN32
-# define DEF_MIB_MODULES "IP-MIB;IF-MIB;TCP-MIB;UDP-MIB;SNMPv2-MIB;RFC1213-MIB;UCD-SNMP-MIB"
-# define IMPORT_SEPARATOR ":"
-#else
-# define DEF_MIB_MODULES "IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:SNMPv2-MIB:RFC1213-MIB:UCD-SNMP-MIB"
-# define IMPORT_SEPARATOR ";"
-#endif /* _WIN32 */
-
 static gboolean display_oid = TRUE;
 
 static gboolean snmp_usm_auth_md5(snmp_usm_params_t* p, guint8**, guint*, gchar const**);
@@ -782,16 +769,6 @@ expected_different: {
 }
 
 
-gchar* format_oid(subid_t *oid, guint oid_length) {
-	return (void*)oid_resolved(oid_length,oid);
-}
-
-void new_format_oid(subid_t *oid, guint oid_length, gchar **non_decoded, gchar **decoded) {
-	*decoded = (void*)oid_resolved(oid_length,oid);
-	*non_decoded = (void*)oid_subid2string(oid,oid_length);
-}
-
-
 #define F_SNMP_ENGINEID_CONFORM 0x80
 #define SNMP_ENGINEID_RFC1910 0x00
 #define SNMP_ENGINEID_RFC3411 0x01
diff --git a/asn1/tcap/packet-ansi_tcap-template.c b/asn1/tcap/packet-ansi_tcap-template.c
index 031e5eab17..8a575b8e18 100644
--- a/asn1/tcap/packet-ansi_tcap-template.c
+++ b/asn1/tcap/packet-ansi_tcap-template.c
@@ -32,7 +32,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/emem.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index 16bca252e5..d36d608e68 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -33,7 +33,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/emem.h>
 #include <epan/asn1.h>
 
diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index ab097af442..4fa18a8b73 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index 6658b128aa..3adbe6b8ae 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -31,7 +31,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index 4bae685b41..41bb46932e 100644
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 74b9f949ad..c8954ebd16 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index 8cea032b31..4dfa66de08 100644
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index 6f141f9c14..c16491f63e 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/oids.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>