diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-24 06:17:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-24 06:17:36 +0000 |
| commit | 07d0032f1cb2cf05e5fe30bc89f09f7e20c7a8ee (patch) | |
| tree | 0f836a7e98dd222351ae977bf19443905c24c8d8 /packet-atalk.c | |
| parent | 0c0516a755dd1084b567e9fa8f97c7b7664a6f42 (diff) | |
| download | wireshark-07d0032f1cb2cf05e5fe30bc89f09f7e20c7a8ee.tar.gz wireshark-07d0032f1cb2cf05e5fe30bc89f09f7e20c7a8ee.tar.bz2 wireshark-07d0032f1cb2cf05e5fe30bc89f09f7e20c7a8ee.zip | |
Add a "fragment_add_seq_next()" to reassemble fragments that don't have
sequence numbers or offsets and are thus assumed to be received in order
with no duplicates or dropped fragments (e.g., for NetBIOS Frame, where
802.2 LLC guarantees in-order delivery to NetBIOS with no duplicates or
dropped fragments).
"show_fragment_tree()' and "show_fragment_seq_tree()" don't modify the
"fragment_items" to which the "fit" argument points, so make that
argument a "const fragment_items *".
Make all the "fragment_items" tables "static" (as they're not used
outside the modules defining them) and "const" (as they're not
modified).
Add support for reassembly of NetBIOS fragmented requests and responses.
Get rid of an unnecessary include of "packet-tr.c" in the NetBIOS
dissector, and make its table of dissection function pointers static.
Fix some typos in the AppleTalk and NetBIOS dissectors.
svn path=/trunk/; revision=6491
Diffstat (limited to 'packet-atalk.c')
| -rw-r--r-- | packet-atalk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-atalk.c b/packet-atalk.c index 4790a40afd..45ea847a93 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -2,7 +2,7 @@ * Routines for AppleTalk packet disassembly: LLAP, DDP, NBP, ATP, ASP, * RTMP. * - * $Id: packet-atalk.c,v 1.82 2002/10/17 22:38:19 guy Exp $ + * $Id: packet-atalk.c,v 1.83 2002/10/24 06:17:28 guy Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -335,7 +335,7 @@ static gint ett_ddp = -1; static gint ett_llap = -1; static gint ett_pstring = -1; -fragment_items atp_frag_items = { +static const fragment_items atp_frag_items = { &ett_atp_segment, &ett_atp_segments, &hf_atp_segments, @@ -1940,7 +1940,7 @@ proto_register_atalk(void) NULL, 0x0, "Segment overlaps with other segments", HFILL }}, { &hf_atp_segment_overlap_conflict, - { "Conflicting data in seagment overlap", "atp.segment.overlap.conflict", + { "Conflicting data in segment overlap", "atp.segment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Overlapping segments contained conflicting data", HFILL }}, @@ -1954,7 +1954,7 @@ proto_register_atalk(void) NULL, 0x0, "Segment contained data past end of packet", HFILL }}, { &hf_atp_segment_error, - {" Desegmentation error", "atp.segment.error", FT_NONE, BASE_NONE, + {"Desegmentation error", "atp.segment.error", FT_NONE, BASE_NONE, NULL, 0x0, "Desegmentation error due to illegal segments", HFILL }}, { &hf_atp_segment, |