aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-distcc.c
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2004-08-21 09:02:52 +0000
committerUlf Lamping <ulf.lamping@web.de>2004-08-21 09:02:52 +0000
commitd530bd4e14072e9677395d60b9948c04f579ab13 (patch)
tree3f9be27e5d8ec59d4de5368c091899d003ce2201 /epan/dissectors/packet-distcc.c
parent747f63150b44eb32bc8e0bdff66f82ef70f86ce9 (diff)
Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.
I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences. Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect. If you encounter any mistakes I've made here, please let me know... svn path=/trunk/; revision=11784
Diffstat (limited to 'epan/dissectors/packet-distcc.c')
-rw-r--r--epan/dissectors/packet-distcc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index a17e2d2ddd..114707bd7e 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -405,8 +405,9 @@ proto_register_distcc(void)
10,
&glb_distcc_tcp_port);
prefs_register_bool_preference(distcc_module, "desegment_distcc_over_tcp",
- "Desegment all DISTCC-over-TCP messages",
- "Whether the DISTCC dissector should desegment all DISTCC-over-TCP messages",
+ "Reassemble DISTCC-over-TCP messages\nspanning multiple TCP segments",
+ "Whether the DISTCC dissector should reassemble messages spanning multiple TCP segments."
+ " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
&distcc_desegment);
}