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

From Michael Lum: don't register the handoff routine for dissectors as a 

preference change callback if the ports they register on aren't
preferences.

svn path=/trunk/; revision=9135
This commit is contained in:
Guy Harris 2003-12-02 02:58:32 +00:00
parent f549d46c37
commit 87561392ef
2 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packet-bssap.c
View File

@ -7,7 +7,7 @@
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
* In association with Telos Technology Inc.
*
* $Id: packet-bssap.c,v 1.4 2003/12/01 23:05:08 guy Exp $
* $Id: packet-bssap.c,v 1.5 2003/12/02 02:58:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -142,10 +142,6 @@ static guint8 pdu_type = 0xFF;
static guint bssap_or_bsap_global = BSSAP_OR_BSAP_DEFAULT;
/* FORWARD DECLARATIONS */
void proto_reg_handoff_bssap(void);
static void
dissect_bssap_unknown_message(tvbuff_t *message_tvb, proto_tree *bssap_tree)
{
@ -461,7 +457,7 @@ proto_register_bssap(void)
proto_register_field_array(proto_bssap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
bssap_module = prefs_register_protocol(proto_bssap, proto_reg_handoff_bssap);
bssap_module = prefs_register_protocol(proto_bssap, NULL);
prefs_register_enum_preference(bssap_module,
"bsap_or_bssap",
@ -478,15 +474,7 @@ proto_register_bssap(void)
void
proto_reg_handoff_bssap(void)
{
static gboolean bssap_prefs_initialized = FALSE;
if (!bssap_prefs_initialized)
{
heur_dissector_add("sccp", dissect_bssap_heur, proto_bssap);
bssap_prefs_initialized = TRUE;
}
heur_dissector_add("sccp", dissect_bssap_heur, proto_bssap);
data_handle = find_dissector("data");
}

32
packet-tcap.c
View File

@ -9,7 +9,7 @@
*
* (append your name here for newer version)
*
* $Id: packet-tcap.c,v 1.3 2003/11/14 01:35:08 guy Exp $
* $Id: packet-tcap.c,v 1.4 2003/12/02 02:58:32 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -66,8 +66,6 @@
Tcap_Standard_Type tcap_standard = ITU_TCAP_STANDARD;
void proto_reg_handoff_tcap(void);
/* saved pinfo */
static packet_info *g_pinfo = NULL;
static proto_tree *g_tcap_tree = NULL;
@ -2749,7 +2747,7 @@ proto_register_tcap(void)
proto_register_field_array(proto_tcap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
tcap_module = prefs_register_protocol(proto_tcap, proto_reg_handoff_tcap);
tcap_module = prefs_register_protocol(proto_tcap, NULL);
prefs_register_enum_preference(tcap_module, "standard", "TCAP standard",
"The SS7 standard used in TCAP packets",
@ -2772,25 +2770,19 @@ proto_register_tcap(void)
void
proto_reg_handoff_tcap(void)
{
static gboolean tcap_prefs_initialized = FALSE;
dissector_handle_t tcap_handle;
if (!tcap_prefs_initialized)
{
tcap_handle = create_dissector_handle(dissect_tcap,
proto_tcap);
tcap_handle = create_dissector_handle(dissect_tcap,
proto_tcap);
dissector_add("sccp.ssn", 5, tcap_handle); /* MAP*/
dissector_add("sccp.ssn", 6, tcap_handle); /* HLR*/
dissector_add("sccp.ssn", 7, tcap_handle); /* VLR */
dissector_add("sccp.ssn", 8, tcap_handle); /* MSC */
dissector_add("sccp.ssn", 9, tcap_handle); /* EIR */
dissector_add("sccp.ssn", 10, tcap_handle); /* EIR */
dissector_add("sccp.ssn", 11, tcap_handle); /* SMS/MC */
dissector_add("sccp.ssn", 12, tcap_handle); /* IS41 OTAF */
tcap_prefs_initialized = TRUE;
}
dissector_add("sccp.ssn", 5, tcap_handle); /* MAP*/
dissector_add("sccp.ssn", 6, tcap_handle); /* HLR*/
dissector_add("sccp.ssn", 7, tcap_handle); /* VLR */
dissector_add("sccp.ssn", 8, tcap_handle); /* MSC */
dissector_add("sccp.ssn", 9, tcap_handle); /* EIR */
dissector_add("sccp.ssn", 10, tcap_handle); /* EIR */
dissector_add("sccp.ssn", 11, tcap_handle); /* SMS/MC */
dissector_add("sccp.ssn", 12, tcap_handle); /* IS41 OTAF */
data_handle = find_dissector("data");
}