From 231f28ce08975fae6923caa9a1e92434dfb58d4e Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 28 Jan 2003 23:56:40 +0000 Subject: Panic if a preference starts with the name of the module to which it belongs, as that's redundant. Fix a bunch of cases where that was done, and map the old name to the new name. Instead of marking "mtp3.mtp3_standard" as obsolete, map it to "mtp3.standard". svn path=/trunk/; revision=7030 --- packet-dcerpc-mapi.c | 4 +- packet-fc.c | 7 ++-- packet-fcip.c | 6 +-- packet-gtp.c | 16 ++++---- packet-ip.c | 4 +- packet-iscsi.c | 4 +- packet-lmp.c | 4 +- packet-mtp3.c | 5 +-- packet-nlm.c | 4 +- packet-ppp.c | 30 +++++++------- packet-rsvp.c | 4 +- packet-tcp.c | 8 ++-- packet-udp.c | 4 +- prefs.c | 108 ++++++++++++++++++++++++++++++++++++++++++++------- 14 files changed, 143 insertions(+), 65 deletions(-) diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c index 6ecf864d16..f0747da06e 100644 --- a/packet-dcerpc-mapi.c +++ b/packet-dcerpc-mapi.c @@ -2,7 +2,7 @@ * Routines for MS Exchange MAPI * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-mapi.c,v 1.15 2003/01/28 06:39:40 tpot Exp $ + * $Id: packet-dcerpc-mapi.c,v 1.16 2003/01/28 23:56:38 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -438,7 +438,7 @@ static hf_register_info hf[] = { array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); mapi_module = prefs_register_protocol(proto_dcerpc_mapi, NULL); - prefs_register_bool_preference(mapi_module, "mapi_decrypt", + prefs_register_bool_preference(mapi_module, "decrypt", "Decrypt MAPI PDUs", "Whether the dissector should decrypt MAPI PDUs", &mapi_decrypt); diff --git a/packet-fc.c b/packet-fc.c index 052d4cbe70..0540273ffe 100644 --- a/packet-fc.c +++ b/packet-fc.c @@ -2,7 +2,7 @@ * Routines for Fibre Channel Decoding (FC Header, Link Ctl & Basic Link Svc) * Copyright 2001, Dinesh G Dutt * - * $Id: packet-fc.c,v 1.2 2002/12/10 02:49:31 guy Exp $ + * $Id: packet-fc.c,v 1.3 2003/01/28 23:56:38 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -836,12 +836,13 @@ proto_register_fc(void) /* Register preferences */ fc_module = prefs_register_protocol (proto_fc, NULL); prefs_register_bool_preference (fc_module, - "reassemble_fc", "Reassemble FC", + "reassemble", + "Reassemble multi-frame sequences", "If enabled, reassembly of multi-frame " "sequences is done", &fc_reassemble); prefs_register_uint_preference (fc_module, - "fc_max_frame_size", "Max FC Frame Size", + "max_frame_size", "Max FC Frame Size", "This is the size of non-last frames in a " "multi-frame sequence", 10, &fc_max_frame_size); diff --git a/packet-fcip.c b/packet-fcip.c index c5b97b0682..aa099631c8 100644 --- a/packet-fcip.c +++ b/packet-fcip.c @@ -2,7 +2,7 @@ * Routines for FCIP dissection * Copyright 2001, Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-fcip.c,v 1.2 2003/01/22 06:26:33 guy Exp $ + * $Id: packet-fcip.c,v 1.3 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -588,12 +588,12 @@ proto_register_fcip (void) fcip_module = prefs_register_protocol(proto_fcip, NULL); prefs_register_bool_preference(fcip_module, - "desegment_fcip_messages", + "desegment", "Desegment FCIP messages", "When enabled, FCIP messages that span multiple TCP segments are desegmented", &fcip_desegment); prefs_register_uint_preference(fcip_module, - "fcip_port", + "target_port", "Target port", "Port number used for FCIP", 10, diff --git a/packet-gtp.c b/packet-gtp.c index dfd7a8626e..e9c92ff043 100644 --- a/packet-gtp.c +++ b/packet-gtp.c @@ -4,7 +4,7 @@ * Copyright 2001, Michal Melerowicz * Nicolas Balkota * - * $Id: packet-gtp.c,v 1.50 2003/01/02 20:33:45 guy Exp $ + * $Id: packet-gtp.c,v 1.51 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -5353,13 +5353,13 @@ proto_register_gtp(void) gtp_module = prefs_register_protocol(proto_gtp, proto_reg_handoff_gtp); - prefs_register_uint_preference(gtp_module, "gtpv0_port", "GTPv0 port ", "GTPv0 port (default 3386)", 10, &g_gtpv0_port); - prefs_register_uint_preference(gtp_module, "gtpv1c_port", "GTPv1 control plane (GTP-C) port ", "GTPv1 control plane port (default 2123)", 10, &g_gtpv1c_port); - prefs_register_uint_preference(gtp_module, "gtpv1u_port", "GTPv1 user plane (GTP-U) port ", "GTPv1 user plane port (default 2152)", 10, &g_gtpv1u_port); - prefs_register_bool_preference(gtp_module, "gtp_dissect_tpdu", "Dissect T-PDU ", "Dissect T-PDU", >p_tpdu); - prefs_register_enum_preference(gtp_module, "gtpv0_dissect_cdr_as", "Dissect GTP'v0 CDRs as ", "Dissect GTP'v0 CDRs as", >pv0_cdr_as, gtpv0_cdr_options, FALSE); - prefs_register_bool_preference(gtp_module, "gtpv0_check_etsi", "Compare GTPv0 order with ETSI ", "GTPv0 ETSI order", >pv0_etsi_order); - prefs_register_bool_preference(gtp_module, "gtpv1_check_etsi", "Compare GTPv1 order with ETSI ", "GTPv1 ETSI order", >pv1_etsi_order); + prefs_register_uint_preference(gtp_module, "v0_port", "GTPv0 port", "GTPv0 port (default 3386)", 10, &g_gtpv0_port); + prefs_register_uint_preference(gtp_module, "v1c_port", "GTPv1 control plane (GTP-C) port", "GTPv1 control plane port (default 2123)", 10, &g_gtpv1c_port); + prefs_register_uint_preference(gtp_module, "v1u_port", "GTPv1 user plane (GTP-U) port", "GTPv1 user plane port (default 2152)", 10, &g_gtpv1u_port); + prefs_register_bool_preference(gtp_module, "dissect_tpdu", "Dissect T-PDU", "Dissect T-PDU", >p_tpdu); + prefs_register_enum_preference(gtp_module, "v0_dissect_cdr_as", "Dissect GTP'v0 CDRs as", "Dissect GTP'v0 CDRs as", >pv0_cdr_as, gtpv0_cdr_options, FALSE); + prefs_register_bool_preference(gtp_module, "v0_check_etsi", "Compare GTPv0 order with ETSI", "GTPv0 ETSI order", >pv0_etsi_order); + prefs_register_bool_preference(gtp_module, "v1_check_etsi", "Compare GTPv1 order with ETSI", "GTPv1 ETSI order", >pv1_etsi_order); prefs_register_obsolete_preference(gtp_module, "ppp_reorder"); register_dissector("gtpv0", dissect_gtpv0, proto_gtpv0); diff --git a/packet-ip.c b/packet-ip.c index c9bcc03b67..f8172be26a 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.182 2003/01/23 04:03:58 guy Exp $ + * $Id: packet-ip.c,v 1.183 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1727,7 +1727,7 @@ proto_register_ip(void) "Reassemble fragmented IP datagrams", "Whether fragmented IP datagrams should be reassembled", &ip_defragment); - prefs_register_bool_preference(ip_module, "ip_summary_in_tree", + prefs_register_bool_preference(ip_module, "summary_in_tree", "Show IP summary in protocol tree", "Whether the IP summary line should be shown in the protocol tree", &ip_summary_in_tree); diff --git a/packet-iscsi.c b/packet-iscsi.c index 00a2168408..588df39b2e 100644 --- a/packet-iscsi.c +++ b/packet-iscsi.c @@ -2,7 +2,7 @@ * Routines for iSCSI dissection * Copyright 2001, Eurologic and Mark Burton * - * $Id: packet-iscsi.c,v 1.42 2002/12/02 23:43:26 guy Exp $ + * $Id: packet-iscsi.c,v 1.43 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -2224,7 +2224,7 @@ proto_register_iscsi(void) &bogus_pdu_data_length_threshold); prefs_register_uint_preference(iscsi_module, - "iscsi_port", + "target_port", "Target port", "Port number of iSCSI target", 10, diff --git a/packet-lmp.c b/packet-lmp.c index 54dbeab46b..70880c33be 100644 --- a/packet-lmp.c +++ b/packet-lmp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $Id: packet-lmp.c,v 1.14 2002/12/02 23:43:26 guy Exp $ + * $Id: packet-lmp.c,v 1.15 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1527,7 +1527,7 @@ register_lmp_prefs (void) lmp_module = prefs_register_protocol(proto_lmp, NULL); prefs_register_enum_preference( - lmp_module, "lmp_version", + lmp_module, "version", "Draft version of LMP", "Specifies the IETF CCAMP draft version of LMP to interpret", &lmp_draft_ver, lmp_ver, FALSE); diff --git a/packet-mtp3.c b/packet-mtp3.c index c249427305..5edf6cfacd 100644 --- a/packet-mtp3.c +++ b/packet-mtp3.c @@ -3,7 +3,7 @@ * Copyright 2001, Michael Tuexen * Updated for ANSI support by Jeff Morriss * - * $Id: packet-mtp3.c,v 1.13 2003/01/02 20:44:32 guy Exp $ + * $Id: packet-mtp3.c,v 1.14 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -433,9 +433,6 @@ proto_register_mtp3(void) mtp3_module = prefs_register_protocol(proto_mtp3, NULL); - /* Version 1.5 to 1.11 of this module used "mtp3_standard" */ - prefs_register_obsolete_preference(mtp3_module, "mtp3_standard"); - prefs_register_enum_preference(mtp3_module, "standard", "MTP3 standard", "The SS7 standard used in MTP3 packets", (gint *)&mtp3_standard, mtp3_options, FALSE); diff --git a/packet-nlm.c b/packet-nlm.c index 7a28cd1482..8db0d6f19a 100644 --- a/packet-nlm.c +++ b/packet-nlm.c @@ -1,7 +1,7 @@ /* packet-nlm.c * Routines for nlm dissection * - * $Id: packet-nlm.c,v 1.33 2002/12/03 02:07:07 guy Exp $ + * $Id: packet-nlm.c,v 1.34 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1220,7 +1220,7 @@ proto_register_nlm(void) proto_register_subtree_array(ett, array_length(ett)); nlm_module = prefs_register_protocol(proto_nlm, NULL); - prefs_register_bool_preference(nlm_module, "nlm_msg_res_matching", + prefs_register_bool_preference(nlm_module, "msg_res_matching", "Match MSG/RES packets for async NLM", "Whether the dissector will track and match MSG and RES calls for asynchronous NLM", &nlm_match_msgres); diff --git a/packet-ppp.c b/packet-ppp.c index 268ca868a6..2594719827 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -1,7 +1,7 @@ /* packet-ppp.c * Routines for ppp packet disassembly * - * $Id: packet-ppp.c,v 1.106 2003/01/20 05:42:30 guy Exp $ + * $Id: packet-ppp.c,v 1.107 2003/01/28 23:56:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -3256,21 +3256,21 @@ proto_register_ppp(void) ppp_module = prefs_register_protocol(proto_ppp, NULL); prefs_register_enum_preference(ppp_module, - "ppp_fcs", - "PPP Frame Checksum Type", - "The type of PPP frame checksum (none, 16-bit, 32-bit)", - &ppp_fcs_decode, - ppp_options, FALSE); + "fcs_type", + "PPP Frame Checksum Type", + "The type of PPP frame checksum (none, 16-bit, 32-bit)", + &ppp_fcs_decode, + ppp_options, FALSE); prefs_register_bool_preference(ppp_module, - "ppp_vj", - "PPP Van Jacobson Compression", - "Whether Van Jacobson-compressed PPP frames should be decompressed", - &ppp_vj_decomp); - - prefs_register_uint_preference(ppp_module, "default_proto_id", - "PPPMuxCP Default PID", - "Default Protocol ID to be used", - 16, &pppmux_def_prot_id); + "decompress_vj", + "Decompress Van Jacobson-compressed frames", + "Whether Van Jacobson-compressed PPP frames should be decompressed", + &ppp_vj_decomp); + prefs_register_uint_preference(ppp_module, + "default_proto_id", + "PPPMuxCP Default PID", + "Default Protocol ID to be used for PPPMuxCP", + 16, &pppmux_def_prot_id); } void diff --git a/packet-rsvp.c b/packet-rsvp.c index daf5af9b93..7b826caee4 100644 --- a/packet-rsvp.c +++ b/packet-rsvp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $Id: packet-rsvp.c,v 1.79 2003/01/24 02:14:48 guy Exp $ + * $Id: packet-rsvp.c,v 1.80 2003/01/28 23:56:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -4253,7 +4253,7 @@ register_rsvp_prefs (void) rsvp_module = prefs_register_protocol(proto_rsvp, NULL); prefs_register_bool_preference( - rsvp_module, "rsvp_process_bundle", + rsvp_module, "process_bundle", "Dissect sub-messages in BUNDLE message", "Specifies whether Ethereal should decode and display sub-messages within BUNDLE messages", &rsvp_bundle_dissect); diff --git a/packet-tcp.c b/packet-tcp.c index db71c7c8c1..c8c39e620b 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.170 2002/12/19 11:22:38 sahlberg Exp $ + * $Id: packet-tcp.c,v 1.171 2003/01/28 23:56:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -2323,7 +2323,7 @@ proto_register_tcp(void) /* Register configuration preferences */ tcp_module = prefs_register_protocol(proto_tcp, NULL); - prefs_register_bool_preference(tcp_module, "tcp_summary_in_tree", + prefs_register_bool_preference(tcp_module, "summary_in_tree", "Show TCP summary in protocol tree", "Whether the TCP summary line should be shown in the protocol tree", &tcp_summary_in_tree); @@ -2335,11 +2335,11 @@ proto_register_tcp(void) "Allow subdissector to desegment TCP streams", "Whether subdissector can request TCP streams to be desegmented", &tcp_desegment); - prefs_register_bool_preference(tcp_module, "tcp_analyze_sequence_numbers", + prefs_register_bool_preference(tcp_module, "analyze_sequence_numbers", "Analyze TCP sequence numbers", "Make the TCP dissector analyze TCP sequence numbers to find and flag segment retransmissions, missing segments and RTT", &tcp_analyze_seq); - prefs_register_bool_preference(tcp_module, "tcp_relative_sequence_numbers", + prefs_register_bool_preference(tcp_module, "relative_sequence_numbers", "Use relative sequence numbers", "Make the TCP dissector use relative sequence numbers instead of absolute ones. To use this option you must also enable \"Analyze TCP sequence numbers\".", &tcp_relative_seq); diff --git a/packet-udp.c b/packet-udp.c index bb034533bc..02c80e769e 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.105 2002/08/28 21:00:36 jmayer Exp $ + * $Id: packet-udp.c,v 1.106 2003/01/28 23:56:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -291,7 +291,7 @@ proto_register_udp(void) /* Register configuration preferences */ udp_module = prefs_register_protocol(proto_udp, NULL); - prefs_register_bool_preference(udp_module, "udp_summary_in_tree", + prefs_register_bool_preference(udp_module, "summary_in_tree", "Show UDP summary in protocol tree", "Whether the UDP summary line should be shown in the protocol tree", &udp_summary_in_tree); diff --git a/prefs.c b/prefs.c index d068b2ab0e..1b80350abb 100644 --- a/prefs.c +++ b/prefs.c @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.93 2003/01/28 22:27:18 guy Exp $ + * $Id: prefs.c,v 1.94 2003/01/28 23:56:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -387,7 +387,7 @@ prefs_apply_all(void) */ static pref_t * register_preference(module_t *module, const char *name, const char *title, - const char *description) + const char *description, pref_type_t type) { pref_t *preference; const guchar *p; @@ -396,6 +396,7 @@ register_preference(module_t *module, const char *name, const char *title, preference->name = name; preference->title = title; preference->description = description; + preference->type = type; if (title != NULL) preference->ordinal = module->numprefs; else @@ -423,6 +424,14 @@ register_preference(module_t *module, const char *name, const char *title, */ g_assert(find_preference(module, name) == NULL); + if (type != PREF_OBSOLETE) { + /* + * Make sure the preference name doesn't begin with the + * module name, as that's redundant and Just Silly. + */ + g_assert(strncmp(name, module->name, strlen(module->name)) != 0); + } + /* * There isn't already one with that name, so add the * preference. @@ -490,8 +499,8 @@ prefs_register_uint_preference(module_t *module, const char *name, { pref_t *preference; - preference = register_preference(module, name, title, description); - preference->type = PREF_UINT; + preference = register_preference(module, name, title, description, + PREF_UINT); preference->varp.uint = var; preference->info.base = base; } @@ -505,8 +514,8 @@ prefs_register_bool_preference(module_t *module, const char *name, { pref_t *preference; - preference = register_preference(module, name, title, description); - preference->type = PREF_BOOL; + preference = register_preference(module, name, title, description, + PREF_BOOL); preference->varp.boolp = var; } @@ -520,8 +529,8 @@ prefs_register_enum_preference(module_t *module, const char *name, { pref_t *preference; - preference = register_preference(module, name, title, description); - preference->type = PREF_ENUM; + preference = register_preference(module, name, title, description, + PREF_ENUM); preference->varp.enump = var; preference->info.enum_info.enumvals = enumvals; preference->info.enum_info.radio_buttons = radio_buttons; @@ -536,8 +545,8 @@ prefs_register_string_preference(module_t *module, const char *name, { pref_t *preference; - preference = register_preference(module, name, title, description); - preference->type = PREF_STRING; + preference = register_preference(module, name, title, description, + PREF_STRING); preference->varp.string = var; preference->saved_val.string = NULL; } @@ -548,10 +557,7 @@ prefs_register_string_preference(module_t *module, const char *name, void prefs_register_obsolete_preference(module_t *module, const char *name) { - pref_t *preference; - - preference = register_preference(module, name, NULL, NULL); - preference->type = PREF_OBSOLETE; + register_preference(module, name, NULL, NULL, PREF_OBSOLETE); } typedef struct { @@ -1636,6 +1642,80 @@ set_pref(gchar *pref_name, gchar *value) /* Handle old names for PCLI preferences. */ if (strcmp(dotp, "pcli.udp_port") == 0) pref = find_preference(module, "udp_port"); + } else if (strncmp(pref_name, "mapi.", 5) == 0) { + /* Handle old names for MAPI preferences. */ + if (strcmp(dotp, "mapi_decrypt") == 0) + pref = find_preference(module, "decrypt"); + } else if (strncmp(pref_name, "fc.", 3) == 0) { + /* Handle old names for Fibre Channel preferences. */ + if (strcmp(dotp, "reassemble_fc") == 0) + pref = find_preference(module, "reassemble"); + else if (strcmp(dotp, "fc_max_frame_size") == 0) + pref = find_preference(module, "max_frame_size"); + } else if (strncmp(pref_name, "fcip.", 5) == 0) { + /* Handle old names for Fibre Channel-over-IP preferences. */ + if (strcmp(dotp, "desegment_fcip_messages") == 0) + pref = find_preference(module, "desegment"); + else if (strcmp(dotp, "fcip_port") == 0) + pref = find_preference(module, "target_port"); + } else if (strncmp(pref_name, "gtp.", 5) == 0) { + /* Handle old names for GTP preferences. */ + if (strcmp(dotp, "gtpv0_port") == 0) + pref = find_preference(module, "v0_port"); + else if (strcmp(dotp, "gtpv1c_port") == 0) + pref = find_preference(module, "v1c_port"); + else if (strcmp(dotp, "gtpv1u_port") == 0) + pref = find_preference(module, "v1u_port"); + else if (strcmp(dotp, "gtp_dissect_tpdu") == 0) + pref = find_preference(module, "dissect_tpdu"); + else if (strcmp(dotp, "gtpv0_dissect_cdr_as") == 0) + pref = find_preference(module, "v0_dissect_cdr_as"); + else if (strcmp(dotp, "gtpv0_check_etsi") == 0) + pref = find_preference(module, "v0_check_etsi"); + else if (strcmp(dotp, "gtpv1_check_etsi") == 0) + pref = find_preference(module, "v1_check_etsi"); + } else if (strncmp(pref_name, "ip.", 3) == 0) { + /* Handle old names for IP preferences. */ + if (strcmp(dotp, "ip_summary_in_tree") == 0) + pref = find_preference(module, "summary_in_tree"); + } else if (strncmp(pref_name, "iscsi.", 6) == 0) { + /* Handle old names for iSCSI preferences. */ + if (strcmp(dotp, "iscsi_port") == 0) + pref = find_preference(module, "target_port"); + } else if (strncmp(pref_name, "lmp.", 4) == 0) { + /* Handle old names for LMP preferences. */ + if (strcmp(dotp, "lmp_version") == 0) + pref = find_preference(module, "version"); + } else if (strncmp(pref_name, "mtp3.", 5) == 0) { + /* Handle old names for MTP3 preferences. */ + if (strcmp(dotp, "mtp3_standard") == 0) + pref = find_preference(module, "standard"); + } else if (strncmp(pref_name, "nlm.", 5) == 0) { + /* Handle old names for NLM preferences. */ + if (strcmp(dotp, "nlm_msg_res_matching") == 0) + pref = find_preference(module, "msg_res_matching"); + } else if (strncmp(pref_name, "ppp.", 4) == 0) { + /* Handle old names for PP preferences. */ + if (strcmp(dotp, "ppp_fcs") == 0) + pref = find_preference(module, "fcs_type"); + else if (strcmp(dotp, "ppp_vj") == 0) + pref = find_preference(module, "decompress_vj"); + } else if (strncmp(pref_name, "rsvp.", 5) == 0) { + /* Handle old names for RSVP preferences. */ + if (strcmp(dotp, "rsvp_process_bundle") == 0) + pref = find_preference(module, "process_bundle"); + } else if (strncmp(pref_name, "tcp.", 4) == 0) { + /* Handle old names for TCP preferences. */ + if (strcmp(dotp, "tcp_summary_in_tree") == 0) + pref = find_preference(module, "summary_in_tree"); + else if (strcmp(dotp, "tcp_analyze_sequence_numbers") == 0) + pref = find_preference(module, "analyze_sequence_numbers"); + else if (strcmp(dotp, "tcp_relative_sequence_numbers") == 0) + pref = find_preference(module, "relative_sequence_numbers"); + } else if (strncmp(pref_name, "udp.", 4) == 0) { + /* Handle old names for UDP preferences. */ + if (strcmp(dotp, "udp_summary_in_tree") == 0) + pref = find_preference(module, "summary_in_tree"); } } if (pref == NULL) -- cgit v1.2.1