From d530bd4e14072e9677395d60b9948c04f579ab13 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Sat, 21 Aug 2004 09:02:52 +0000 Subject: 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 --- epan/dissectors/packet-laplink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-laplink.c') diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 279240b06b..512e11298d 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -234,8 +234,9 @@ proto_register_laplink(void) laplink_module = prefs_register_protocol(proto_laplink, NULL); prefs_register_bool_preference(laplink_module, "desegment_laplink_over_tcp", - "Desegment all Laplink-over-TCP messages", - "Whether the Laplink dissector should desegment all Laplink-over-TCP messages", + "Reassemble Laplink over TCP messages spanning multiple TCP segments", + "Whether the Laplink 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.", &laplink_desegment); } -- cgit v1.2.3