diff options
| author | Evan Huus <evan.huus@jadedpixel.com> | 2014-06-19 19:55:27 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-19 19:56:32 +0000 |
| commit | 15a0a6315641cba55363ba6ef4769b27ffc90ccb (patch) | |
| tree | 6966531d85b225e3d3adbeb10474c2aac67fb67e /asn1/gsm_map | |
| parent | 78a5f0c1d89a39d103b99d4d618418cd1b81f496 (diff) | |
batch of manual tvb_length conversions
Change-Id: Ifea45514bdba8be5f62b9dc560027077297f631e
Reviewed-on: https://code.wireshark.org/review/2456
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'asn1/gsm_map')
| -rw-r--r-- | asn1/gsm_map/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | asn1/gsm_map/Makefile.common | 2 | ||||
| -rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/asn1/gsm_map/CMakeLists.txt b/asn1/gsm_map/CMakeLists.txt index 436784b8e9..186e508c6a 100644 --- a/asn1/gsm_map/CMakeLists.txt +++ b/asn1/gsm_map/CMakeLists.txt @@ -61,6 +61,7 @@ set( SS_ASN_FILES set( PROPRIETARY_ASN_FILES Ericsson.asn + Nokia.asn ) set( ASN_FILE_LIST diff --git a/asn1/gsm_map/Makefile.common b/asn1/gsm_map/Makefile.common index a9b29f0b29..770eb4daac 100644 --- a/asn1/gsm_map/Makefile.common +++ b/asn1/gsm_map/Makefile.common @@ -54,7 +54,7 @@ SS_ASN_FILES = \ PROPRIETARY_ASN_FILES = \ Ericsson.asn \ - Nokia.asn + Nokia.asn ASN_FILE_LIST = \ MobileDomainDefinitions.asn \ diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 69e1b5165f..dca213843f 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -322,7 +322,7 @@ unpack_digits(tvbuff_t *tvb, int offset) { int i=0; char *digit_str; - length = tvb_length(tvb); + length = tvb_reported_length(tvb); if (length < offset) return ""; digit_str = (char *)wmem_alloc(wmem_packet_scope(), (length - offset)*2+1); @@ -826,7 +826,7 @@ dissect_gsm_map_msisdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree_add_item(tree, hf_gsm_map_nature_of_number, tvb, 0,1,ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gsm_map_number_plan, tvb, 0,1,ENC_BIG_ENDIAN); - if(tvb_length(tvb)==1) + if(tvb_reported_length(tvb)==1) return; digit_str = unpack_digits(tvb, 1); @@ -2235,7 +2235,7 @@ dissect_gsm_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void tap_queue_packet(gsm_map_tap, pinfo, &tap_rec); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } const value_string ssCode_vals[] = { |