path: root/packet-nbns.c
diff options
authorGuy Harris <guy@alum.mit.edu>2002-02-18 23:51:55 +0000
committerGuy Harris <guy@alum.mit.edu>2002-02-18 23:51:55 +0000
commitb5058439201fcfdba86c6f7a6105ecb0cb6d6fdb (patch)
tree7b55a5cf8df1e890f729f2bf2a75756883f1c6a9 /packet-nbns.c
parent8166da40d5ce25fcf056eff41e8f43424fdc243d (diff)
Add support for reassembling RPC-over-TCP fragments, and do that in both
RPC and NDMP. Show the RPC-over-TCP fragment header as a tree with bitfields below it. Add a routine to show a reported bounds error as an "Unreassembled Packet" or a "Malformed Packet" depending on whether "pinfo->fragmented" is set, and have NBNS and RPC use that. Add "ett_ndmp_file_stats" to the list of ett_ values to be initialized (it wasn't in that list, and wasn't getting initialized). When freeing up various hash tables and memory chunks in the RPC dissector, zero out the pointers to them, just to make sure we don't try to free them again. Always destroy the TCP segment key and address memory chunks in "tcp_desegment_init()", regardless of whether TCP desegmentation is enabled - we don't *allocate* them if TCP desegmentation isn't enabled, but we should free them even if it's not enabled. Also, when we free them, set the pointers to them to null, so we don't double-free them. Supply to subdissectors called from the TCP dissector the sequence number of the first byte handed to the sub dissector. svn path=/trunk/; revision=4753
Diffstat (limited to 'packet-nbns.c')
1 files changed, 2 insertions, 5 deletions
diff --git a/packet-nbns.c b/packet-nbns.c
index 7127d5c3ca..0c3447f53e 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -3,7 +3,7 @@
* to when it had only NBNS)
* Guy Harris <guy@alum.mit.edu>
- * $Id: packet-nbns.c,v 1.72 2002/01/21 07:36:37 guy Exp $
+ * $Id: packet-nbns.c,v 1.73 2002/02/18 23:51:55 guy Exp $
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1507,10 +1507,7 @@ dissect_nbss_packet(tvbuff_t *tvb, int offset, packet_info *pinfo,
CATCH(ReportedBoundsError) {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
- proto_tree_add_protocol_format(tree, proto_malformed, tvb, 0, 0,
- "[Malformed Packet: %s]", pinfo->current_proto );
+ show_reported_bounds_error(tvb, pinfo, tree);
pinfo->current_proto = saved_proto;