diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-11-21 15:54:59 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-21 15:05:33 +0000 |
| commit | f2fc562edaa71316b0da541a8c95e29953cdd944 (patch) | |
| tree | 371fe8ac3eec3cf591682105ac74f54fe5eaac18 /epan/dissectors/packet-mgcp.c | |
| parent | 96fb34706b972c55706f0be35172b0a248263e3c (diff) | |
Replace tvb_length()
Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
Reviewed-on: https://code.wireshark.org/review/5431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mgcp.c')
| -rw-r--r-- | epan/dissectors/packet-mgcp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index a8522c843d..5906c43043 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -341,7 +341,7 @@ static int dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi /* Initialize variables */ tvb_sectionend = 0; tvb_sectionbegin = tvb_sectionend; - tvb_len = tvb_length(tvb); + tvb_len = tvb_reported_length(tvb); num_messages = 0; mgcp_tree = NULL; ti = NULL; @@ -450,7 +450,7 @@ static int dissect_tpkt_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree * Dissect ASCII TPKT header */ dissect_asciitpkt(tvb, pinfo, tree, mgcp_handle); - offset = tvb_length(tvb); + offset = tvb_reported_length(tvb); } return offset; @@ -496,7 +496,7 @@ static void dissect_mgcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree * mi->hasDigitMap = FALSE; /* Initialize variables */ - tvb_len = tvb_length(tvb); + tvb_len = tvb_reported_length(tvb); /* * Check to see whether we're really dealing with MGCP by looking @@ -562,7 +562,7 @@ static void mgcp_raw_text_add(tvbuff_t *tvb, proto_tree *tree) gint tvb_linebegin,tvb_lineend,tvb_len,linelen; tvb_linebegin = 0; - tvb_len = tvb_length(tvb); + tvb_len = tvb_reported_length(tvb); do { @@ -1036,7 +1036,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree static address null_address = { AT_NONE, -1, 0, NULL }; tvb_previous_offset = 0; - tvb_len = tvb_length(tvb); + tvb_len = tvb_reported_length(tvb); tvb_current_offset = tvb_previous_offset; mi->is_duplicate = FALSE; mi->request_available = FALSE; @@ -1047,7 +1047,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree do { - tvb_current_len = tvb_length_remaining(tvb,tvb_previous_offset); + tvb_current_len = tvb_reported_length_remaining(tvb,tvb_previous_offset); tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_current_len, ' '); if (tvb_current_offset == -1) { @@ -1409,7 +1409,7 @@ static void dissect_mgcp_params(tvbuff_t *tvb, proto_tree *tree) gint tvb_tokenbegin; proto_tree *mgcp_param_ti, *mgcp_param_tree; - tvb_len = tvb_length(tvb); + tvb_len = tvb_reported_length(tvb); tvb_linebegin = 0; tvb_lineend = tvb_linebegin; @@ -1777,7 +1777,7 @@ static gint tvb_find_null_line(tvbuff_t* tvb, gint offset, gint len, gint* next_ } else { - tvb_current_len = tvb_length_remaining(tvb,offset); + tvb_current_len = tvb_reported_length_remaining(tvb,offset); } maxoffset = (tvb_current_len - 1) + offset; @@ -1787,7 +1787,7 @@ static gint tvb_find_null_line(tvbuff_t* tvb, gint offset, gint len, gint* next_ do { tvb_linebegin = tvb_lineend; - tvb_current_len = tvb_length_remaining(tvb,tvb_linebegin); + tvb_current_len = tvb_reported_length_remaining(tvb,tvb_linebegin); tvb_find_line_end(tvb, tvb_linebegin, tvb_current_len, &tvb_lineend,FALSE); tempchar = tvb_get_guint8(tvb,tvb_linebegin); } while (tempchar != '\r' && tempchar != '\n' && tvb_lineend <= maxoffset); @@ -1833,7 +1833,7 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset, gint len, gint* next_o gint tvb_current_offset, tvb_current_len, maxoffset,tvb_len; guint8 tempchar; tvb_current_len = len; - tvb_len = tvb_length(tvb); + tvb_len = tvb_reported_length(tvb); if (len == -1) { |