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

Do some cleanup related to deprecated function names and revised function return values): 

- tvb_length_remaining() ==> tvb_captured_length_remaining();
- tvb_ensure_length_remaining() ==> tvb_ensure_captured_length_remaining();
- tvb_(captured|reported)_length_remaining() now return 0 instead of -1 if error
   and thus MAX(0, ...) is no longer required;
- Rename variable: length_remaining ==> captured_length_remaining;
- tabs ==> spaces (to match editor modelines).

Change-Id: I93b947a0a4cc52ccd2ad21c914abf4c4218b59e6
Reviewed-on: https://code.wireshark.org/review/1610
Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2014-05-12 11:17:18 -04:00
parent d1d5caaf25
commit 483e459a7e
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
epan/dissectors/packet-tcp.c
View File

@ -1732,7 +1732,7 @@ again:
/* TCP analysis already flags this (in COL_INFO) as a retransmission--if it's enabled */ /* TCP analysis already flags this (in COL_INFO) as a retransmission--if it's enabled */
} }
nbytes = MAX(0, tvb_reported_length_remaining(tvb, offset)); nbytes = tvb_reported_length_remaining(tvb, offset);
proto_tree_add_bytes_format(tcp_tree, hf_tcp_segment_data, tvb, offset, proto_tree_add_bytes_format(tcp_tree, hf_tcp_segment_data, tvb, offset,
nbytes, NULL, "%sTCP segment data (%u byte%s)", str, nbytes, nbytes, NULL, "%sTCP segment data (%u byte%s)", str, nbytes,
plurality(nbytes, "", "s")); plurality(nbytes, "", "s"));
@ -1756,7 +1756,7 @@ again:
*/ */
if (msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT) { if (msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT) {
/* The dissector asked for the entire segment */ /* The dissector asked for the entire segment */
len = MAX(0, tvb_length_remaining(tvb, offset)); len = tvb_captured_length_remaining(tvb, offset);
} else { } else {
len = MIN(nxtseq, msp->nxtpdu) - seq; len = MIN(nxtseq, msp->nxtpdu) - seq;
} }
@ -1903,7 +1903,7 @@ again:
* will complete reassembly even if it * will complete reassembly even if it
* is only one single byte in length. * is only one single byte in length.
*/ */
msp->nxtpdu = seq + MAX(0, tvb_reported_length_remaining(tvb, offset)) + 1; msp->nxtpdu = seq + tvb_reported_length_remaining(tvb, offset) + 1;
msp->flags |= MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT; msp->flags |= MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT;
} else if (pinfo->desegment_len == DESEGMENT_UNTIL_FIN) { } else if (pinfo->desegment_len == DESEGMENT_UNTIL_FIN) {
tcpd->fwd->flags |= TCP_FLOW_REASSEMBLE_UNTIL_FIN; tcpd->fwd->flags |= TCP_FLOW_REASSEMBLE_UNTIL_FIN;
@ -1918,7 +1918,7 @@ again:
another_pdu_follows = 0; another_pdu_follows = 0;
offset += last_fragment_len; offset += last_fragment_len;
seq += last_fragment_len; seq += last_fragment_len;
if (tvb_length_remaining(tvb, offset) > 0) if (tvb_captured_length_remaining(tvb, offset) > 0)
goto again; goto again;
} else { } else {
/* /*
@ -1927,7 +1927,7 @@ again:
*/ */
nbytes = another_pdu_follows > 0 nbytes = another_pdu_follows > 0
? another_pdu_follows ? another_pdu_follows
: MAX(0, tvb_reported_length_remaining(tvb, offset)); : tvb_reported_length_remaining(tvb, offset);
proto_tree_add_bytes_format(tcp_tree, hf_tcp_segment_data, tvb, offset, proto_tree_add_bytes_format(tcp_tree, hf_tcp_segment_data, tvb, offset,
nbytes, NULL, "TCP segment data (%u byte%s)", nbytes, nbytes, NULL, "TCP segment data (%u byte%s)", nbytes,
plurality(nbytes, "", "s")); plurality(nbytes, "", "s"));
@ -2076,7 +2076,7 @@ again:
* XXX - remember what protocol the last subdissector * XXX - remember what protocol the last subdissector
* was, and report it as a continuation of that, instead? * was, and report it as a continuation of that, instead?
*/ */
nbytes = MAX(0, tvb_reported_length_remaining(tvb, deseg_offset)); nbytes = tvb_reported_length_remaining(tvb, deseg_offset);
proto_tree_add_bytes_format(tcp_tree, hf_tcp_segment_data, tvb, deseg_offset, proto_tree_add_bytes_format(tcp_tree, hf_tcp_segment_data, tvb, deseg_offset,
-1, NULL, "TCP segment data (%u byte%s)", nbytes, -1, NULL, "TCP segment data (%u byte%s)", nbytes,
plurality(nbytes, "", "s")); plurality(nbytes, "", "s"));
@ -2138,7 +2138,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
{ {
volatile int offset = 0; volatile int offset = 0;
int offset_before; int offset_before;
guint length_remaining; guint captured_length_remaining;
guint plen; guint plen;
guint length; guint length;
tvbuff_t *next_tvb; tvbuff_t *next_tvb;
@ -2148,16 +2148,17 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
while (tvb_reported_length_remaining(tvb, offset) > 0) { while (tvb_reported_length_remaining(tvb, offset) > 0) {
/* /*
* We use "tvb_ensure_length_remaining()" to make sure there actually * We use "tvb_ensure_captured_length_remaining()" to make
* *is* data remaining. The protocol we're handling could conceivably * sure there actually *is* data remaining. The protocol
* consists of a sequence of fixed-length PDUs, and therefore the * we're handling could conceivably consists of a sequence of
* "get_pdu_len" routine might not actually fetch anything from * fixed-length PDUs, and therefore the "get_pdu_len" routine
* the tvbuff, and thus might not cause an exception to be thrown if * might not actually fetch anything from the tvbuff, and thus
* we've run past the end of the tvbuff. * might not cause an exception to be thrown if we've run past
* the end of the tvbuff.
* *
* This means we're guaranteed that "length_remaining" is positive. * This means we're guaranteed that "captured_length_remaining" is positive.
*/ */
length_remaining = tvb_ensure_length_remaining(tvb, offset); captured_length_remaining = tvb_ensure_captured_length_remaining(tvb, offset);
/* /*
* Can we do reassembly? * Can we do reassembly?
@ -2167,7 +2168,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* Yes - is the fixed-length part of the PDU split across segment * Yes - is the fixed-length part of the PDU split across segment
* boundaries? * boundaries?
*/ */
if (length_remaining < fixed_len) { if (captured_length_remaining < fixed_len) {
/* /*
* Yes. Tell the TCP dissector where the data for this message * Yes. Tell the TCP dissector where the data for this message
* starts in the data it handed us and that we need "some more * starts in the data it handed us and that we need "some more
@ -2211,7 +2212,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
*/ */
if(!pinfo->fd->flags.visited && tcp_analyze_seq) { if(!pinfo->fd->flags.visited && tcp_analyze_seq) {
guint remaining_bytes; guint remaining_bytes;
remaining_bytes = MAX(0, tvb_reported_length_remaining(tvb, offset)); remaining_bytes = tvb_reported_length_remaining(tvb, offset);
if(plen>remaining_bytes) { if(plen>remaining_bytes) {
pinfo->want_pdu_tracking=2; pinfo->want_pdu_tracking=2;
pinfo->bytes_until_next_pdu=plen-remaining_bytes; pinfo->bytes_until_next_pdu=plen-remaining_bytes;
@ -2225,14 +2226,14 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* /*
* Yes - is the PDU split across segment boundaries? * Yes - is the PDU split across segment boundaries?
*/ */
if (length_remaining < plen) { if (captured_length_remaining < plen) {
/* /*
* Yes. Tell the TCP dissector where the data for this message * Yes. Tell the TCP dissector where the data for this message
* starts in the data it handed us, and how many more bytes we * starts in the data it handed us, and how many more bytes we
* need, and return. * need, and return.
*/ */
pinfo->desegment_offset = offset; pinfo->desegment_offset = offset;
pinfo->desegment_len = plen - length_remaining; pinfo->desegment_len = plen - captured_length_remaining;
return; return;
} }
} }
@ -2247,7 +2248,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* Wireshark. * Wireshark.
*/ */
#if 0 #if 0
if (length_remaining >= plen || there are more packets) if (captured_length_remaining >= plen || there are more packets)
{ {
#endif #endif
/* /*
@ -2261,7 +2262,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} else { } else {
item = proto_tree_add_text((proto_tree *)p_get_proto_data(pinfo->pool, pinfo, proto_tcp, pinfo->curr_layer_num), item = proto_tree_add_text((proto_tree *)p_get_proto_data(pinfo->pool, pinfo, proto_tcp, pinfo->curr_layer_num),
tvb, offset, -1, tvb, offset, -1,
"PDU Size: %u cut short at %u",plen,length_remaining); "PDU Size: %u cut short at %u",plen,captured_length_remaining);
PROTO_ITEM_SET_GENERATED(item); PROTO_ITEM_SET_GENERATED(item);
} }
#endif #endif
@ -2270,7 +2271,7 @@ tcp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* Construct a tvbuff containing the amount of the payload we have * Construct a tvbuff containing the amount of the payload we have
* available. Make its reported length the amount of data in the PDU. * available. Make its reported length the amount of data in the PDU.
*/ */
length = length_remaining; length = captured_length_remaining;
if (length > plen) if (length > plen)
length = plen; length = plen;
next_tvb = tvb_new_subset(tvb, offset, length, plen); next_tvb = tvb_new_subset(tvb, offset, length, plen);
@ -4120,7 +4121,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
guint32 phdr[2]; guint32 phdr[2];
guint16 computed_cksum; guint16 computed_cksum;
guint16 real_window; guint16 real_window;
guint length_remaining; guint captured_length_remaining;
gboolean desegment_ok; gboolean desegment_ok;
struct tcpinfo tcpinfo; struct tcpinfo tcpinfo;
struct tcpheader *tcph; struct tcpheader *tcph;
@ -4645,7 +4646,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
options_item = NULL; options_item = NULL;
options_tree = NULL; options_tree = NULL;
if (optlen != 0) { if (optlen != 0) {
guint bc = (guint)MAX(0, tvb_length_remaining(tvb, offset + 20)); guint bc = (guint)tvb_captured_length_remaining(tvb, offset + 20);
if (tcp_tree != NULL) { if (tcp_tree != NULL) {
options_item = proto_tree_add_item(tcp_tree, hf_tcp_options, tvb, offset + 20, options_item = proto_tree_add_item(tcp_tree, hf_tcp_options, tvb, offset + 20,
@ -4707,7 +4708,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Check the packet length to see if there's more data /* Check the packet length to see if there's more data
(it could be an ACK-only packet) */ (it could be an ACK-only packet) */
length_remaining = MAX(0, tvb_length_remaining(tvb, offset)); captured_length_remaining = tvb_captured_length_remaining(tvb, offset);
if (tcph->th_have_seglen) { if (tcph->th_have_seglen) {
if( data_out_file ) { if( data_out_file ) {
@ -4715,8 +4716,8 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tcph->th_seq, /* sequence number */ tcph->th_seq, /* sequence number */
tcph->th_ack, /* acknowledgment number */ tcph->th_ack, /* acknowledgment number */
tcph->th_seglen, /* data length */ tcph->th_seglen, /* data length */
(const gchar*)tvb_get_ptr(tvb, offset, length_remaining), /* data */ (const gchar*)tvb_get_ptr(tvb, offset, captured_length_remaining), /* data */
length_remaining, /* captured data length */ captured_length_remaining, /* captured data length */
( tcph->th_flags & TH_SYN ), /* is syn set? */ ( tcph->th_flags & TH_SYN ), /* is syn set? */
&pinfo->net_src, &pinfo->net_src,
&pinfo->net_dst, &pinfo->net_dst,
@ -4824,7 +4825,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* dissector update state based on it. * dissector update state based on it.
* Also, we probably don't want to run TCP taps on those packets. * Also, we probably don't want to run TCP taps on those packets.
*/ */
if (length_remaining != 0) { if (captured_length_remaining != 0) {
if (tcph->th_flags & TH_RST) { if (tcph->th_flags & TH_RST) {
/* /*
* RFC1122 says: * RFC1122 says:
@ -4841,9 +4842,9 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* *
* so for segments with RST we just display the data as text. * so for segments with RST we just display the data as text.
*/ */
proto_tree_add_text(tcp_tree, tvb, offset, length_remaining, proto_tree_add_text(tcp_tree, tvb, offset, captured_length_remaining,
"Reset cause: %s", "Reset cause: %s",
tvb_format_text(tvb, offset, length_remaining)); tvb_format_text(tvb, offset, captured_length_remaining));
} else { } else {
dissect_tcp_payload(tvb, pinfo, offset, tcph->th_seq, nxtseq, dissect_tcp_payload(tvb, pinfo, offset, tcph->th_seq, nxtseq,
tcph->th_sport, tcph->th_dport, tree, tcp_tree, tcpd, &tcpinfo); tcph->th_sport, tcph->th_dport, tree, tcp_tree, tcpd, &tcpinfo);