- packet-snmp(-template).c

   - reimplement the "snmp.variable_oid" dissector table
- oids.[ch]
   - get rid of keytype_implicit in oid_value_type_t we won't use it.
   - have the windows base path for mibs be consistent to where we've put the mibs
   - oid_get_from_encoded() and oid_get_from_string(): have the subids array being computed in a prior statement of where the side-effected argument is going to be used... worked on gcc, not on windows... I deserve "have daemons flying out of my nose" for that :-).


svn path=/trunk/; revision=22684

1 files changed, 12 insertions, 1 deletions

diff --git a/epan/oids.h b/epan/oids.h
index 42da0972ca..c80ad0d453 100644
--- a/epan/oids.h
+++ b/epan/oids.h
@@ -60,7 +60,6 @@ typedef struct _oid_value_type_t {
 	int min_len; 
 	int max_len;
 	oid_key_type_t keytype;
-	oid_key_type_t keytype_implicit;
 	int keysize;
 } oid_value_type_t; 
 
@@ -172,4 +171,16 @@ extern void oid_add_from_string(const char* name, const gchar *oid_str);
 
 #define subid_t guint32
 
+
+
+#ifdef DEBUG_OIDS
+extern char* oid_test_a2b(guint32 num_subids, guint32* subids);
+extern void add_oid_debug_subtree(oid_info_t* oid_info, proto_tree *tree);
+#else 
+#define add_oid_debug_subtree(a,b) ((void)0)
+#endif
+
 #endif
+
+
+