aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-smb-pipe.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-03-13 07:51:45 -0400
committerMichael Mann <mmann78@netscape.net>2016-03-17 00:05:17 +0000
commite37275bfdee7a0ea4745def144d4a0e5c62e282d (patch)
treee556a0170b2a35bd4bf975823de4205f7d30ba09 /epan/dissectors/packet-smb-pipe.c
parentb46fe7e95ae09c062ec066838f05b2c42a3b2726 (diff)
Associate dissector tables and heuristic subdissector lists with a protocol.
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-smb-pipe.c')
-rw-r--r--epan/dissectors/packet-smb-pipe.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index 6f32f91f64..d63ed79149 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -43,7 +43,6 @@ XXX Fixme : shouldn't show [malformed frame] for long packets
#include "packet-windows-common.h"
void proto_register_pipe_lanman(void);
-void proto_register_pipe_dcerpc(void);
void proto_register_smb_pipe(void);
void proto_reg_handoff_smb_pipe(void);
@@ -3441,14 +3440,6 @@ clean_up_and_exit:
return TRUE;
}
-void
-proto_register_pipe_dcerpc(void)
-{
- smb_transact_heur_subdissector_list = register_heur_dissector_list("smb_transact");
- register_init_routine(smb_dcerpc_reassembly_init);
- register_cleanup_routine(smb_dcerpc_reassembly_cleanup);
-}
-
#define CALL_NAMED_PIPE 0x54
#define WAIT_NAMED_PIPE 0x53
#define PEEK_NAMED_PIPE 0x23
@@ -3929,6 +3920,10 @@ proto_register_smb_pipe(void)
proto_register_subtree_array(ett, array_length(ett));
expert_smb_pipe = expert_register_protocol(proto_smb_pipe);
expert_register_field_array(expert_smb_pipe, ei, array_length(ei));
+
+ smb_transact_heur_subdissector_list = register_heur_dissector_list("smb_transact", proto_smb_pipe);
+ register_init_routine(smb_dcerpc_reassembly_init);
+ register_cleanup_routine(smb_dcerpc_reassembly_cleanup);
}
void