osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

SNMP: Fix warning [-Wunused-function] 

Add SNMP to clean dissectors also.

Change-Id: Ifc4d5a03c13f864bd9219294028323761cd19368
Reviewed-on: https://code.wireshark.org/review/13786
Petri-Dish: João Valverde <j@v6e.pt>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-02-05 12:45:31 +00:00 committed by João Valverde
parent 387c8864bf
commit a082f02937
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/snmp/snmp.asn
View File

@ -248,7 +248,7 @@ Trap-PDU ::= [4] IMPLICIT SEQUENCE {
-- variable bindings
VarBind ::= SEQUENCE { name ObjectName, valueType NULL }
VarBind ::= SEQUENCE { name ObjectName, valueType ValueType }
-- SEQUENCE {
-- name ObjectName,
-- valueType ValueType

2
epan/CMakeLists.txt
View File

@ -279,6 +279,7 @@ set(ASN1_DISSECTOR_SRC
dissectors/packet-sabp.c
dissectors/packet-sbc-ap.c
dissectors/packet-smrse.c
dissectors/packet-snmp.c
dissectors/packet-spnego.c
dissectors/packet-sv.c
dissectors/packet-t124.c
@ -295,7 +296,6 @@ set(ASN1_DISSECTOR_SRC
)
set(DIRTY_ASN1_DISSECTOR_SRC
dissectors/packet-snmp.c
dissectors/packet-tcap.c
)

2
epan/dissectors/Makefile.common
View File

@ -185,6 +185,7 @@ ASN1_DISSECTOR_SRC = \
packet-sabp.c \
packet-sbc-ap.c \
packet-smrse.c \
packet-snmp.c \
packet-spnego.c \
packet-sv.c \
packet-sysdig-event.c \
@ -210,7 +211,6 @@ CORBA_IDL_DISSECTOR_SRC =
# asn2wrs-generated ASN.1 dissectors with warnings.
#
DIRTY_ASN1_DISSECTOR_SRC = \
packet-snmp.c \
packet-tcap.c \
$(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC)

11
epan/dissectors/packet-snmp.c
View File

@ -281,7 +281,7 @@ static int hf_snmp_generic_trap = -1; /* GenericTrap */
static int hf_snmp_specific_trap = -1; /* SpecificTrap */
static int hf_snmp_time_stamp = -1; /* TimeTicks */
static int hf_snmp_name = -1; /* ObjectName */
static int hf_snmp_valueType = -1; /* NULL */
static int hf_snmp_valueType = -1; /* ValueType */
static int hf_snmp_VarBindList_item = -1; /* VarBind */
static int hf_snmp_open = -1; /* OpenPDU */
static int hf_snmp_close = -1; /* ClosePDU */
@ -2129,15 +2129,6 @@ dissect_snmp_T_error_status(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
static int
dissect_snmp_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_null(implicit_tag, actx, tree, tvb, offset, hf_index);
return offset;
}
static const ber_sequence_t VarBindList_sequence_of[1] = {
{ &hf_snmp_VarBindList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_snmp_VarBind },
};