diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-08-21 09:02:52 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-08-21 09:02:52 +0000 |
| commit | d530bd4e14072e9677395d60b9948c04f579ab13 (patch) | |
| tree | 3f9be27e5d8ec59d4de5368c091899d003ce2201 /epan/dissectors/packet-ncp.c | |
| parent | 747f63150b44eb32bc8e0bdff66f82ef70f86ce9 (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-ncp.c')
| -rw-r--r-- | epan/dissectors/packet-ncp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 6f5e5c4e93..162e70ddb7 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -1046,12 +1046,13 @@ proto_register_ncp(void) ncp_module = prefs_register_protocol(proto_ncp, NULL); prefs_register_obsolete_preference(ncp_module, "initial_hash_size"); prefs_register_bool_preference(ncp_module, "desegment", - "Desegment all NCP-over-TCP messages spanning multiple segments", - "Whether the NCP dissector should desegment all messages spanning multiple TCP segments", + "Reassemble NCP-over-TCP messages spanning multiple TCP segments", + "Whether the NCP 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.", &ncp_desegment); prefs_register_bool_preference(ncp_module, "defragment_nds", - "Defragment all NDS messages spanning multiple packets", - "Whether the NCP dissector should defragment all NDS messages spanning multiple packets", + "Reassemble fragmented NDS messages spanning multiple packets", + "Whether the NCP dissector should defragment NDS messages spanning multiple packets.", &nds_defragment); register_init_routine(&mncp_init_protocol); register_postseq_cleanup_routine(&mncp_postseq_cleanup); |