diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-09-26 23:35:40 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-09-28 16:43:12 +0000 |
| commit | d572634e0aeb3c444e22894635059fe7fe3538f6 (patch) | |
| tree | af16ca262f3efc82b1ff46b1eac84d921960548d | |
| parent | 28ec9c29ea079805d5605f43cc8177198f4d6ffc (diff) | |
PIDL (DCERPC dnsserver): enhance dissector
* Fix -Wunused-function (Add functions to dnsserver.cnf with NOEMIT)
* Remove dissector DCERPC dnsserver from DIRTY list
Change-Id: Id1d4f43784bfbf417156353fd3254375365c35c8
Reviewed-on: https://code.wireshark.org/review/4323
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc-dnsserver.c | 26 | ||||
| -rw-r--r-- | epan/dissectors/pidl/dnsserver.cnf | 5 |
4 files changed, 7 insertions, 28 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index e938f87b73..064a0c91bd 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -167,6 +167,7 @@ set(PIDL_DISSECTOR_SRC # dissectors/packet-dcerpc-budb.c # dissectors/packet-dcerpc-butc.c # dissectors/packet-dcerpc-drsuapi.c + dissectors/packet-dcerpc-dnsserver.c dissectors/packet-dcerpc-dssetup.c dissectors/packet-dcerpc-efs.c dissectors/packet-dcerpc-frstrans.c @@ -180,7 +181,6 @@ set(PIDL_DISSECTOR_SRC ) set(DIRTY_PIDL_DISSECTOR_SRC dissectors/packet-dcerpc-dfs.c - dissectors/packet-dcerpc-dnsserver.c dissectors/packet-dcerpc-eventlog.c dissectors/packet-dcerpc-lsa.c dissectors/packet-dcerpc-mapi.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 9caa41f888..44960c24b0 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -49,6 +49,7 @@ PIDL_DISSECTOR_SRC = \ packet-dcerpc-budb.c \ packet-dcerpc-butc.c \ packet-dcerpc-dssetup.c \ + packet-dcerpc-dnsserver.c \ packet-dcerpc-efs.c \ packet-dcerpc-frstrans.c \ packet-dcerpc-initshutdown.c \ @@ -65,7 +66,6 @@ PIDL_DISSECTOR_SRC = \ # DIRTY_PIDL_DISSECTOR_SRC = \ packet-dcerpc-dfs.c \ - packet-dcerpc-dnsserver.c \ packet-dcerpc-drsuapi.c \ packet-dcerpc-eventlog.c \ packet-dcerpc-lsa.c \ diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c index 05903e89d0..30f52a298f 100644 --- a/epan/dissectors/packet-dcerpc-dnsserver.c +++ b/epan/dissectors/packet-dcerpc-dnsserver.c @@ -395,9 +395,6 @@ static const true_false_string DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_SUPPRESS_NOTIFY_t "DNS_RPC_FLAG_SUPPRESS_NOTIFY is SET", "DNS_RPC_FLAG_SUPPRESS_NOTIFY is NOT SET", }; -static int dnsserver_dissect_element_DNS_RPC_NAME_NameLength(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); -static int dnsserver_dissect_element_DNS_RPC_NAME_Name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); -static int dnsserver_dissect_element_DNS_RPC_NAME_Name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int dnsserver_dissect_element_DNS_RPC_RECORD_NODE_NAME_Name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int dnsserver_dissect_element_DNS_RPC_RECORD_UNION_NodeName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); static int dnsserver_dissect_element_DNS_RPC_RECORD_DataLength(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_); @@ -1250,29 +1247,6 @@ dnsserver_dissect_bitmap_DNS_RPC_NODE_FLAGS(tvbuff_t *tvb _U_, int offset _U_, p /* IDL: uint8 Name[NameLength]; */ /* IDL: } */ -static int -dnsserver_dissect_element_DNS_RPC_NAME_NameLength(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_dnsserver_DNS_RPC_NAME_NameLength, 0); - - return offset; -} - -static int -dnsserver_dissect_element_DNS_RPC_NAME_Name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - - return offset; -} - -static int -dnsserver_dissect_element_DNS_RPC_NAME_Name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_) -{ - offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, di, drep, hf_dnsserver_DNS_RPC_NAME_Name, 0); - - return offset; -} - /* IDL: struct { */ /* IDL: DNS_RPC_NAME Name; */ diff --git a/epan/dissectors/pidl/dnsserver.cnf b/epan/dissectors/pidl/dnsserver.cnf index 8797217003..6edf6407df 100644 --- a/epan/dissectors/pidl/dnsserver.cnf +++ b/epan/dissectors/pidl/dnsserver.cnf @@ -11,6 +11,11 @@ HF_FIELD hf_dnsserver_DNS_RPC_NAME_name "Name" "dnsserver.DNS_RPC_NAME.name" FT_ MANUAL dnsserver_dissect_element_DNS_RPC_NODE_RecordCount MANUAL dnsserver_dissect_element_DNS_RPC_NODE_records + +NOEMIT dnsserver_dissect_element_DNS_RPC_NAME_NameLength +NOEMIT dnsserver_dissect_element_DNS_RPC_NAME_Name +NOEMIT dnsserver_dissect_element_DNS_RPC_NAME_Name_ + CODE START #include "packet-smb-common.h" |