aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-snmp.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2008-11-10 20:25:38 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2008-11-10 20:25:38 +0000
commit7bc45e104ff5ab29e49785c0f00868c021767c85 (patch)
treea21a64d2b9a3798a8c033fd55f25911a4a29e4b0 /epan/dissectors/packet-snmp.c
parenta94ff3143cdde5a9b87f17f91dedbbb1b419a687 (diff)
From Paul Stath:
Dissector fails for OIDs with MacAddress in index. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26746 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-snmp.c')
-rw-r--r--epan/dissectors/packet-snmp.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 30980adc8c..eec4afb1f8 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -717,6 +717,7 @@ show_oid_index:
break;
case OID_KEY_TYPE_IMPLIED_STRING:
case OID_KEY_TYPE_IMPLIED_BYTES:
+ case OID_KEY_TYPE_ETHER:
suboid = &(subids[key_start]);
buf_len = key_len;
break;
@@ -754,6 +755,9 @@ show_oid_index:
case OID_KEY_TYPE_IMPLIED_BYTES:
proto_tree_add_bytes(pt_name,k->hfid,tvb,name_offset,buf_len, buf);
break;
+ case OID_KEY_TYPE_ETHER:
+ proto_tree_add_ether(pt_name,k->hfid,tvb,name_offset,buf_len, buf);
+ break;
case OID_KEY_TYPE_IPADDR: {
guint32* ipv4_p = (void*)buf;
proto_tree_add_ipv4(pt_name,k->hfid,tvb,name_offset,buf_len, *ipv4_p);
@@ -2592,7 +2596,7 @@ static void dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
/*--- End of included file: packet-snmp-fn.c ---*/
-#line 1403 "packet-snmp-template.c"
+#line 1407 "packet-snmp-template.c"
guint
@@ -3369,7 +3373,7 @@ void proto_register_snmp(void) {
"snmp.T_operation", HFILL }},
/*--- End of included file: packet-snmp-hfarr.c ---*/
-#line 1915 "packet-snmp-template.c"
+#line 1919 "packet-snmp-template.c"
};
/* List of subtrees */
@@ -3409,7 +3413,7 @@ void proto_register_snmp(void) {
&ett_snmp_RReqPDU_U,
/*--- End of included file: packet-snmp-ettarr.c ---*/
-#line 1931 "packet-snmp-template.c"
+#line 1935 "packet-snmp-template.c"
};
module_t *snmp_module;
static uat_field_t users_fields[] = {