gsm_map: use ws_strtoi in template.

Change-Id: I682955b3c58695d831d6d8013eaa77d347a0ec2e
Reviewed-on: https://code.wireshark.org/review/17820
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2016-09-20 17:28:01 +02:00 committed by Anders Broman
parent f87d1ab699
commit 479323072c
2 changed files with 12 additions and 10 deletions

View File

@ -53,6 +53,7 @@
#include <epan/oids.h>
#include <epan/expert.h>
#include <epan/proto_data.h>
#include <wsutil/strtoi.h>
#include <epan/asn1.h>
#include "packet-ber.h"
@ -2100,7 +2101,7 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
if (p_private_tcap->acv==TRUE ){
version_ptr = strrchr((const char*)p_private_tcap->oid,'.');
if (version_ptr){
application_context_version = atoi(version_ptr+1);
ws_strtoi32(version_ptr + 1, NULL, &application_context_version);
}
}
}

View File

@ -61,6 +61,7 @@
#include <epan/oids.h>
#include <epan/expert.h>
#include <epan/proto_data.h>
#include <wsutil/strtoi.h>
#include <epan/asn1.h>
#include "packet-ber.h"
@ -1942,7 +1943,7 @@ static int hf_NokiaMAP_Extensions_AccessSubscriptionListExt_item = -1; /* Acces
static int hf_NokiaMAP_Extensions_AllowedServiceData_amr_wb_allowed = -1;
/*--- End of included file: packet-gsm_map-hf.c ---*/
#line 153 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 154 "./asn1/gsm_map/packet-gsm_map-template.c"
/* Initialize the subtree pointers */
static gint ett_gsm_map = -1;
@ -2666,7 +2667,7 @@ static gint ett_NokiaMAP_Extensions_AccessSubscriptionListExt = -1;
static gint ett_NokiaMAP_Extensions_AllowedServiceData = -1;
/*--- End of included file: packet-gsm_map-ett.c ---*/
#line 185 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 186 "./asn1/gsm_map/packet-gsm_map-template.c"
static expert_field ei_gsm_map_unknown_sequence3 = EI_INIT;
static expert_field ei_gsm_map_unknown_sequence = EI_INIT;
@ -20744,7 +20745,7 @@ dissect_NokiaMAP_Extensions_AllowedServiceData(gboolean implicit_tag _U_, tvbuff
/*--- End of included file: packet-gsm_map-fn.c ---*/
#line 831 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 832 "./asn1/gsm_map/packet-gsm_map-template.c"
/* Specific translation for MAP V3 */
const value_string gsm_map_V1V2_opr_code_strings[] = {
@ -20966,7 +20967,7 @@ const value_string gsm_map_opr_code_strings[] = {
/* Unknown or empty loop list OPERATION */
/*--- End of included file: packet-gsm_map-table.c ---*/
#line 842 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 843 "./asn1/gsm_map/packet-gsm_map-template.c"
{ 0, NULL }
};
@ -21183,7 +21184,7 @@ static const value_string gsm_map_err_code_string_vals[] = {
/* Unknown or empty loop list OPERATION */
/*--- End of included file: packet-gsm_map-table.c ---*/
#line 848 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 849 "./asn1/gsm_map/packet-gsm_map-template.c"
{ 0, NULL }
};
#endif
@ -22439,7 +22440,7 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
if (p_private_tcap->acv==TRUE ){
version_ptr = strrchr((const char*)p_private_tcap->oid,'.');
if (version_ptr){
application_context_version = atoi(version_ptr+1);
ws_strtoi32(version_ptr + 1, NULL, &application_context_version);
}
}
}
@ -30351,7 +30352,7 @@ void proto_register_gsm_map(void) {
NULL, HFILL }},
/*--- End of included file: packet-gsm_map-hfarr.c ---*/
#line 3054 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 3055 "./asn1/gsm_map/packet-gsm_map-template.c"
};
/* List of subtrees */
@ -31077,7 +31078,7 @@ void proto_register_gsm_map(void) {
&ett_NokiaMAP_Extensions_AllowedServiceData,
/*--- End of included file: packet-gsm_map-ettarr.c ---*/
#line 3088 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 3089 "./asn1/gsm_map/packet-gsm_map-template.c"
};
static ei_register_info ei[] = {
@ -31221,7 +31222,7 @@ void proto_register_gsm_map(void) {
/*--- End of included file: packet-gsm_map-dis-tab.c ---*/
#line 3148 "./asn1/gsm_map/packet-gsm_map-template.c"
#line 3149 "./asn1/gsm_map/packet-gsm_map-template.c"
oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
/*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );