aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-12-31 09:58:56 +0000
committerGuy Harris <guy@alum.mit.edu>2003-12-31 09:58:56 +0000
commit75de95e7842a88f9e203a29a8f0598f644daa5f8 (patch)
tree752f192871459169674f4ced6638f15cb7fbc065
parentf4e918fa43d2fa94af760ebd3ae0ceab3109245f (diff)
Remove redundant protocol names from preference values.
svn path=/trunk/; revision=9505
-rw-r--r--packet-http.c6
-rw-r--r--packet-rtsp.c6
-rw-r--r--prefs.c8
3 files changed, 13 insertions, 7 deletions
diff --git a/packet-http.c b/packet-http.c
index 8080f07299..03b27f1e50 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -6,7 +6,7 @@
* Copyright 2002, Tim Potter <tpot@samba.org>
* Copyright 1999, Andrew Tridgell <tridge@samba.org>
*
- * $Id: packet-http.c,v 1.86 2003/12/28 08:39:10 guy Exp $
+ * $Id: packet-http.c,v 1.87 2003/12/31 09:58:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1154,12 +1154,12 @@ proto_register_http(void)
proto_register_field_array(proto_http, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
http_module = prefs_register_protocol(proto_http, NULL);
- prefs_register_bool_preference(http_module, "desegment_http_headers",
+ prefs_register_bool_preference(http_module, "desegment_headers",
"Desegment all HTTP headers spanning multiple TCP segments",
"Whether the HTTP dissector should desegment all headers "
"of a request spanning multiple TCP segments",
&http_desegment_headers);
- prefs_register_bool_preference(http_module, "desegment_http_body",
+ prefs_register_bool_preference(http_module, "desegment_body",
"Trust the \"Content-length:\" header and desegment HTTP "
"bodies spanning multiple TCP segments",
"Whether the HTTP dissector should use the "
diff --git a/packet-rtsp.c b/packet-rtsp.c
index 868737ae1c..274c12c6ba 100644
--- a/packet-rtsp.c
+++ b/packet-rtsp.c
@@ -4,7 +4,7 @@
* Jason Lango <jal@netapp.com>
* Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rtsp.c,v 1.57 2003/12/23 02:29:11 guy Exp $
+ * $Id: packet-rtsp.c,v 1.58 2003/12/31 09:58:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -962,12 +962,12 @@ proto_register_rtsp(void)
"Alternate RTSP TCP Port",
"Set the alternate TCP port for RTSP messages",
10, &global_rtsp_tcp_alternate_port);
- prefs_register_bool_preference(rtsp_module, "desegment_rtsp_headers",
+ prefs_register_bool_preference(rtsp_module, "desegment_headers",
"Desegment all RTSP headers spanning multiple TCP segments",
"Whether the RTSP dissector should desegment all headers "
"of a request spanning multiple TCP segments",
&rtsp_desegment_headers);
- prefs_register_bool_preference(rtsp_module, "desegment_rtsp_body",
+ prefs_register_bool_preference(rtsp_module, "desegment_body",
"Trust the \"Content-length:\" header and desegment RTSP "
"bodies spanning multiple TCP segments",
"Whether the RTSP dissector should use the "
diff --git a/prefs.c b/prefs.c
index dae1f24d27..baaf7754d7 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.118 2003/12/29 19:56:24 guy Exp $
+ * $Id: prefs.c,v 1.119 2003/12/31 09:58:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1836,6 +1836,12 @@ set_pref(gchar *pref_name, gchar *value)
/* Handle old names for NDPS preferences. */
if (strcmp(dotp, "desegment_ndps") == 0)
pref = find_preference(module, "desegment_tcp");
+ } else if (strcmp(module->name, "http") == 0) {
+ /* Handle old names for HTTP preferences. */
+ if (strcmp(dotp, "desegment_http_headers") == 0)
+ pref = find_preference(module, "desegment_headers");
+ else if (strcmp(dotp, "desegment_http_body") == 0)
+ pref = find_preference(module, "desegment_body");
}
}
if (pref == NULL)