aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-m2pa.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-09-03 16:42:35 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-09-03 16:42:35 +0000
commit01a4e1d9c59251982787425f8e2f588a47fa2d6e (patch)
tree0cba41be21c97f7851f13844ce71399d7be20e97 /epan/dissectors/packet-m2pa.c
parent8c061b3ab4d47419051815dcb1264936b4440501 (diff)
Cleanup related to prefs & proto_reg_handoff
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26128 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-m2pa.c')
-rw-r--r--epan/dissectors/packet-m2pa.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index 92a0c92431..0373299188 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -44,7 +44,6 @@
#define SCTP_PORT_M2PA 3565
static guint global_sctp_port = SCTP_PORT_M2PA;
-static guint sctp_port = 0;
void proto_reg_handoff_m2pa(void);
@@ -76,7 +75,6 @@ static int hf_pri_spare = -1;
static gint ett_m2pa = -1;
static gint ett_m2pa_li = -1;
-static int mtp3_proto_id;
static dissector_handle_t mtp3_handle;
typedef enum {
@@ -596,14 +594,14 @@ proto_register_m2pa(void)
void
proto_reg_handoff_m2pa(void)
{
- static int prefs_initialized = FALSE;
+ static gboolean prefs_initialized = FALSE;
static dissector_handle_t m2pa_handle;
+ static guint sctp_port;
/* Port preferences code shamelessly copied from packet-beep.c */
if (!prefs_initialized) {
+ m2pa_handle = find_dissector("m2pa");
mtp3_handle = find_dissector("mtp3");
- mtp3_proto_id = proto_get_id_by_filter_name("mtp3");
- m2pa_handle = create_dissector_handle(dissect_m2pa, proto_m2pa);
dissector_add("sctp.ppi", M2PA_PAYLOAD_PROTOCOL_ID, m2pa_handle);