diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-08-25 20:27:58 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-08-25 20:27:58 +0000 |
| commit | 782c19a0c5d553445803fcbe6ba88bd86c7bf0bb (patch) | |
| tree | 7b0a724f5af02559801332f4140cb361baeb796e /epan/oids.c | |
| parent | b089f0001362dcb81735afff9aff50dcc100e9d0 (diff) | |
get libsmi into the picture
svn path=/trunk/; revision=22661
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/epan/oids.c b/epan/oids.c index baf32687ca..8ae72b23b8 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -41,7 +41,7 @@ #include "filesystem.h" #include "dissectors/packet-ber.h" -#ifdef HAVE_SMI +#ifdef HAVE_LIBSMI #include <smi.h> #endif @@ -175,7 +175,7 @@ extern void oid_add_from_encoded(const char* name, const guint8 *oid, gint oid_l } } -#ifdef HAVE_SMI +#ifdef HAVE_LIBSMI typedef struct smi_module_t { char* name; } smi_module_t; @@ -374,15 +374,15 @@ static inline oid_kind_t smikind(SmiNode* sN, oid_key_t** key_p) { kl->key_type = typedata->keytype_implicit; } else switch (kl->key_type) { case OID_KEY_TYPE_BYTES: - if (k->num_subids) + if (kl->num_subids) kl->key_type = OID_KEY_TYPE_FIXED_BYTES; break; case OID_KEY_TYPE_STRING: - if (k->num_subids) + if (kl->num_subids) kl->key_type = OID_KEY_TYPE_FIXED_STRING; break; default: - + break; } } @@ -404,6 +404,12 @@ static inline oid_kind_t smikind(SmiNode* sN, oid_key_t** key_p) { || (ft == FT_INT8) || (ft == FT_INT16) || (ft == FT_INT24) || (ft == FT_INT32) \ || (ft == FT_UINT64) || (ft == FT_INT64) ) +#ifdef WIN32 +#define PATH_SEPARATOR ";" +#else +#define PATH_SEPARATOR ":" +#endif + void register_mibs(void) { SmiModule *smiModule; SmiNode *smiNode; @@ -636,7 +642,7 @@ void register_mibs(void) { void oids_init(void) { -#ifdef HAVE_SMI +#ifdef HAVE_LIBSMI register_mibs(); #else D(1,("libsmi disabled oid resolution not enabled")); |