diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-10 16:54:02 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-10 16:54:02 +0000 |
| commit | b97cfa22fdc00dbb2e8703ae1f4b8a7619d4d382 (patch) | |
| tree | b4e35edeb18125a40e127ec80090de39d8f174a4 /asn1 | |
| parent | 22dcdd3f9ace3cac3523841545872d4b8a20f8b7 (diff) | |
offset_from_real_beginning() is only called with 0 as second argument, so remove the argument completely. It seems that the second argument only acts as an accumulator allowing offset_from_real_beginning() to call itself recursively. To be consistent offset_from_real_beginning() is renamed to tvb_offset_from_real_beginning().
svn path=/trunk/; revision=29844
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/snmp/packet-snmp-template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 6f99f14c1d..d703de9ecd 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1431,7 +1431,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, usm_p.msg_tvb = tvb; - usm_p.start_offset = offset_from_real_beginning(tvb,0) ; + usm_p.start_offset = tvb_offset_from_real_beginning(tvb); usm_p.engine_tvb = NULL; usm_p.user_tvb = NULL; usm_p.auth_item = NULL; @@ -1564,7 +1564,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, return length_remaining; break; } - + /* There may be appended data after the SNMP data, so treat as raw * data which needs to be dissected in case of UDP as UDP is PDU oriented. */ @@ -1606,7 +1606,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* then comes a length which spans the rest of the tvb */ offset = get_ber_length(tvb, offset, &tmp_length, &tmp_ind); - /* if(tmp_length!=(guint32)tvb_reported_length_remaining(tvb, offset)){ + /* if(tmp_length!=(guint32)tvb_reported_length_remaining(tvb, offset)){ * Losen the heuristic a bit to handle the case where data has intentionally * been added after the snmp PDU ( UDP case) */ |