aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packet-atalk.c5
-rw-r--r--packet-h261.c1
-rw-r--r--packet-sap.c5
-rw-r--r--packet-smtp.c5
-rw-r--r--packet-snmp.c6
-rw-r--r--packet-wsp.c10
-rw-r--r--packet-yhoo.c4
-rw-r--r--packet-zebra.c7
8 files changed, 23 insertions, 20 deletions
diff --git a/packet-atalk.c b/packet-atalk.c
index 54c9e77837..93c6494b2c 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -1,7 +1,7 @@
/* packet-atalk.c
* Routines for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.c,v 1.52 2001/03/22 16:24:14 gram Exp $
+ * $Id: packet-atalk.c,v 1.53 2001/04/23 04:29:53 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -312,7 +312,8 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
val_to_str(op, nbp_op_vals, "Unknown (0x%01x)"), count);
if (tree) {
- ti = proto_tree_add_item(tree, proto_nbp, tvb, offset, END_OF_FRAME, FALSE);
+ ti = proto_tree_add_item(tree, proto_nbp, tvb, offset,
+ tvb_length_remaining(tvb, offset), FALSE);
nbp_tree = proto_item_add_subtree(ti, ett_nbp);
info_item = proto_tree_add_uint_format(nbp_tree, hf_nbp_info, tvb, offset, 1,
diff --git a/packet-h261.c b/packet-h261.c
index 480f91ec5d..205fe6f5c4 100644
--- a/packet-h261.c
+++ b/packet-h261.c
@@ -85,7 +85,6 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
}
if ( tree ) {
- /* Using fd->pkt_len here instead of END_OF_FRAME. This variable is changed in dissect_rtp()! */
ti = proto_tree_add_item( tree, proto_h261, tvb, offset, tvb_length( tvb ), FALSE );
h261_tree = proto_item_add_subtree( ti, ett_h261 );
/* SBIT 1st octet, 3 bits */
diff --git a/packet-sap.c b/packet-sap.c
index ec32bc0b1b..e798282872 100644
--- a/packet-sap.c
+++ b/packet-sap.c
@@ -4,7 +4,7 @@
*
* Heikki Vatiainen <hessu@cs.tut.fi>
*
- * $Id: packet-sap.c,v 1.20 2001/03/13 21:34:23 gram Exp $
+ * $Id: packet-sap.c,v 1.21 2001/04/23 04:29:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -162,7 +162,8 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (tree) {
- si = proto_tree_add_item(tree, proto_sap, tvb, offset, END_OF_FRAME, FALSE);
+ si = proto_tree_add_item(tree, proto_sap, tvb, offset,
+ tvb_length_remaining(tvb, offset), FALSE);
sap_tree = proto_item_add_subtree(si, ett_sap);
sif = proto_tree_add_uint(sap_tree, hf_sap_flags, tvb, offset, 1, vers_flags);
diff --git a/packet-smtp.c b/packet-smtp.c
index 781ee12dfa..9ec1fdbb24 100644
--- a/packet-smtp.c
+++ b/packet-smtp.c
@@ -1,7 +1,7 @@
/* packet-smtp.c
* Routines for SMTP packet disassembly
*
- * $Id: packet-smtp.c,v 1.16 2001/03/13 21:34:23 gram Exp $
+ * $Id: packet-smtp.c,v 1.17 2001/04/23 04:29:53 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -408,7 +408,8 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) { /* Build the tree info ... */
- ti = proto_tree_add_item(tree, proto_smtp, tvb, offset, END_OF_FRAME, FALSE);
+ ti = proto_tree_add_item(tree, proto_smtp, tvb, offset,
+ tvb_length_remaining(tvb, offset), FALSE);
smtp_tree = proto_item_add_subtree(ti, ett_smtp);
proto_tree_add_boolean_hidden(smtp_tree, (request ? hf_smtp_req : hf_smtp_rsp),
tvb, offset, 4, TRUE);
diff --git a/packet-snmp.c b/packet-snmp.c
index e5f17167be..176d3da78c 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -8,7 +8,7 @@
*
* See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u.
*
- * $Id: packet-snmp.c,v 1.66 2001/04/15 09:05:17 guy Exp $
+ * $Id: packet-snmp.c,v 1.67 2001/04/23 04:29:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1477,7 +1477,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (tree) {
item = proto_tree_add_item(tree, proto, tvb, offset,
- END_OF_FRAME, FALSE);
+ tvb_length_remaining(tvb, offset), FALSE);
snmp_tree = proto_item_add_subtree(item, ett);
}
@@ -1864,7 +1864,7 @@ dissect_smux_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (tree) {
item = proto_tree_add_item(tree, proto, tvb, offset,
- END_OF_FRAME, FALSE);
+ tvb_length_remaining(tvb, offset), FALSE);
smux_tree = proto_item_add_subtree(item, ett);
}
diff --git a/packet-wsp.c b/packet-wsp.c
index 9dcf16b7fe..f6c3cd7944 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.19 2001/02/19 21:02:33 guy Exp $
+ * $Id: packet-wsp.c,v 1.20 2001/04/23 04:29:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -630,7 +630,7 @@ dissect_wsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
add_headers (wsp_tree, tmp_tvb);
/* TODO: Post DATA */
- /* Runs from start of headers+headerLength to END_OF_FRAME */
+ /* Runs from start of headers+headerLength to end of frame */
offset = nextOffset+headerLength;
tmp_tvb = tvb_new_subset (tvb, offset, tvb_reported_length (tvb)-offset, tvb_reported_length (tvb)-offset);
add_post_data (wsp_tree, tmp_tvb, contentType);
@@ -654,10 +654,10 @@ dissect_wsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset += count+value+1;
/* TODO: Data - decode WMLC */
- /* Runs from offset+1+count+value+1 to END_OF_FRAME */
+ /* Runs from offset+1+count+value+1 to end of frame */
if (offset < tvb_reported_length (tvb))
{
- ti = proto_tree_add_item (wsp_tree, hf_wsp_reply_data,tvb,offset,END_OF_FRAME,bo_little_endian);
+ ti = proto_tree_add_item (wsp_tree, hf_wsp_reply_data,tvb,offset,tvb_length_remaining(tvb, offset),bo_little_endian);
}
break;
}
@@ -1417,7 +1417,7 @@ add_post_data (proto_tree *tree, tvbuff_t *tvb, guint contentType)
guint8 peek = 0;
proto_item *ti;
- /* VERIFY ti = proto_tree_add_item (tree, hf_wsp_post_data,tvb,offset,END_OF_FRAME,bo_little_endian); */
+ /* VERIFY ti = proto_tree_add_item (tree, hf_wsp_post_data,tvb,offset,tvb_length_remaining(tvb, offset),bo_little_endian); */
ti = proto_tree_add_item (tree, hf_wsp_post_data,tvb,offset,tvb_reported_length(tvb),bo_little_endian);
if (contentType == 0x12) /* URL Encoded data */
diff --git a/packet-yhoo.c b/packet-yhoo.c
index 69517e7b7d..febe00eddc 100644
--- a/packet-yhoo.c
+++ b/packet-yhoo.c
@@ -2,7 +2,7 @@
* Routines for yahoo messenger packet dissection
* Copyright 1999, Nathan Neulinger <nneul@umr.edu>
*
- * $Id: packet-yhoo.c,v 1.14 2001/04/18 00:21:01 nneul Exp $
+ * $Id: packet-yhoo.c,v 1.15 2001/04/23 04:29:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -151,7 +151,7 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (tree) {
ti = proto_tree_add_item(tree, proto_yhoo, tvb, offset,
- END_OF_FRAME, FALSE);
+ tvb_length_remaining(tvb, offset), FALSE);
yhoo_tree = proto_item_add_subtree(ti, ett_yhoo);
proto_tree_add_string(yhoo_tree, hf_yhoo_version, tvb,
diff --git a/packet-zebra.c b/packet-zebra.c
index ed67210d02..d30d632041 100644
--- a/packet-zebra.c
+++ b/packet-zebra.c
@@ -3,7 +3,7 @@
*
* Jochen Friedrich <jochen@scram.de>
*
- * $Id: packet-zebra.c,v 1.11 2001/04/19 23:02:43 guy Exp $
+ * $Id: packet-zebra.c,v 1.12 2001/04/23 04:29:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -489,10 +489,11 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (tree) {
ti = proto_tree_add_item(tree, proto_zebra, tvb, offset,
- END_OF_FRAME, FALSE);
+ tvb_length_remaining(tvb, offset), FALSE);
zebra_tree = proto_item_add_subtree(ti, ett_zebra);
proto_tree_add_boolean_hidden(zebra_tree, hf_zebra_request,
- tvb, offset, END_OF_FRAME, request);
+ tvb, offset, tvb_length_remaining(tvb, offset),
+ request);
for (;;) {
guint8 command;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 14:02:31 +0000