aboutsummaryrefslogtreecommitdiffstats
path: root/epan/oids.c
diff options
context:
space:
mode:
authorLuis Ontanon <luis.ontanon@gmail.com>2007-08-28 15:18:32 +0000
committerLuis Ontanon <luis.ontanon@gmail.com>2007-08-28 15:18:32 +0000
commitdfbac007529fc7ce0f6405d1a0ba30560cadf0b8 (patch)
treea234af0150b064f34c3a6229e1754c32f6d1ddba /epan/oids.c
parent8fde3b7561ce61061c6d9ae8149c1ea916fdd7cb (diff)
SNMP:
- As noted by Thomas Anders values are not added to the tree anymore. Move the calling of subdissectors to the end of the function, so that the value is added to the tree. - add port 8161 to be decoded as SNMP (hey, it's on IANA's services file!) UAT: - do not have the uat reloaded. OIDS: - do not complain if renaming an OID to an identical name svn path=/trunk/; revision=22704
Diffstat (limited to 'epan/oids.c')
-rw-r--r--epan/oids.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/oids.c b/epan/oids.c
index 000759b630..7e3de7fccd 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -34,7 +34,7 @@
#include <ctype.h>
#include "emem.h"
-#include "uat-int.h"
+#include "uat.h"
#include "prefs.h"
#include "proto.h"
#include "packet.h"
@@ -100,7 +100,9 @@ static oid_info_t* add_oid(const char* name, oid_kind_t kind, const oid_value_ty
if(n) {
if (i == oid_len) {
if (n->name) {
- D(2,("Renaming Oid from: %s -> %s, this menas the same oid is registered more than once",n->name,name));
+ if (!g_str_equal(n->name,name)) {
+ D(2,("Renaming Oid from: %s -> %s, this menas the same oid is registered more than once",n->name,name));
+ }
g_free(n->name);
}