diff options
Diffstat (limited to 'epan/dissectors/asn1/ansi_map')
| -rw-r--r-- | epan/dissectors/asn1/ansi_map/ansi_map.asn | 106 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c | 539 |
2 files changed, 359 insertions, 286 deletions
diff --git a/epan/dissectors/asn1/ansi_map/ansi_map.asn b/epan/dissectors/asn1/ansi_map/ansi_map.asn index bd7c4b6f4e..cfda655b6f 100644 --- a/epan/dissectors/asn1/ansi_map/ansi_map.asn +++ b/epan/dissectors/asn1/ansi_map/ansi_map.asn @@ -1773,9 +1773,6 @@ OriginationRequest ::= [PRIVATE 18] SET { --(Originating MSC) M 6.5.2.82 1 0 0 1 0 1 0 1 (0x95)(0x15) msid MSID OPTIONAL, -- M 6.5.2.bv k - originationTriggers [98] IMPLICIT OriginationTriggers, - --M 6.5.2.90 1 0 0 1 1 1 1 1 (0x9f) - -- 0 1 1 0 0 0 1 0 (0x62) (98) transactionCapability [123] IMPLICIT TransactionCapability, --M 6.5.2.160 1 0 0 1 1 1 1 1 (0x9f) acgencountered [340] IMPLICIT ACGEncountered OPTIONAL, @@ -1793,12 +1790,7 @@ OriginationRequest ::= [PRIVATE 18] SET { callingPartySubaddress [84] IMPLICIT CallingPartySubaddress OPTIONAL, --O 6.5.2.25 a 1 0 0 1 1 1 1 1 (0x9f) -- 0 1 0 1 0 1 0 0 (0x54) - cdmaServiceOption [175] IMPLICIT CDMAServiceOption OPTIONAL, - -- O 6.5.2.f locationAreaID [33] IMPLICIT LocationAreaID OPTIONAL, - -- O 6.5.2.77 a - mobileDirectoryNumber [93] IMPLICIT MobileDirectoryNumber OPTIONAL, - --O 6.5.2.80 b 1 0 0 1 1 1 1 1 (0x9f) -- 0 1 0 1 1 1 0 1 (0x5d) featureIndicator [306] IMPLICIT FeatureIndicator OPTIONAL, -- O 6.5.2.ej m @@ -1811,8 +1803,6 @@ OriginationRequest ::= [PRIVATE 18] SET { pc-ssn [32] IMPLICIT PC-SSN OPTIONAL, --(Originating MSC), O 6.5.2.93 e 1 0 0 1 1 1 1 1 (0x9f) -- 0 0 1 0 0 0 0 0 (0x20) - preferredLanguageIndicator [147] IMPLICIT PreferredLanguageIndicator OPTIONAL, - -- O 6.5.2.96 j senderIdentificationNumber [103] IMPLICIT SenderIdentificationNumber OPTIONAL, --O 6.5.2.116 f 1 0 0 1 1 1 1 1 (0x9f) -- 0 1 1 0 0 1 1 1 (0x67) @@ -1825,11 +1815,101 @@ OriginationRequest ::= [PRIVATE 18] SET { winCapability [280] IMPLICIT WINCapability OPTIONAL, -- O 6.5.2.di a -- NS0027 - callingPartyCategory [355] IMPLICIT CallingPartyCategory OPTIONAL, - -- O 6.5.2.gl meid [390] IMPLICIT MEID OPTIONAL, +-- Profile **Macro** O 6.5.2.97 h + authenticationCapability [78] IMPLICIT AuthenticationCapability OPTIONAL, + -- O 6.5.2.8 a + callingFeaturesIndicator [25] IMPLICIT CallingFeaturesIndicator OPTIONAL, + -- O 6.5.2.20 b + carrierDigits [86] IMPLICIT CarrierDigits OPTIONAL, + -- O 6.5.2.28 c + cdmaServiceOptionList [176] IMPLICIT CDMAServiceOptionList OPTIONAL, + -- O 6.5.2.g d + controlNetworkID [307] IMPLICIT ControlNetworkID OPTIONAL, + -- O 6.5.2.ek u + dmh-AccountCodeDigits [140] IMPLICIT DMH-AccountCodeDigits OPTIONAL, + -- O 6.5.2.59 d + dmh-AlternateBillingDigits [141] IMPLICIT DMH-AlternateBillingDigits OPTIONAL, + -- O 6.5.2.60 d + dmh-BillingDigits [142] IMPLICIT DMH-BillingDigits OPTIONAL, + -- O 6.5.2.61 d + geographicAuthorization [143] IMPLICIT GeographicAuthorization OPTIONAL, + -- O 6.5.2.68 e + meidValidated [401] IMPLICIT MEIDValidated OPTIONAL, + -- O 3.2.2.98 + messageWaitingNotificationCount [92] IMPLICIT MessageWaitingNotificationCount OPTIONAL, + -- O 6.5.2.78 f + messageWaitingNotificationType [145] IMPLICIT MessageWaitingNotificationType OPTIONAL, + -- O 6.5.2.79 g + mobileDirectoryNumber [93] IMPLICIT MobileDirectoryNumber OPTIONAL, + -- O 6.5.2.80 d + mobilePositionCapability [335] IMPLICIT MobilePositionCapability OPTIONAL, + -- O 6.5.2.fm t TIA/EIA/J-STD-036-A + originationIndicator [23] IMPLICIT OriginationIndicator OPTIONAL, + -- O 6.5.2.89 h + originationTriggers [98] IMPLICIT OriginationTriggers OPTIONAL, + -- O 6.5.2.90 i + pACAIndicator [146] IMPLICIT PACAIndicator OPTIONAL, + -- O 6.5.2.91 j + preferredLanguageIndicator [147] IMPLICIT PreferredLanguageIndicator OPTIONAL, + -- O 6.5.2.96 k + qosPriority [348] IMPLICIT QoSPriority OPTIONAL, + --6.5.2.ge z + restrictionDigits [227] IMPLICIT RestrictionDigits OPTIONAL, + -- O 6.5.2.113 l + routingDigits [150] IMPLICIT RoutingDigits OPTIONAL, + -- O 6.5.2.114 m + pSID-RSIDList [203] IMPLICIT PSID-RSIDList OPTIONAL, + -- O 6 .5.2.ag u , w + sms-OriginationRestrictions [115] IMPLICIT SMS-OriginationRestrictions OPTIONAL, + -- O 6.5.2.136 n + sms-TerminationRestrictions [117] IMPLICIT SMS-TerminationRestrictions OPTIONAL, + -- O 6.5.2.138 o + spinipin [154] IMPLICIT SPINIPIN OPTIONAL, + -- O 6.5.2.139 p + spiniTriggers [155] IMPLICIT SPINITriggers OPTIONAL, + -- O 6.5.2.140 q + tdmaDataFeaturesIndicator [221] IMPLICIT TDMADataFeaturesIndicator OPTIONAL, + -- O 6.5.2.az s + terminationRestrictionCode [24] IMPLICIT TerminationRestrictionCode OPTIONAL, + -- O 6.5.2.157 r + terminationTriggers [122] IMPLICIT TerminationTriggers OPTIONAL, + -- O 6.5.2.159 s + triggerAddressList [276] IMPLICIT TriggerAddressList OPTIONAL, + -- O 6.5.2.de t + userGroup [208] IMPLICIT UserGroup OPTIONAL, + -- O 6 .5.2.al p + nonPublicData [200] IMPLICIT NonPublicData OPTIONAL, + -- O 6 .5.2.ad v + userZoneData [209] IMPLICIT UserZoneData OPTIONAL, + -- O 6 .5.2.am v , w + callingPartyCategory [355] IMPLICIT CallingPartyCategory OPTIONAL, + -- O 6.5.2.gl z + lirMode [369] IMPLICIT LIRMode OPTIONAL, + -- O 6.5.2.gz z +-- END MACRO +-- Mobinfo_CDMA **Macro** O 6.5.2.fo g expanded: + cdmaChannelData [63] IMPLICIT CDMAChannelData OPTIONAL, + -- (Serving) O 6.5.2.30 c + cdmaCodeChannel [68] IMPLICIT CDMACodeChannel OPTIONAL, + -- O 6.5.2.31 a + cdmaMobileCapabilities [330] IMPLICIT CDMAMobileCapabilities OPTIONAL, + -- O 6.5.2.xx a + cdmaPrivateLongCodeMask [67] IMPLICIT CDMAPrivateLongCodeMask OPTIONAL, + -- O 6.5.2.36 a + cdmaServingOneWayDelay2 [347] IMPLICIT CDMAServingOneWayDelay2 OPTIONAL, + -- O 6.5.2.gd a + cdmaServiceOption [175] IMPLICIT CDMAServiceOption OPTIONAL, + -- O 6.5.2.f m + cdmaTargetMAHOList [136] IMPLICIT CDMATargetMAHOList OPTIONAL, + -- O 6.5.2.43 g + cdmaPSMMList [346] IMPLICIT CDMAPSMMList OPTIONAL, + -- O 6.5.2.gc a -- O - ... } + mpcAddress [370] IMPLICIT MPCAddress OPTIONAL, + -- O 6.5.2.ha z, ab + ... + } -- OriginationRequest RETURN RESULT Parameters OriginationRequestRes ::= [PRIVATE 18] SET { diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c index 544517f9c5..b71d81b3e8 100644 --- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c +++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c @@ -105,251 +105,253 @@ static gint ansi_map_response_matching_type = ANSI_MAP_TID_AND_SOURCE; static dissector_handle_t ansi_map_handle=NULL; /* Initialize the protocol and registered fields */ -static int ansi_map_tap = -1; -static int proto_ansi_map = -1; - -static int hf_ansi_map_op_code_fam = -1; -static int hf_ansi_map_op_code = -1; - -static int hf_ansi_map_reservedBitH = -1; -static int hf_ansi_map_reservedBitHG = -1; -static int hf_ansi_map_reservedBitHGFE = -1; -static int hf_ansi_map_reservedBitFED = -1; -static int hf_ansi_map_reservedBitD = -1; -static int hf_ansi_map_reservedBitED = -1; - -static int hf_ansi_map_type_of_digits = -1; -static int hf_ansi_map_na = -1; -static int hf_ansi_map_pi = -1; -static int hf_ansi_map_navail = -1; -static int hf_ansi_map_si = -1; -static int hf_ansi_map_digits_enc = -1; -static int hf_ansi_map_np = -1; -static int hf_ansi_map_nr_digits = -1; -static int hf_ansi_map_bcd_digits = -1; -static int hf_ansi_map_ia5_digits = -1; -static int hf_ansi_map_subaddr_type = -1; -static int hf_ansi_map_subaddr_odd_even = -1; -static int hf_ansi_alertcode_cadence = -1; -static int hf_ansi_alertcode_pitch = -1; -static int hf_ansi_alertcode_alertaction = -1; -static int hf_ansi_map_announcementcode_tone = -1; -static int hf_ansi_map_announcementcode_class = -1; -static int hf_ansi_map_announcementcode_std_ann = -1; -static int hf_ansi_map_announcementcode_cust_ann = -1; -static int hf_ansi_map_authorizationperiod_period = -1; -static int hf_ansi_map_value = -1; -static int hf_ansi_map_msc_type = -1; -static int hf_ansi_map_handoffstate_pi = -1; -static int hf_ansi_map_tgn = -1; -static int hf_ansi_map_tmn = -1; -static int hf_ansi_map_messagewaitingnotificationcount_tom = -1; -static int hf_ansi_map_messagewaitingnotificationcount_no_mw = -1; -static int hf_ansi_map_messagewaitingnotificationtype_mwi = -1; -static int hf_ansi_map_messagewaitingnotificationtype_apt = -1; -static int hf_ansi_map_messagewaitingnotificationtype_pt = -1; - -static int hf_ansi_map_trans_cap_prof = -1; -static int hf_ansi_map_trans_cap_busy = -1; -static int hf_ansi_map_trans_cap_ann = -1; -static int hf_ansi_map_trans_cap_rui = -1; -static int hf_ansi_map_trans_cap_spini = -1; -static int hf_ansi_map_trans_cap_uzci = -1; -static int hf_ansi_map_trans_cap_ndss = -1; -static int hf_ansi_map_trans_cap_nami = -1; -static int hf_ansi_trans_cap_multerm = -1; -static int hf_ansi_map_terminationtriggers_busy = -1; -static int hf_ansi_map_terminationtriggers_rf = -1; -static int hf_ansi_map_terminationtriggers_npr = -1; -static int hf_ansi_map_terminationtriggers_na = -1; -static int hf_ansi_map_terminationtriggers_nr = -1; -static int hf_ansi_trans_cap_tl = -1; -static int hf_ansi_map_cdmaserviceoption = -1; -static int hf_ansi_trans_cap_waddr = -1; -static int hf_ansi_map_MarketID = -1; -static int hf_ansi_map_swno = -1; -static int hf_ansi_map_idno = -1; -static int hf_ansi_map_segcount = -1; -static int hf_ansi_map_sms_originationrestrictions_fmc = -1; -static int hf_ansi_map_sms_originationrestrictions_direct = -1; -static int hf_ansi_map_sms_originationrestrictions_default = -1; -static int hf_ansi_map_systemcapabilities_auth = -1; -static int hf_ansi_map_systemcapabilities_se = -1; -static int hf_ansi_map_systemcapabilities_vp = -1; -static int hf_ansi_map_systemcapabilities_cave = -1; -static int hf_ansi_map_systemcapabilities_ssd = -1; -static int hf_ansi_map_systemcapabilities_dp = -1; - -static int hf_ansi_map_mslocation_lat = -1; -static int hf_ansi_map_mslocation_long = -1; -static int hf_ansi_map_mslocation_res = -1; -static int hf_ansi_map_nampscallmode_namps = -1; -static int hf_ansi_map_nampscallmode_amps = -1; -static int hf_ansi_map_nampschanneldata_navca = -1; -static int hf_ansi_map_nampschanneldata_CCIndicator = -1; - -static int hf_ansi_map_callingfeaturesindicator_cfufa = -1; -static int hf_ansi_map_callingfeaturesindicator_cfbfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cfnafa = -1; -static int hf_ansi_map_callingfeaturesindicator_cwfa = -1; -static int hf_ansi_map_callingfeaturesindicator_3wcfa = -1; -static int hf_ansi_map_callingfeaturesindicator_pcwfa =-1; -static int hf_ansi_map_callingfeaturesindicator_dpfa = -1; -static int hf_ansi_map_callingfeaturesindicator_ahfa = -1; -static int hf_ansi_map_callingfeaturesindicator_uscfvmfa = -1; -static int hf_ansi_map_callingfeaturesindicator_uscfmsfa = -1; -static int hf_ansi_map_callingfeaturesindicator_uscfnrfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cpdsfa = -1; -static int hf_ansi_map_callingfeaturesindicator_ccsfa = -1; -static int hf_ansi_map_callingfeaturesindicator_epefa = -1; -static int hf_ansi_map_callingfeaturesindicator_cdfa = -1; -static int hf_ansi_map_callingfeaturesindicator_vpfa = -1; -static int hf_ansi_map_callingfeaturesindicator_ctfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cnip1fa = -1; -static int hf_ansi_map_callingfeaturesindicator_cnip2fa = -1; -static int hf_ansi_map_callingfeaturesindicator_cnirfa = -1; -static int hf_ansi_map_callingfeaturesindicator_cniroverfa = -1; -static int hf_ansi_map_cdmacallmode_cdma = -1; -static int hf_ansi_map_cdmacallmode_amps = -1; -static int hf_ansi_map_cdmacallmode_namps = -1; -static int hf_ansi_map_cdmacallmode_cls1 = -1; -static int hf_ansi_map_cdmacallmode_cls2 = -1; -static int hf_ansi_map_cdmacallmode_cls3 = -1; -static int hf_ansi_map_cdmacallmode_cls4 = -1; -static int hf_ansi_map_cdmacallmode_cls5 = -1; -static int hf_ansi_map_cdmacallmode_cls6 = -1; -static int hf_ansi_map_cdmacallmode_cls7 = -1; -static int hf_ansi_map_cdmacallmode_cls8 = -1; -static int hf_ansi_map_cdmacallmode_cls9 = -1; -static int hf_ansi_map_cdmacallmode_cls10 = -1; -static int hf_ansi_map_cdmachanneldata_Frame_Offset = -1; -static int hf_ansi_map_cdmachanneldata_CDMA_ch_no = -1; -static int hf_ansi_map_cdmachanneldata_band_cls = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b6 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b5 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b4 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b3 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b2 = -1; -static int hf_ansi_map_cdmachanneldata_lc_mask_b1 = -1; -static int hf_ansi_map_cdmachanneldata_np_ext = -1; -static int hf_ansi_map_cdmachanneldata_nominal_pwr = -1; -static int hf_ansi_map_cdmachanneldata_nr_preamble = -1; - -static int hf_ansi_map_cdmastationclassmark_pc = -1; -static int hf_ansi_map_cdmastationclassmark_dtx = -1; -static int hf_ansi_map_cdmastationclassmark_smi = -1; -static int hf_ansi_map_cdmastationclassmark_dmi = -1; -static int hf_ansi_map_channeldata_vmac = -1; -static int hf_ansi_map_channeldata_dtx = -1; -static int hf_ansi_map_channeldata_scc = -1; -static int hf_ansi_map_channeldata_chno = -1; -static int hf_ansi_map_ConfidentialityModes_vp = -1; -static int hf_ansi_map_controlchanneldata_dcc = -1; -static int hf_ansi_map_controlchanneldata_cmac = -1; -static int hf_ansi_map_controlchanneldata_chno = -1; -static int hf_ansi_map_controlchanneldata_sdcc1 = -1; -static int hf_ansi_map_controlchanneldata_sdcc2 = -1; -static int hf_ansi_map_ConfidentialityModes_se = -1; -static int hf_ansi_map_deniedauthorizationperiod_period = -1; -static int hf_ansi_map_ConfidentialityModes_dp = -1; - -static int hf_ansi_map_originationtriggers_all = -1; -static int hf_ansi_map_originationtriggers_local = -1; -static int hf_ansi_map_originationtriggers_ilata = -1; -static int hf_ansi_map_originationtriggers_olata = -1; -static int hf_ansi_map_originationtriggers_int = -1; -static int hf_ansi_map_originationtriggers_wz = -1; -static int hf_ansi_map_originationtriggers_unrec = -1; -static int hf_ansi_map_originationtriggers_rvtc = -1; -static int hf_ansi_map_originationtriggers_star = -1; -static int hf_ansi_map_originationtriggers_ds = -1; -static int hf_ansi_map_originationtriggers_pound = -1; -static int hf_ansi_map_originationtriggers_dp = -1; -static int hf_ansi_map_originationtriggers_pa = -1; -static int hf_ansi_map_originationtriggers_nodig = -1; -static int hf_ansi_map_originationtriggers_onedig = -1; -static int hf_ansi_map_originationtriggers_twodig = -1; -static int hf_ansi_map_originationtriggers_threedig = -1; -static int hf_ansi_map_originationtriggers_fourdig = -1; -static int hf_ansi_map_originationtriggers_fivedig = -1; -static int hf_ansi_map_originationtriggers_sixdig = -1; -static int hf_ansi_map_originationtriggers_sevendig = -1; -static int hf_ansi_map_originationtriggers_eightdig = -1; -static int hf_ansi_map_originationtriggers_ninedig = -1; -static int hf_ansi_map_originationtriggers_tendig = -1; -static int hf_ansi_map_originationtriggers_elevendig = -1; -static int hf_ansi_map_originationtriggers_twelvedig = -1; -static int hf_ansi_map_originationtriggers_thirteendig = -1; -static int hf_ansi_map_originationtriggers_fourteendig = -1; -static int hf_ansi_map_originationtriggers_fifteendig = -1; -static int hf_ansi_map_triggercapability_init = -1; -static int hf_ansi_map_triggercapability_kdigit = -1; -static int hf_ansi_map_triggercapability_all = -1; -static int hf_ansi_map_triggercapability_rvtc = -1; -static int hf_ansi_map_triggercapability_oaa = -1; -static int hf_ansi_map_triggercapability_oans = -1; -static int hf_ansi_map_triggercapability_odisc = -1; -static int hf_ansi_map_triggercapability_ona = -1; -static int hf_ansi_map_triggercapability_ct = -1; -static int hf_ansi_map_triggercapability_unrec =-1; -static int hf_ansi_map_triggercapability_pa = -1; -static int hf_ansi_map_triggercapability_at = -1; -static int hf_ansi_map_triggercapability_cgraa = -1; -static int hf_ansi_map_triggercapability_it = -1; -static int hf_ansi_map_triggercapability_cdraa = -1; -static int hf_ansi_map_triggercapability_obsy = -1; -static int hf_ansi_map_triggercapability_tra = -1; -static int hf_ansi_map_triggercapability_tbusy = -1; -static int hf_ansi_map_triggercapability_tna = -1; -static int hf_ansi_map_triggercapability_tans = -1; -static int hf_ansi_map_triggercapability_tdisc = -1; -static int hf_ansi_map_winoperationscapability_conn = -1; -static int hf_ansi_map_winoperationscapability_ccdir = -1; -static int hf_ansi_map_winoperationscapability_pos = -1; -static int hf_ansi_map_PACA_Level = -1; -static int hf_ansi_map_pacaindicator_pa = -1; - -static int hf_ansi_map_point_code = -1; -static int hf_ansi_map_SSN = -1; -static int hf_ansi_map_win_trigger_list = -1; +static int ansi_map_tap; +static int proto_ansi_map; + +#if 0 +static int hf_ansi_map_op_code_fam; +static int hf_ansi_map_op_code; +#endif + +static int hf_ansi_map_reservedBitH; +static int hf_ansi_map_reservedBitHG; +static int hf_ansi_map_reservedBitHGFE; +static int hf_ansi_map_reservedBitFED; +static int hf_ansi_map_reservedBitD; +static int hf_ansi_map_reservedBitED; + +static int hf_ansi_map_type_of_digits; +static int hf_ansi_map_na; +static int hf_ansi_map_pi; +static int hf_ansi_map_navail; +static int hf_ansi_map_si; +static int hf_ansi_map_digits_enc; +static int hf_ansi_map_np; +static int hf_ansi_map_nr_digits; +static int hf_ansi_map_bcd_digits; +static int hf_ansi_map_ia5_digits; +static int hf_ansi_map_subaddr_type; +static int hf_ansi_map_subaddr_odd_even; +static int hf_ansi_alertcode_cadence; +static int hf_ansi_alertcode_pitch; +static int hf_ansi_alertcode_alertaction; +static int hf_ansi_map_announcementcode_tone; +static int hf_ansi_map_announcementcode_class; +static int hf_ansi_map_announcementcode_std_ann; +static int hf_ansi_map_announcementcode_cust_ann; +static int hf_ansi_map_authorizationperiod_period; +static int hf_ansi_map_value; +static int hf_ansi_map_msc_type; +static int hf_ansi_map_handoffstate_pi; +static int hf_ansi_map_tgn; +static int hf_ansi_map_tmn; +static int hf_ansi_map_messagewaitingnotificationcount_tom; +static int hf_ansi_map_messagewaitingnotificationcount_no_mw; +static int hf_ansi_map_messagewaitingnotificationtype_mwi; +static int hf_ansi_map_messagewaitingnotificationtype_apt; +static int hf_ansi_map_messagewaitingnotificationtype_pt; + +static int hf_ansi_map_trans_cap_prof; +static int hf_ansi_map_trans_cap_busy; +static int hf_ansi_map_trans_cap_ann; +static int hf_ansi_map_trans_cap_rui; +static int hf_ansi_map_trans_cap_spini; +static int hf_ansi_map_trans_cap_uzci; +static int hf_ansi_map_trans_cap_ndss; +static int hf_ansi_map_trans_cap_nami; +static int hf_ansi_trans_cap_multerm; +static int hf_ansi_map_terminationtriggers_busy; +static int hf_ansi_map_terminationtriggers_rf; +static int hf_ansi_map_terminationtriggers_npr; +static int hf_ansi_map_terminationtriggers_na; +static int hf_ansi_map_terminationtriggers_nr; +static int hf_ansi_trans_cap_tl; +static int hf_ansi_map_cdmaserviceoption; +static int hf_ansi_trans_cap_waddr; +static int hf_ansi_map_MarketID; +static int hf_ansi_map_swno; +static int hf_ansi_map_idno; +static int hf_ansi_map_segcount; +static int hf_ansi_map_sms_originationrestrictions_fmc; +static int hf_ansi_map_sms_originationrestrictions_direct; +static int hf_ansi_map_sms_originationrestrictions_default; +static int hf_ansi_map_systemcapabilities_auth; +static int hf_ansi_map_systemcapabilities_se; +static int hf_ansi_map_systemcapabilities_vp; +static int hf_ansi_map_systemcapabilities_cave; +static int hf_ansi_map_systemcapabilities_ssd; +static int hf_ansi_map_systemcapabilities_dp; + +static int hf_ansi_map_mslocation_lat; +static int hf_ansi_map_mslocation_long; +static int hf_ansi_map_mslocation_res; +static int hf_ansi_map_nampscallmode_namps; +static int hf_ansi_map_nampscallmode_amps; +static int hf_ansi_map_nampschanneldata_navca; +static int hf_ansi_map_nampschanneldata_CCIndicator; + +static int hf_ansi_map_callingfeaturesindicator_cfufa; +static int hf_ansi_map_callingfeaturesindicator_cfbfa; +static int hf_ansi_map_callingfeaturesindicator_cfnafa; +static int hf_ansi_map_callingfeaturesindicator_cwfa; +static int hf_ansi_map_callingfeaturesindicator_3wcfa; +static int hf_ansi_map_callingfeaturesindicator_pcwfa; +static int hf_ansi_map_callingfeaturesindicator_dpfa; +static int hf_ansi_map_callingfeaturesindicator_ahfa; +static int hf_ansi_map_callingfeaturesindicator_uscfvmfa; +static int hf_ansi_map_callingfeaturesindicator_uscfmsfa; +static int hf_ansi_map_callingfeaturesindicator_uscfnrfa; +static int hf_ansi_map_callingfeaturesindicator_cpdsfa; +static int hf_ansi_map_callingfeaturesindicator_ccsfa; +static int hf_ansi_map_callingfeaturesindicator_epefa; +static int hf_ansi_map_callingfeaturesindicator_cdfa; +static int hf_ansi_map_callingfeaturesindicator_vpfa; +static int hf_ansi_map_callingfeaturesindicator_ctfa; +static int hf_ansi_map_callingfeaturesindicator_cnip1fa; +static int hf_ansi_map_callingfeaturesindicator_cnip2fa; +static int hf_ansi_map_callingfeaturesindicator_cnirfa; +static int hf_ansi_map_callingfeaturesindicator_cniroverfa; +static int hf_ansi_map_cdmacallmode_cdma; +static int hf_ansi_map_cdmacallmode_amps; +static int hf_ansi_map_cdmacallmode_namps; +static int hf_ansi_map_cdmacallmode_cls1; +static int hf_ansi_map_cdmacallmode_cls2; +static int hf_ansi_map_cdmacallmode_cls3; +static int hf_ansi_map_cdmacallmode_cls4; +static int hf_ansi_map_cdmacallmode_cls5; +static int hf_ansi_map_cdmacallmode_cls6; +static int hf_ansi_map_cdmacallmode_cls7; +static int hf_ansi_map_cdmacallmode_cls8; +static int hf_ansi_map_cdmacallmode_cls9; +static int hf_ansi_map_cdmacallmode_cls10; +static int hf_ansi_map_cdmachanneldata_Frame_Offset; +static int hf_ansi_map_cdmachanneldata_CDMA_ch_no; +static int hf_ansi_map_cdmachanneldata_band_cls; +static int hf_ansi_map_cdmachanneldata_lc_mask_b6; +static int hf_ansi_map_cdmachanneldata_lc_mask_b5; +static int hf_ansi_map_cdmachanneldata_lc_mask_b4; +static int hf_ansi_map_cdmachanneldata_lc_mask_b3; +static int hf_ansi_map_cdmachanneldata_lc_mask_b2; +static int hf_ansi_map_cdmachanneldata_lc_mask_b1; +static int hf_ansi_map_cdmachanneldata_np_ext; +static int hf_ansi_map_cdmachanneldata_nominal_pwr; +static int hf_ansi_map_cdmachanneldata_nr_preamble; + +static int hf_ansi_map_cdmastationclassmark_pc; +static int hf_ansi_map_cdmastationclassmark_dtx; +static int hf_ansi_map_cdmastationclassmark_smi; +static int hf_ansi_map_cdmastationclassmark_dmi; +static int hf_ansi_map_channeldata_vmac; +static int hf_ansi_map_channeldata_dtx; +static int hf_ansi_map_channeldata_scc; +static int hf_ansi_map_channeldata_chno; +static int hf_ansi_map_ConfidentialityModes_vp; +static int hf_ansi_map_controlchanneldata_dcc; +static int hf_ansi_map_controlchanneldata_cmac; +static int hf_ansi_map_controlchanneldata_chno; +static int hf_ansi_map_controlchanneldata_sdcc1; +static int hf_ansi_map_controlchanneldata_sdcc2; +static int hf_ansi_map_ConfidentialityModes_se; +static int hf_ansi_map_deniedauthorizationperiod_period; +static int hf_ansi_map_ConfidentialityModes_dp; + +static int hf_ansi_map_originationtriggers_all; +static int hf_ansi_map_originationtriggers_local; +static int hf_ansi_map_originationtriggers_ilata; +static int hf_ansi_map_originationtriggers_olata; +static int hf_ansi_map_originationtriggers_int; +static int hf_ansi_map_originationtriggers_wz; +static int hf_ansi_map_originationtriggers_unrec; +static int hf_ansi_map_originationtriggers_rvtc; +static int hf_ansi_map_originationtriggers_star; +static int hf_ansi_map_originationtriggers_ds; +static int hf_ansi_map_originationtriggers_pound; +static int hf_ansi_map_originationtriggers_dp; +static int hf_ansi_map_originationtriggers_pa; +static int hf_ansi_map_originationtriggers_nodig; +static int hf_ansi_map_originationtriggers_onedig; +static int hf_ansi_map_originationtriggers_twodig; +static int hf_ansi_map_originationtriggers_threedig; +static int hf_ansi_map_originationtriggers_fourdig; +static int hf_ansi_map_originationtriggers_fivedig; +static int hf_ansi_map_originationtriggers_sixdig; +static int hf_ansi_map_originationtriggers_sevendig; +static int hf_ansi_map_originationtriggers_eightdig; +static int hf_ansi_map_originationtriggers_ninedig; +static int hf_ansi_map_originationtriggers_tendig; +static int hf_ansi_map_originationtriggers_elevendig; +static int hf_ansi_map_originationtriggers_twelvedig; +static int hf_ansi_map_originationtriggers_thirteendig; +static int hf_ansi_map_originationtriggers_fourteendig; +static int hf_ansi_map_originationtriggers_fifteendig; +static int hf_ansi_map_triggercapability_init; +static int hf_ansi_map_triggercapability_kdigit; +static int hf_ansi_map_triggercapability_all; +static int hf_ansi_map_triggercapability_rvtc; +static int hf_ansi_map_triggercapability_oaa; +static int hf_ansi_map_triggercapability_oans; +static int hf_ansi_map_triggercapability_odisc; +static int hf_ansi_map_triggercapability_ona; +static int hf_ansi_map_triggercapability_ct; +static int hf_ansi_map_triggercapability_unrec; +static int hf_ansi_map_triggercapability_pa; +static int hf_ansi_map_triggercapability_at; +static int hf_ansi_map_triggercapability_cgraa; +static int hf_ansi_map_triggercapability_it; +static int hf_ansi_map_triggercapability_cdraa; +static int hf_ansi_map_triggercapability_obsy; +static int hf_ansi_map_triggercapability_tra; +static int hf_ansi_map_triggercapability_tbusy; +static int hf_ansi_map_triggercapability_tna; +static int hf_ansi_map_triggercapability_tans; +static int hf_ansi_map_triggercapability_tdisc; +static int hf_ansi_map_winoperationscapability_conn; +static int hf_ansi_map_winoperationscapability_ccdir; +static int hf_ansi_map_winoperationscapability_pos; +static int hf_ansi_map_PACA_Level; +static int hf_ansi_map_pacaindicator_pa; + +static int hf_ansi_map_point_code; +static int hf_ansi_map_SSN; +static int hf_ansi_map_win_trigger_list; #include "packet-ansi_map-hf.c" /* Initialize the subtree pointers */ -static gint ett_ansi_map = -1; -static gint ett_mintype = -1; -static gint ett_digitstype = -1; -static gint ett_billingid = -1; -static gint ett_sms_bearer_data = -1; -static gint ett_sms_teleserviceIdentifier = -1; -static gint ett_extendedmscid = -1; -static gint ett_extendedsystemmytypecode = -1; -static gint ett_handoffstate = -1; -static gint ett_mscid = -1; -static gint ett_cdmachanneldata = -1; -static gint ett_cdmastationclassmark = -1; -static gint ett_channeldata = -1; -static gint ett_confidentialitymodes = -1; -static gint ett_controlchanneldata = -1; -static gint ett_CDMA2000HandoffInvokeIOSData = -1; -static gint ett_CDMA2000HandoffResponseIOSData = -1; -static gint ett_originationtriggers = -1; -static gint ett_pacaindicator = -1; -static gint ett_callingpartyname = -1; -static gint ett_triggercapability = -1; -static gint ett_winoperationscapability = -1; -static gint ett_win_trigger_list = -1; -static gint ett_controlnetworkid = -1; -static gint ett_transactioncapability = -1; -static gint ett_cdmaserviceoption = -1; -static gint ett_systemcapabilities = -1; -static gint ett_sms_originationrestrictions = -1; +static gint ett_ansi_map; +static gint ett_mintype; +static gint ett_digitstype; +static gint ett_billingid; +static gint ett_sms_bearer_data; +static gint ett_sms_teleserviceIdentifier; +static gint ett_extendedmscid; +static gint ett_extendedsystemmytypecode; +static gint ett_handoffstate; +static gint ett_mscid; +static gint ett_cdmachanneldata; +static gint ett_cdmastationclassmark; +static gint ett_channeldata; +static gint ett_confidentialitymodes; +static gint ett_controlchanneldata; +static gint ett_CDMA2000HandoffInvokeIOSData; +static gint ett_CDMA2000HandoffResponseIOSData; +static gint ett_originationtriggers; +static gint ett_pacaindicator; +static gint ett_callingpartyname; +static gint ett_triggercapability; +static gint ett_winoperationscapability; +static gint ett_win_trigger_list; +static gint ett_controlnetworkid; +static gint ett_transactioncapability; +static gint ett_cdmaserviceoption; +static gint ett_systemcapabilities; +static gint ett_sms_originationrestrictions; #include "packet-ansi_map-ett.c" -static expert_field ei_ansi_map_nr_not_used = EI_INIT; -static expert_field ei_ansi_map_unknown_invokeData_blob = EI_INIT; -static expert_field ei_ansi_map_no_data = EI_INIT; +static expert_field ei_ansi_map_nr_not_used; +static expert_field ei_ansi_map_unknown_invokeData_blob; +static expert_field ei_ansi_map_no_data; /* Global variables */ static dissector_table_t is637_tele_id_dissector_table; /* IS-637 Teleservice ID */ @@ -375,7 +377,7 @@ static void dissect_ansi_map_win_trigger_list(tvbuff_t *tvb, packet_info *pinfo /* Transaction table */ -static wmem_map_t *TransactionId_table=NULL; +static wmem_multimap_t *TransactionId_table=NULL; /* Store Invoke information needed for the corresponding reply */ static void @@ -393,7 +395,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat /* Data from the TCAP dissector */ if ((!pinfo->fd->visited)&&(p_private_tcap->TransactionID_str)){ /* Only do this once XXX I hope it's the right thing to do */ - /* The hash string needs to contain src and dest to distiguish differnt flows */ + /* The hash string needs to contain src and dest to distinguish different flows */ switch(ansi_map_response_matching_type){ case ANSI_MAP_TID_ONLY: buf = wmem_strdup(pinfo->pool, p_private_tcap->TransactionID_str); @@ -406,17 +408,14 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat buf = wmem_strdup_printf(pinfo->pool, "%s%s%s",p_private_tcap->TransactionID_str,src_str,dst_str); break; } - /* If the entry allready exists don't owervrite it */ - ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)wmem_map_lookup(TransactionId_table,buf); - if(ansi_map_saved_invokedata) - return; ansi_map_saved_invokedata = wmem_new(wmem_file_scope(), struct ansi_map_invokedata_t); ansi_map_saved_invokedata->opcode = p_private_tcap->d.OperationCode_private; ansi_map_saved_invokedata->ServiceIndicator = ServiceIndicator; - wmem_map_insert(TransactionId_table, + wmem_multimap_insert32(TransactionId_table, wmem_strdup(wmem_file_scope(), buf), + pinfo->num, ansi_map_saved_invokedata); /*ws_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/ @@ -542,7 +541,7 @@ static value_string_ext ansi_map_opr_code_strings_ext = VALUE_STRING_EXT_INIT(an static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx); static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx); -static int dissect_ansi_map_SystemMyTypeCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); +static int dissect_ansi_map_SystemMyTypeCode(bool implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); /* Type of Digits (octet 1, bits A-H) */ static const value_string ansi_map_type_of_digits_vals[] = { @@ -617,7 +616,7 @@ dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre subtree = proto_item_add_subtree(actx->created_item, ett_mintype); - proto_tree_add_item_ret_display_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_BCD_DIGITS_0_9, pinfo->pool, &digit_str); + proto_tree_add_item_ret_display_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_BCD_DIGITS_0_9|ENC_LITTLE_ENDIAN, pinfo->pool, &digit_str); proto_item_append_text(actx->created_item, " - %s", digit_str); } @@ -661,7 +660,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if(octet_len == 0) return; offset++; - proto_tree_add_item_ret_display_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, ENC_KEYPAD_BC_TBCD, pinfo->pool, &digit_str); + proto_tree_add_item_ret_display_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, ENC_KEYPAD_BC_TBCD|ENC_LITTLE_ENDIAN, pinfo->pool, &digit_str); proto_item_append_text(actx->created_item, " - %s", digit_str); break; case 2: @@ -702,7 +701,7 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree switch ((octet&0xf)){ case 1: /* BCD Coding */ - proto_tree_add_item_ret_display_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, ENC_KEYPAD_BC_TBCD, pinfo->pool, &digit_str); + proto_tree_add_item_ret_display_string(subtree, hf_ansi_map_bcd_digits, tvb, offset, -1, ENC_KEYPAD_BC_TBCD|ENC_LITTLE_ENDIAN, pinfo->pool, &digit_str); proto_item_append_text(actx->created_item, " - %s", digit_str); break; case 2: @@ -754,12 +753,6 @@ dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } /* 6.5.3.13. Subaddress */ -#if 0 -static const true_false_string ansi_map_Odd_Even_Ind_bool_val = { - "Odd", - "Even" -}; -#endif /* Type of Subaddress (octet 1, bits E-G) */ static const value_string ansi_map_sub_addr_type_vals[] = { { 0, "NSAP (CCITT Rec. X.213 or ISO 8348 AD2)"}, @@ -902,7 +895,7 @@ static const value_string ansi_map_AlertResult_result_vals[] = { { 0, NULL } }; -/* 6.5.2.5 AnnouncementCode Updatef from NS0018Re*/ +/* 6.5.2.5 AnnouncementCode Updated from NS0018Re*/ /* Tone (octet 1) */ static const value_string ansi_map_AnnouncementCode_tone_vals[] = { { 0, "DialTone"}, @@ -1476,10 +1469,6 @@ dissect_ansi_map_channeldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * /* Updated with N.S0008-0 v 1.0*/ /* Voice Privacy (VP) Confidentiality Status (octet 1, bit A) */ -static const true_false_string ansi_map_ConfidentialityModes_bool_val = { - "On", - "Off" -}; static void dissect_ansi_map_confidentialitymodes(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){ int offset = 0; @@ -3957,7 +3946,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ case 93: /*Geo Position Directive*/ break; case 94: /*Geo Position Request*/ - offset = dissect_ansi_map_GeoPositionRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequest); + offset = dissect_ansi_map_GeoPositionRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_geoPositionRequest); break; case 95: /*Inter System Position Request*/ offset = dissect_ansi_map_InterSystemPositionRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequest); @@ -4243,7 +4232,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset = dissect_ansi_map_InterSystemPositionRequestRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequestRes); break; case 96: /*Inter System Position Request Forward*/ - offset = dissect_ansi_map_InterSystemPositionRequestForwardRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequestRes); + offset = dissect_ansi_map_InterSystemPositionRequestForwardRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_interSystemPositionRequestForwardRes); break; case 98: /*Roamer Database Verification Request*/ offset = dissect_ansi_map_RoamerDatabaseVerificationRequestRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_roamerDatabaseVerificationRequestRes); @@ -4310,25 +4299,25 @@ find_saved_invokedata(asn1_ctx_t *actx, struct ansi_tcap_private_t *p_private_tc buf=(char *)wmem_alloc(actx->pinfo->pool, 1024); /* Data from the TCAP dissector */ - /* The hash string needs to contain src and dest to distiguish differnt flows */ + /* The hash string needs to contain src and dest to distinguish different flows */ src_str = address_to_str(actx->pinfo->pool, src); dst_str = address_to_str(actx->pinfo->pool, dst); /* Reverse order to invoke */ switch(ansi_map_response_matching_type){ case ANSI_MAP_TID_ONLY: - g_snprintf(buf,1024,"%s",p_private_tcap->TransactionID_str); + snprintf(buf,1024,"%s",p_private_tcap->TransactionID_str); break; case ANSI_MAP_TID_AND_SOURCE: - g_snprintf(buf,1024,"%s%s",p_private_tcap->TransactionID_str,dst_str); + snprintf(buf,1024,"%s%s",p_private_tcap->TransactionID_str,dst_str); break; case ANSI_MAP_TID_SOURCE_AND_DEST: default: - g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,dst_str,src_str); + snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,dst_str,src_str); break; } /*ws_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/ - ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)wmem_map_lookup(TransactionId_table, buf); + ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)wmem_multimap_lookup32_le(TransactionId_table, buf, actx->pinfo->num); if(ansi_map_saved_invokedata){ OperationCode = ansi_map_saved_invokedata->opcode & 0xff; ServiceIndicator = ansi_map_saved_invokedata->ServiceIndicator; @@ -4475,7 +4464,7 @@ static void ansi_map_stat_init(stat_tap_table_ui* new_stat) static tap_packet_status -ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) +ansi_map_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data, tap_flags_t flags _U_) { stat_data_t* stat_data = (stat_data_t*)tapdata; const ansi_map_tap_rec_t *data_p = (const ansi_map_tap_rec_t *)data; @@ -4558,10 +4547,12 @@ void proto_register_ansi_map(void) { /* List of fields */ static hf_register_info hf[] = { +#if 0 { &hf_ansi_map_op_code_fam, { "Operation Code Family", "ansi_map.op_code_fam", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +#endif { &hf_ansi_map_reservedBitH, { "Reserved", "ansi_map.reserved_bitH", FT_BOOLEAN, 8, NULL,0x80, @@ -4586,10 +4577,12 @@ void proto_register_ansi_map(void) { { "Reserved", "ansi_map.reserved_bitED", FT_UINT8, BASE_DEC, NULL, 0x18, NULL, HFILL }}, +#if 0 { &hf_ansi_map_op_code, { "Operation Code", "ansi_map.op_code", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ansi_map_opr_code_strings_ext, 0x0, NULL, HFILL }}, +#endif { &hf_ansi_map_type_of_digits, { "Type of Digits", "ansi_map.type_of_digits", FT_UINT8, BASE_DEC, VALS(ansi_map_type_of_digits_vals), 0x0, @@ -5052,7 +5045,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_nominal_pwr, { "Nominal Power", "ansi_map.cdmachanneldata.nominal_pwr", - FT_UINT8, BASE_DEC, NULL, 0x71, + FT_UINT8, BASE_DEC, NULL, 0x78, NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_nr_preamble, { "Number Preamble", "ansi_map.cdmachanneldata.nr_preamble", @@ -5094,7 +5087,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, { &hf_ansi_map_ConfidentialityModes_vp, { "Voice Privacy (VP) Confidentiality Status", "ansi_map.confidentialitymodes.vp", - FT_BOOLEAN, 8, TFS(&ansi_map_ConfidentialityModes_bool_val),0x01, + FT_BOOLEAN, 8, TFS(&tfs_on_off),0x01, NULL, HFILL }}, { &hf_ansi_map_controlchanneldata_dcc, { "Digital Color Code (DCC)", "ansi_map.controlchanneldata.dcc", @@ -5118,11 +5111,11 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, { &hf_ansi_map_ConfidentialityModes_se, { "Signaling Message Encryption (SE) Confidentiality Status", "ansi_map.confidentialitymodes.se", - FT_BOOLEAN, 8, TFS(&ansi_map_ConfidentialityModes_bool_val),0x02, + FT_BOOLEAN, 8, TFS(&tfs_on_off),0x02, NULL, HFILL }}, { &hf_ansi_map_ConfidentialityModes_dp, { "DataPrivacy (DP) Confidentiality Status", "ansi_map.confidentialitymodes.dp", - FT_BOOLEAN, 8, TFS(&ansi_map_ConfidentialityModes_bool_val),0x04, + FT_BOOLEAN, 8, TFS(&tfs_on_off),0x04, NULL, HFILL }}, { &hf_ansi_map_deniedauthorizationperiod_period, @@ -5474,7 +5467,7 @@ void proto_register_ansi_map(void) { "Type of matching invoke/response, risk of mismatch if loose matching chosen", &ansi_map_response_matching_type, ansi_map_response_matching_type_values, FALSE); - TransactionId_table = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), wmem_str_hash, g_str_equal); + TransactionId_table = wmem_multimap_new_autoreset(wmem_epan_scope(), wmem_file_scope(), wmem_str_hash, g_str_equal); register_stat_tap_table_ui(&stat_table); } |