osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't create a protocol tree or do anything to the columns before 

calling "tcp_dissect_pdus()", so that if we don't have the final segment
of a multi-segment packet, we don't change the columns or put in an
empty protocol tree item for NDPS.

Rename "ndps.desegment_ndps" to "ndps.desegment_tcp" - the "ndps." is
sufficient to indicate that it's for desegmenting NDPS, but we now have
a flag for desegmenting NDPS-over-SPX, so we should indicate that the
other flag is for desegmenting NDPS-over-TCP.

svn path=/trunk/; revision=7425
This commit is contained in:
Guy Harris 2003-04-09 08:43:53 +00:00
parent de205c4a3a
commit 9442f5bc7d
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
packet-ndps.c
View File

@ -3,7 +3,7 @@
* Greg Morris <gmorris@novell.com>
* Copyright (c) Novell, Inc. 2002-2003
*
* $Id: packet-ndps.c,v 1.15 2003/04/08 03:00:32 guy Exp $
* $Id: packet-ndps.c,v 1.16 2003/04/09 08:43:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -3299,6 +3299,25 @@ get_ndps_pdu_len(tvbuff_t *tvb, int offset)
return plen + 4;
}
static void
dissect_ndps_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *ndps_tree = NULL;
proto_item *ti;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_ndps, tvb, 0, -1, FALSE);
ndps_tree = proto_item_add_subtree(ti, ett_ndps);
}
dissect_ndps(tvb, pinfo, ndps_tree);
}
static void
ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
@ -3429,26 +3448,8 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static void
dissect_ndps_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *ndps_tree = NULL;
proto_item *ti;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_ndps, tvb, 0, -1, FALSE);
ndps_tree = proto_item_add_subtree(ti, ett_ndps);
}
tcp_dissect_pdus(tvb, pinfo, ndps_tree, ndps_desegment, 4, get_ndps_pdu_len,
dissect_ndps);
if (tvb_length_remaining(tvb, 0) < 8)
{
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "Ack");
}
tcp_dissect_pdus(tvb, pinfo, tree, ndps_desegment, 4, get_ndps_pdu_len,
dissect_ndps_pdu);
}
@ -3475,7 +3476,7 @@ static void
dissect_ndps_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, guint32 ndps_prog, guint32 ndps_func, int foffset)
{
ndps_req_hash_value *request_value = NULL;
conversation_t *conversation;
conversation_t *conversation;
guint32 i=0;
guint32 j=0;
guint32 name_len=0;
@ -6463,8 +6464,8 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset
static void
dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset)
{
conversation_t *conversation = NULL;
ndps_req_hash_value *request_value = NULL;
conversation_t *conversation = NULL;
ndps_req_hash_value *request_value = NULL;
proto_tree *atree;
proto_item *aitem;
proto_tree *btree;
@ -9103,8 +9104,8 @@ proto_register_ndps(void)
static gint *ett[] = {
&ett_ndps,
&ett_ndps_segments,
&ett_ndps_segment,
&ett_ndps_segments,
&ett_ndps_segment,
};
module_t *ndps_module;
@ -9113,14 +9114,14 @@ proto_register_ndps(void)
proto_register_subtree_array(ett, array_length(ett));
ndps_module = prefs_register_protocol(proto_ndps, NULL);
prefs_register_bool_preference(ndps_module, "desegment_ndps",
prefs_register_bool_preference(ndps_module, "desegment_tcp",
"Desegment all NDPS messages spanning multiple TCP segments",
"Whether the NDPS dissector should desegment all messages spanning multiple TCP segments",
&ndps_desegment);
prefs_register_bool_preference(ndps_module, "desegment_spx",
"Desegment all NDPS messages spanning multiple SPX packets",
"Whether the NDPS dissector should desegment all messages spanning multiple SPX packets",
&ndps_defragment);
prefs_register_bool_preference(ndps_module, "desegment_spx",
"Desegment all NDPS messages spanning multiple SPX packets",
"Whether the NDPS dissector should desegment all messages spanning multiple SPX packets",
&ndps_defragment);
register_init_routine(&ndps_init_protocol);
register_postseq_cleanup_routine(&ndps_postseq_cleanup);

6
prefs.c
View File

@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
* $Id: prefs.c,v 1.98 2003/03/13 18:17:59 guy Exp $
* $Id: prefs.c,v 1.99 2003/04/09 08:43:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1731,6 +1731,10 @@ set_pref(gchar *pref_name, gchar *value)
/* Handle old names for UDP preferences. */
if (strcmp(dotp, "udp_summary_in_tree") == 0)
pref = find_preference(module, "summary_in_tree");
} else if (strcmp(module->name, "ndps") == 0) {
/* Handle old names for NDPS preferences. */
if (strcmp(dotp, "desegment_ndps") == 0)
pref = find_preference(module, "desegment_tcp");
}
}
if (pref == NULL)