diff options
| -rw-r--r-- | packet-diameter.c | 4 | ||||
| -rw-r--r-- | packet-ndmp.c | 4 | ||||
| -rw-r--r-- | packet-smb-pipe.c | 4 | ||||
| -rw-r--r-- | packet-smb.c | 10 | ||||
| -rw-r--r-- | prefs.c | 16 |
5 files changed, 26 insertions, 12 deletions
diff --git a/packet-diameter.c b/packet-diameter.c index 48aaf9ca4b..bb652c6a9e 100644 --- a/packet-diameter.c +++ b/packet-diameter.c @@ -1,7 +1,7 @@ /* packet-diameter.c * Routines for Diameter packet disassembly * - * $Id: packet-diameter.c,v 1.39 2002/01/08 07:14:08 guy Exp $ + * $Id: packet-diameter.c,v 1.40 2002/01/15 10:01:19 guy Exp $ * * Copyright (c) 2001 by David Frascone <dave@frascone.com> * @@ -1883,7 +1883,7 @@ proto_register_diameter(void) &gbl_diameterDictionary); /* Desegmentation */ - prefs_register_bool_preference(diameter_module, "diameter.desegment", + prefs_register_bool_preference(diameter_module, "desegment", "Desegment all Diameter messages spanning multiple TCP segments", "Whether the Diameter dissector should desegment all messages spanning multiple TCP segments", &gbl_diameter_desegment); diff --git a/packet-ndmp.c b/packet-ndmp.c index 769c62f946..bb15ff6cae 100644 --- a/packet-ndmp.c +++ b/packet-ndmp.c @@ -12,7 +12,7 @@ * Routines for NDMP dissection * 2001 Ronnie Sahlberg (see AUTHORS for email) * - * $Id: packet-ndmp.c,v 1.5 2002/01/05 20:08:47 guy Exp $ + * $Id: packet-ndmp.c,v 1.6 2002/01/15 10:01:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3059,7 +3059,7 @@ proto_register_ndmp(void) /* desegmentation */ ndmp_module = prefs_register_protocol(proto_ndmp, NULL); - prefs_register_bool_preference(ndmp_module, "ndmp.desegment", "Desegment all NDMP messages spanning multiple TCP segments", "Whether the dissector should desegment NDMP over TCP PDUs or not", &ndmp_desegment); + prefs_register_bool_preference(ndmp_module, "desegment", "Desegment all NDMP messages spanning multiple TCP segments", "Whether the dissector should desegment NDMP over TCP PDUs or not", &ndmp_desegment); } diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index a0d7e018cd..26445ae704 100644 --- a/packet-smb-pipe.c +++ b/packet-smb-pipe.c @@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets * significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and * Guy Harris 2001 * - * $Id: packet-smb-pipe.c,v 1.62 2001/12/16 20:08:22 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.63 2002/01/15 10:01:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2580,7 +2580,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree it = proto_tree_add_text(tree, d_tvb, 0, 0, "Fragments"); tr = proto_item_add_subtree(it, ett_smb_pipe_fragments); for(fd=fd_head->next;fd;fd=fd->next){ - proto_tree_add_text(tr, d_tvb, 0, 0, "Frame:%d Data:%d-%d", + proto_tree_add_text(tr, d_tvb, 0, 0, "Frame:%u Data:%u-%u", fd->frame, fd->offset, fd->offset+fd->len-1); } } diff --git a/packet-smb.c b/packet-smb.c index ecd22f56f5..aaa628cf99 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.193 2002/01/15 09:42:26 guy Exp $ + * $Id: packet-smb.c,v 1.194 2002/01/15 10:01:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -7551,7 +7551,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t it = proto_tree_add_text(tree, tvb, 0, 0, "Fragments"); tr = proto_item_add_subtree(it, ett_smb_segments); for(fd=r_fd->next;fd;fd=fd->next){ - proto_tree_add_text(tr, tvb, 0, 0, "Frame:%d Data:%d-%d", + proto_tree_add_text(tr, tvb, 0, 0, "Frame:%u Data:%u-%u", fd->frame, fd->offset, fd->offset+fd->len-1); } @@ -11338,7 +11338,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree it = proto_tree_add_text(tree, tvb, 0, 0, "Fragments"); tr = proto_item_add_subtree(it, ett_smb_segments); for(fd=r_fd->next;fd;fd=fd->next){ - proto_tree_add_text(tr, tvb, 0, 0, "Frame:%d Data:%d-%d", + proto_tree_add_text(tr, tvb, 0, 0, "Frame:%u Data:%u-%u", fd->frame, fd->offset, fd->offset+fd->len-1); } @@ -15800,11 +15800,11 @@ proto_register_smb(void) proto_register_field_array(proto_smb, hf, array_length(hf)); register_init_routine(&smb_init_protocol); smb_module = prefs_register_protocol(proto_smb, NULL); - prefs_register_bool_preference(smb_module, "smb.trans.reassembly", + prefs_register_bool_preference(smb_module, "trans_reassembly", "Reassemble SMB Transaction payload", "Whether the dissector should do reassembly the payload of SMB Transaction commands spanning multiple SMB PDUs", &smb_trans_reassembly); - prefs_register_bool_preference(smb_module, "smb.dcerpc.reassembly", + prefs_register_bool_preference(smb_module, "dcerpc_reassembly", "Reassemble DCERPC over SMB", "Whether the dissector should do reassembly of DCERPC over SMB commands", &smb_dcerpc_reassembly); @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.77 2002/01/13 20:35:08 guy Exp $ + * $Id: prefs.c,v 1.78 2002/01/15 10:01:21 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1447,6 +1447,20 @@ set_pref(gchar *pref_name, gchar *value) /* Otherwise it's from the command line, and we don't bother mapping it. */ } + } else if (strncmp(pref_name, "smb.", 4) == 0) { + /* Handle old names for SMB preferences. */ + if (strcmp(dotp, "smb.trans.reassembly") == 0) + pref = find_preference(module, "trans_reassembly"); + else if (strcmp(dotp, "smb.dcerpc.reassembly") == 0) + pref = find_preference(module, "dcerpc_reassembly"); + } else if (strncmp(pref_name, "ndmp.", 5) == 0) { + /* Handle old names for NDMP preferences. */ + if (strcmp(dotp, "ndmp.desegment") == 0) + pref = find_preference(module, "desegment"); + } else if (strncmp(pref_name, "diameter.", 9) == 0) { + /* Handle old names for Diameter preferences. */ + if (strcmp(dotp, "diameter.desegment") == 0) + pref = find_preference(module, "desegment"); } } if (pref == NULL) |