diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-08-23 19:45:31 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-08-23 19:45:31 +0000 |
| commit | cfc4b0efc81acc1b5518c62ac6044aa02111a4aa (patch) | |
| tree | c9847ea01c0fdec0fff5d2574a0eae9bad95b82e /epan/oids.c | |
| parent | 13d050e9b6f414ee7332fe3db5f7e5e55fb601c6 (diff) | |
| download | wireshark-cfc4b0efc81acc1b5518c62ac6044aa02111a4aa.tar.gz | |
Implement Resolution of conceptual table indexing
So far this has being tested only for integer indexes.
svn path=/trunk/; revision=22606
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/oids.c b/epan/oids.c index 2f4430a8e3..fb124a1c04 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -107,12 +107,12 @@ static oid_info_t* add_oid(char* name, oid_kind_t kind, const oid_value_type_t* if (i == oid_len) { n->name = g_strdup(name); n->value_type = type; - n->kind = OID_KIND_UNKNOWN; + n->kind = kind; return n; } else { n->name = g_strdup(name); n->value_type = NULL; - n->kind = kind; + n->kind = OID_KIND_UNKNOWN; } } c = n; @@ -265,7 +265,7 @@ static inline oid_kind_t smikind(SmiNode* sN, oid_key_t** key_p) { smiRenderOID(elNode->oidlen, elNode->oid, SMI_RENDER_NAME)); k->hfid = -2; k->ft_type = typedata ? typedata->ft_type : FT_BYTES; - k->ft_type = typedata ? typedata->display : BASE_NONE; + k->display = typedata ? typedata->display : BASE_NONE; k->next = NULL; @@ -441,8 +441,8 @@ void register_mibs(void) { smiNode->oid); - D(4,("\t\tNode: subid=%u name=%s kind=%d", - oid_data->subid, oid_data->name, oid_data->kind + D(4,("\t\tNode: %s name=%s kind=%d", + oid_subid2string(smiNode->oid, smiNode->oidlen), oid_data->name, oid_data->kind )); if ( typedata && oid_data->value_hfid == -2 ) { |