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

Minor changes related to proto_reg_handoff & pref ranges 

svn path=/trunk/; revision=26254
This commit is contained in:
Bill Meier 2008-09-23 15:03:39 +00:00
parent 65e1251846
commit 5ac2ba6354
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-diameter.c
View File

@ -262,7 +262,6 @@ static guint gbl_diameterSctpPort=SCTP_PORT_DIAMETER;
static dissector_handle_t diameter_tcp_handle;
static range_t *global_diameter_tcp_port_range;
static range_t *diameter_tcp_port_range;
#define DEFAULT_DIAMETER_PORT_RANGE "3868"
/* desegmentation of Diameter over TCP */
@ -1251,6 +1250,7 @@ proto_reg_handoff_diameter(void)
static gboolean Initialized=FALSE;
static guint SctpPort;
static dissector_handle_t diameter_handle;
static range_t *diameter_tcp_port_range;
if (!Initialized) {
diameter_handle = find_dissector("diameter");
@ -1264,20 +1264,16 @@ proto_reg_handoff_diameter(void)
Initialized=TRUE;
} else {
range_foreach(diameter_tcp_port_range, range_delete_callback);
g_free(diameter_tcp_port_range);
dissector_delete("sctp.port", SctpPort, diameter_handle);
}
/* set port for future deletes */
g_free(diameter_tcp_port_range);
diameter_tcp_port_range = range_copy(global_diameter_tcp_port_range);
range_foreach(diameter_tcp_port_range, range_add_callback);
SctpPort=gbl_diameterSctpPort;
dissector_add("sctp.port", gbl_diameterSctpPort, diameter_handle);
}
/* registration with the filtering engine */
@ -1416,7 +1412,6 @@ proto_register_diameter(void)
/* Set default TCP ports */
range_convert_str(&global_diameter_tcp_port_range, DEFAULT_DIAMETER_PORT_RANGE, MAX_UDP_PORT);
diameter_tcp_port_range = range_empty();
/* Register configuration options for ports */
diameter_module = prefs_register_protocol(proto_diameter,

8
epan/dissectors/packet-dmp.c
View File

@ -58,6 +58,7 @@
#define PFNAME "dmp"
/* Recommended UDP Port Numbers */
/* Default disabled */
#define DEFAULT_DMP_PORT_RANGE ""
/* Version supported */
@ -456,8 +457,7 @@ static struct dmp_data {
} dmp;
/* User definable values */
static range_t *global_dmp_port_range = NULL; /* Default disabled */
static range_t *dmp_port_range = NULL;
static range_t *global_dmp_port_range;
static gboolean use_seq_ack_analysis = TRUE;
static gboolean dmp_align = FALSE;
static gboolean dmp_subject_as_id = FALSE;
@ -4356,7 +4356,6 @@ void proto_register_dmp (void)
/* Set default UDP ports */
range_convert_str (&global_dmp_port_range, DEFAULT_DMP_PORT_RANGE,
MAX_UDP_PORT);
dmp_port_range = range_empty ();
/* Register our configuration options */
dmp_module = prefs_register_protocol (proto_dmp, proto_reg_handoff_dmp);
@ -4414,6 +4413,7 @@ static void range_add_callback (guint32 port)
void proto_reg_handoff_dmp (void)
{
static range_t *dmp_port_range;
static gboolean dmp_prefs_initialized = FALSE;
if (!dmp_prefs_initialized) {
@ -4421,10 +4421,10 @@ void proto_reg_handoff_dmp (void)
dmp_prefs_initialized = TRUE;
} else {
range_foreach (dmp_port_range, range_delete_callback);
g_free (dmp_port_range);
}
/* Save port number for later deletion */
g_free (dmp_port_range);
dmp_port_range = range_copy (global_dmp_port_range);
range_foreach (dmp_port_range, range_add_callback);

7
epan/dissectors/packet-p_mul.c
View File

@ -179,8 +179,7 @@ typedef struct _p_mul_id_val {
static GHashTable *p_mul_id_hash_table = NULL;
/* User definable values to use for dissection */
static range_t *global_p_mul_port_range = NULL;
static range_t *p_mul_port_range = NULL;
static range_t *global_p_mul_port_range;
static gboolean p_mul_reassemble = TRUE;
static gint decode_option = DECODE_NONE;
static gboolean use_relative_msgid = TRUE;
@ -1347,7 +1346,6 @@ void proto_register_p_mul (void)
/* Set default UDP ports */
range_convert_str (&global_p_mul_port_range, DEFAULT_P_MUL_PORT_RANGE,
MAX_UDP_PORT);
p_mul_port_range = range_empty ();
/* Register our configuration options */
p_mul_module = prefs_register_protocol (proto_p_mul,
@ -1394,16 +1392,17 @@ static void range_add_callback (guint32 port)
void proto_reg_handoff_p_mul (void)
{
static gboolean p_mul_prefs_initialized = FALSE;
static range_t *p_mul_port_range;
if (!p_mul_prefs_initialized) {
p_mul_handle = find_dissector(PFNAME);
p_mul_prefs_initialized = TRUE;
} else {
range_foreach (p_mul_port_range, range_delete_callback);
g_free (p_mul_port_range);
}
/* Save port number for later deletion */
g_free (p_mul_port_range);
p_mul_port_range = range_copy (global_p_mul_port_range);
range_foreach (p_mul_port_range, range_add_callback);

5
epan/dissectors/packet-sscop.c
View File

@ -58,7 +58,6 @@ static dissector_handle_t nbap_handle;
static module_t *sscop_module;
static range_t *global_udp_port_range;
static range_t *udp_port_range;
static dissector_handle_t sscop_handle;
@ -404,6 +403,7 @@ void
proto_reg_handoff_sscop(void)
{
static gboolean prefs_initialized = FALSE;
static range_t *udp_port_range;
if (!prefs_initialized) {
initialize_handles_once();
@ -412,10 +412,10 @@ proto_reg_handoff_sscop(void)
} else {
range_foreach(udp_port_range, range_delete_callback);
g_free(udp_port_range);
}
g_free(udp_port_range);
udp_port_range = range_copy(global_udp_port_range);
range_foreach(udp_port_range, range_add_callback);
@ -457,7 +457,6 @@ proto_register_sscop(void)
sscop_module = prefs_register_protocol(proto_sscop, proto_reg_handoff_sscop);
global_udp_port_range = range_empty();
udp_port_range = range_empty();
prefs_register_range_preference(sscop_module, "udp.ports",
"SSCOP UDP port range",