diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 08:18:09 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-05-11 08:18:09 +0000 |
| commit | 292e38e2c61edcd14bfa30ca3c72bacda1bcbe32 (patch) | |
| tree | db4edef02456a48d0f6d505166ac7d70f6c0f644 /packet-pppoe.c | |
| parent | 162800efb308901e0c302517be01226130e39b19 (diff) | |
| download | wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.tar.gz wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.tar.bz2 wireshark-292e38e2c61edcd14bfa30ca3c72bacda1bcbe32.zip | |
Add tvbuff class.
Add exceptions routines.
Convert proto_tree_add_*() routines to require tvbuff_t* argument.
Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as
the tvbuff_t* argument to proto_tree_add_*() routines.
dissect_packet() creates a tvbuff_t, wraps the next dissect call in
a TRY block, will print "Short Frame" on the proto_tree if a BoundsError
exception is caught.
The FDDI dissector is converted to use tvbuff's.
svn path=/trunk/; revision=1939
Diffstat (limited to 'packet-pppoe.c')
| -rw-r--r-- | packet-pppoe.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/packet-pppoe.c b/packet-pppoe.c index f63ca80ae0..1d0695e548 100644 --- a/packet-pppoe.c +++ b/packet-pppoe.c @@ -1,7 +1,7 @@ /* packet-arp.c * Routines for ARP packet disassembly * - * $Id: packet-pppoe.c,v 1.7 2000/04/16 22:59:37 guy Exp $ + * $Id: packet-pppoe.c,v 1.8 2000/05/11 08:15:35 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -105,7 +105,7 @@ dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tre /* Start Decoding Here. */ if (tree) { - ti = proto_tree_add_text(tree,offset,payload_length,"PPPoE Tags"); + ti = proto_tree_add_text(tree, NullTVB,offset,payload_length,"PPPoE Tags"); pppoe_tree = proto_item_add_subtree(ti, ett_pppoed_tags); tagstart = offset; @@ -114,7 +114,7 @@ dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tre poe_tag = pntohs(&pd[tagstart]); poe_tag_length = pntohs(&pd[tagstart + 2]); - proto_tree_add_text(pppoe_tree,tagstart,4, + proto_tree_add_text(pppoe_tree, NullTVB,tagstart,4, "Tag: %s", pppoetag_to_str(poe_tag,"Unknown (0x%02x)")); switch(poe_tag) { @@ -126,13 +126,13 @@ dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tre /* tag value should be interpreted as a utf-8 unterminated string.*/ if(poe_tag_length > 0 ) { /* really should do some limit checking here. :( */ - proto_tree_add_text(pppoe_tree,tagstart+4,poe_tag_length, + proto_tree_add_text(pppoe_tree, NullTVB,tagstart+4,poe_tag_length, " String Data: %s", format_text(&pd[tagstart+4],poe_tag_length )); } break; default: if(poe_tag_length > 0 ) { - proto_tree_add_text(pppoe_tree,tagstart+4,poe_tag_length, + proto_tree_add_text(pppoe_tree, NullTVB,tagstart+4,poe_tag_length, " Binary Data: (%d bytes)", poe_tag_length ); } } @@ -171,17 +171,17 @@ dissect_pppoed(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { } if (tree) { - ti = proto_tree_add_text(tree,offset,pppoe_length+6,"PPPoE Discovery"); + ti = proto_tree_add_text(tree, NullTVB,offset,pppoe_length+6,"PPPoE Discovery"); pppoe_tree = proto_item_add_subtree(ti, ett_pppoed); - proto_tree_add_text(pppoe_tree,offset,1, + proto_tree_add_text(pppoe_tree, NullTVB,offset,1, "Version: %d", pppoe_ver); - proto_tree_add_text(pppoe_tree,offset,1, + proto_tree_add_text(pppoe_tree, NullTVB,offset,1, "Type: %d", pppoe_type); - proto_tree_add_text(pppoe_tree,offset+1,1, + proto_tree_add_text(pppoe_tree, NullTVB,offset+1,1, "Code: %s", pppoecode_to_str(pppoe_code,"Unknown (0x%02x)")); - proto_tree_add_text(pppoe_tree,offset+2,2, + proto_tree_add_text(pppoe_tree, NullTVB,offset+2,2, "Session ID: %04x", pppoe_session_id); - proto_tree_add_text(pppoe_tree,offset+4,2, + proto_tree_add_text(pppoe_tree, NullTVB,offset+4,2, "Payload Length: %d", pppoe_length); } dissect_pppoe_tags(pd,offset+6,fd,tree,offset+6+pppoe_length); @@ -215,17 +215,17 @@ dissect_pppoes(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { } if (tree) { - ti = proto_tree_add_text(tree,offset,pppoe_length+6,"PPPoE Session"); + ti = proto_tree_add_text(tree, NullTVB,offset,pppoe_length+6,"PPPoE Session"); pppoe_tree = proto_item_add_subtree(ti, ett_pppoed); - proto_tree_add_text(pppoe_tree,offset,1, + proto_tree_add_text(pppoe_tree, NullTVB,offset,1, "Version: %d", pppoe_ver); - proto_tree_add_text(pppoe_tree,offset,1, + proto_tree_add_text(pppoe_tree, NullTVB,offset,1, "Type: %d", pppoe_type); - proto_tree_add_text(pppoe_tree,offset+1,1, + proto_tree_add_text(pppoe_tree, NullTVB,offset+1,1, "Code: %s", pppoecode_to_str(pppoe_code,"Unknown (0x%02x)")); - proto_tree_add_text(pppoe_tree,offset+2,2, + proto_tree_add_text(pppoe_tree, NullTVB,offset+2,2, "Session ID: %04x", pppoe_session_id); - proto_tree_add_text(pppoe_tree,offset+4,2, + proto_tree_add_text(pppoe_tree, NullTVB,offset+4,2, "Payload Length: %d", pppoe_length); } /* dissect_ppp is apparently done as a 'top level' dissector, |