diff options
author | Bill Meier <wmeier@newsguy.com> | 2008-09-23 15:03:39 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2008-09-23 15:03:39 +0000 |
commit | 5ac2ba6354c589e4063836f344c080c6ff2441a6 (patch) | |
tree | e94eb88301b5a32e0aff056ce31402ab33a4ed58 /epan/dissectors/packet-dmp.c | |
parent | 65e12518467af105d03d07557378b3b91a31b8de (diff) |
Minor changes related to proto_reg_handoff & pref ranges
svn path=/trunk/; revision=26254
Diffstat (limited to 'epan/dissectors/packet-dmp.c')
-rw-r--r-- | epan/dissectors/packet-dmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 4ba7e3da52..26cea1e3e6 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -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); |