diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ansi_map/ansi_map.cnf | 8 | ||||
-rw-r--r-- | asn1/ansi_map/packet-ansi_map-template.c | 386 | ||||
-rw-r--r-- | asn1/camel/packet-camel-template.c | 26 | ||||
-rw-r--r-- | asn1/ftam/packet-ftam-template.c | 4 | ||||
-rw-r--r-- | asn1/gsmmap/packet-gsmmap-template.c | 86 | ||||
-rw-r--r-- | asn1/h225/packet-h225-template.c | 8 | ||||
-rw-r--r-- | asn1/h450/packet-h450-template.c | 4 | ||||
-rw-r--r-- | asn1/ocsp/packet-ocsp-template.c | 2 | ||||
-rw-r--r-- | asn1/qsig/packet-qsig-template.c | 2 |
9 files changed, 263 insertions, 263 deletions
diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf index af004bf275..90114a32f5 100644 --- a/asn1/ansi_map/ansi_map.cnf +++ b/asn1/ansi_map/ansi_map.cnf @@ -466,10 +466,10 @@ MobileDirectoryNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL Digits TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL MSCIdentificationNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL NewlyAssignedMIN TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL -RedirectingNumberDigits = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -RedirectingNumberString = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -CallingPartyNumberDigits1 = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL -CallingPartyNumberDigits2 = FT_NONE DISPLAY = BASE_DEC STRINGS = NULL +RedirectingNumberDigits = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +RedirectingNumberString = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +CallingPartyNumberDigits1 = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL +CallingPartyNumberDigits2 = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL TemporaryReferenceNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL ActionCode TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(ansi_map_ActionCode_vals) diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index f1c3adf5ae..001e51d0b2 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -4449,284 +4449,284 @@ void proto_register_ansi_map(void) { { &hf_ansi_map_op_code_fam, { "Operation Code Family", "ansi_map.op_code_fam", FT_UINT8, BASE_DEC, NULL, 0, - "Operation Code Family", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_reservedBitH, { "Reserved", "ansi_map.reserved_bitH", FT_BOOLEAN, 8, NULL,0x80, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_reservedBitD, { "Reserved", "ansi_map.reserved_bitD", FT_BOOLEAN, 8, NULL,0x08, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_reservedBitHG, { "Reserved", "ansi_map.reserved_bitHG", FT_UINT8, BASE_DEC, NULL, 0xc0, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_reservedBitHGFE, { "Reserved", "ansi_map.reserved_bitHGFE", FT_UINT8, BASE_DEC, NULL, 0xf0, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_reservedBitFED, { "Reserved", "ansi_map.reserved_bitFED", FT_UINT8, BASE_DEC, NULL, 0x38, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_reservedBitED, { "Reserved", "ansi_map.reserved_bitED", FT_UINT8, BASE_DEC, NULL, 0x18, - "Reserved", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_op_code, { "Operation Code", "ansi_map.op_code", FT_UINT8, BASE_DEC, VALS(ansi_map_opr_code_strings), 0x0, - "Operation Code", HFILL }}, + NULL, HFILL }}, { &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, - "Type of Digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_na, { "Nature of Number", "ansi_map.na", FT_BOOLEAN, 8, TFS(&ansi_map_na_bool_val),0x01, - "Nature of Number", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_pi, { "Presentation Indication", "ansi_map.type_of_pi", FT_BOOLEAN, 8, TFS(&ansi_map_pi_bool_val),0x02, - "Presentation Indication", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_navail, { "Number available indication", "ansi_map.navail", FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x04, - "Number available indication", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_si, { "Screening indication", "ansi_map.si", FT_UINT8, BASE_DEC, VALS(ansi_map_si_vals), 0x30, - "Screening indication", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_digits_enc, { "Encoding", "ansi_map.enc", FT_UINT8, BASE_DEC, VALS(ansi_map_digits_enc_vals), 0x0f, - "Encoding", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_np, { "Numbering Plan", "ansi_map.np", FT_UINT8, BASE_DEC, VALS(ansi_map_np_vals), 0xf0, - "Numbering Plan", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_nr_digits, { "Number of Digits", "ansi_map.nr_digits", FT_UINT8, BASE_DEC, NULL, 0x0, - "Number of Digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_bcd_digits, { "BCD digits", "ansi_map.bcd_digits", FT_STRING, BASE_NONE, NULL, 0, - "BCD digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_ia5_digits, { "IA5 digits", "ansi_map.ia5_digits", FT_STRING, BASE_NONE, NULL, 0, - "IA5 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_subaddr_type, { "Type of Subaddress", "ansi_map.subaddr_type", FT_UINT8, BASE_DEC, VALS(ansi_map_sub_addr_type_vals), 0x70, - "Type of Subaddress", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_subaddr_odd_even, { "Odd/Even Indicator", "ansi_map.subaddr_odd_even", FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x08, - "Odd/Even Indicator", HFILL }}, + NULL, HFILL }}, { &hf_ansi_alertcode_cadence, { "Cadence", "ansi_map.alertcode.cadence", FT_UINT8, BASE_DEC, VALS(ansi_map_AlertCode_Cadence_vals), 0x3f, - "Cadence", HFILL }}, + NULL, HFILL }}, { &hf_ansi_alertcode_pitch, { "Pitch", "ansi_map.alertcode.pitch", FT_UINT8, BASE_DEC, VALS(ansi_map_AlertCode_Pitch_vals), 0xc0, - "Pitch", HFILL }}, + NULL, HFILL }}, { &hf_ansi_alertcode_alertaction, { "Alert Action", "ansi_map.alertcode.alertaction", FT_UINT8, BASE_DEC, VALS(ansi_map_AlertCode_Alert_Action_vals), 0x07, - "Alert Action", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_announcementcode_tone, { "Tone", "ansi_map.announcementcode.tone", FT_UINT8, BASE_DEC, VALS(ansi_map_AnnouncementCode_tone_vals), 0x0, - "Tone", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_announcementcode_class, { "Tone", "ansi_map.announcementcode.class", FT_UINT8, BASE_DEC, VALS(ansi_map_AnnouncementCode_class_vals), 0xf, - "Tone", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_announcementcode_std_ann, { "Standard Announcement", "ansi_map.announcementcode.std_ann", FT_UINT8, BASE_DEC, VALS(ansi_map_AnnouncementCode_std_ann_vals), 0x0, - "Standard Announcement", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_announcementcode_cust_ann, { "Custom Announcement", "ansi_map.announcementcode.cust_ann", FT_UINT8, BASE_DEC, NULL, 0x0, - "Custom Announcement", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_authorizationperiod_period, { "Period", "ansi_map.authorizationperiod.period", FT_UINT8, BASE_DEC, VALS(ansi_map_authorizationperiod_period_vals), 0x0, - "Period", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_value, - { " Value", "ansi_map.value", + { "Value", "ansi_map.value", FT_UINT8, BASE_DEC, NULL, 0x0, - "Value", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_msc_type, { "Type", "ansi_map.extendedmscid.type", FT_UINT8, BASE_DEC, VALS(ansi_map_msc_type_vals), 0x0, - "Type", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_handoffstate_pi, { "Party Involved (PI)", "ansi_map.handoffstate.pi", FT_BOOLEAN, 8, TFS(&ansi_map_HandoffState_pi_bool_val),0x01, - "Party Involved (PI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_tgn, { "Trunk Group Number (G)", "ansi_map.tgn", FT_UINT8, BASE_DEC, NULL,0x0, - "Trunk Group Number (G)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_tmn, { "Trunk Member Number (M)", "ansi_map.tgn", FT_UINT8, BASE_DEC, NULL,0x0, - "Trunk Member Number (M)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_messagewaitingnotificationcount_tom, { "Type of messages", "ansi_map.messagewaitingnotificationcount.tom", FT_UINT8, BASE_DEC, VALS(ansi_map_MessageWaitingNotificationCount_type_vals), 0x0, - "Type of messages", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_messagewaitingnotificationcount_no_mw, { "Number of Messages Waiting", "ansi_map.messagewaitingnotificationcount.nomw", FT_UINT8, BASE_DEC, NULL,0x0, - "Number of Messages Waiting", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_messagewaitingnotificationtype_mwi, { "Message Waiting Indication (MWI)", "ansi_map.messagewaitingnotificationcount.mwi", FT_UINT8, BASE_DEC, VALS(ansi_map_MessageWaitingNotificationType_mwi_vals), 0x0, - "Message Waiting Indication (MWI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_messagewaitingnotificationtype_apt, { "Alert Pip Tone (APT)", "ansi_map.messagewaitingnotificationtype.apt", FT_BOOLEAN, 8, TFS(&ansi_map_HandoffState_pi_bool_val),0x02, - "Alert Pip Tone (APT)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_messagewaitingnotificationtype_pt, { "Pip Tone (PT)", "ansi_map.messagewaitingnotificationtype.pt", FT_UINT8, BASE_DEC, VALS(ansi_map_MessageWaitingNotificationType_mwi_vals), 0xc0, - "Pip Tone (PT)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_prof, { "Profile (PROF)", "ansi_map.trans_cap_prof", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_prof_bool_val),0x01, - "Profile (PROF)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_busy, { "Busy Detection (BUSY)", "ansi_map.trans_cap_busy", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_busy_bool_val),0x02, - "Busy Detection (BUSY)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_ann, { "Announcements (ANN)", "ansi_map.trans_cap_ann", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_ann_bool_val),0x04, - "Announcements (ANN)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_rui, { "Remote User Interaction (RUI)", "ansi_map.trans_cap_rui", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_rui_bool_val),0x08, - "Remote User Interaction (RUI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_spini, { "Subscriber PIN Intercept (SPINI)", "ansi_map.trans_cap_spini", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_spini_bool_val),0x10, - "Subscriber PIN Intercept (SPINI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_uzci, { "UZ Capability Indicator (UZCI)", "ansi_map.trans_cap_uzci", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_uzci_bool_val),0x20, - "UZ Capability Indicator (UZCI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_ndss, { "NDSS Capability (NDSS)", "ansi_map.trans_cap_ndss", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_ndss_bool_val),0x40, - "NDSS Capability (NDSS)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_trans_cap_nami, { "NAME Capability Indicator (NAMI)", "ansi_map.trans_cap_nami", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_nami_bool_val),0x80, - "NAME Capability Indicator (NAMI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_trans_cap_multerm, { "Multiple Terminations", "ansi_map.trans_cap_multerm", FT_UINT8, BASE_DEC, VALS(ansi_map_trans_cap_multerm_vals), 0x0f, - "Multiple Terminations", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_terminationtriggers_busy, { "Busy", "ansi_map.terminationtriggers.busy", FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_busy_vals), 0x03, - "Busy", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_terminationtriggers_rf, { "Routing Failure (RF)", "ansi_map.terminationtriggers.rf", FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_rf_vals), 0x0c, - "Routing Failure (RF)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_terminationtriggers_npr, { "No Page Response (NPR)", "ansi_map.terminationtriggers.npr", FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_npr_vals), 0x30, - "No Page Response (NPR)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_terminationtriggers_na, { "No Answer (NA)", "ansi_map.terminationtriggers.na", FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_na_vals), 0xc0, - "No Answer (NA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_terminationtriggers_nr, { "None Reachable (NR)", "ansi_map.terminationtriggers.nr", FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_nr_vals), 0x01, - "None Reachable (NR)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_trans_cap_tl, { "TerminationList (TL)", "ansi_map.trans_cap_tl", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_tl_bool_val),0x10, - "TerminationList (TL)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmaserviceoption, { "CDMAServiceOption", "ansi_map.cdmaserviceoption", FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(&cdmaserviceoption_vals), 0x0, - "CDMAServiceOption", HFILL }}, + NULL, HFILL }}, { &hf_ansi_trans_cap_waddr, { "WIN Addressing (WADDR)", "ansi_map.trans_cap_waddr", FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_waddr_bool_val),0x20, - "WIN Addressing (WADDR)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_MarketID, { "MarketID", "ansi_map.marketid", FT_UINT16, BASE_DEC, NULL, 0, - "MarketID", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_swno, { "Switch Number (SWNO)", "ansi_map.swno", FT_UINT8, BASE_DEC, NULL, 0, - "Switch Number (SWNO)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_idno, { "ID Number", "ansi_map.idno", FT_UINT32, BASE_DEC, NULL, 0, - "ID Number", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_segcount, { "Segment Counter", "ansi_map.segcount", FT_UINT8, BASE_DEC, NULL, 0, - "Segment Counter", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_sms_originationrestrictions_direct, { "DIRECT", "ansi_map.originationrestrictions.direct", FT_BOOLEAN, 8, TFS(&ansi_map_SMS_OriginationRestrictions_direct_bool_val),0x04, - "DIRECT", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_sms_originationrestrictions_default, { "DEFAULT", "ansi_map.originationrestrictions.default", FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_OriginationRestrictions_default_vals), 0x03, - "DEFAULT", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_sms_originationrestrictions_fmc, { "Force Message Center (FMC)", "ansi_map.originationrestrictions.fmc", FT_BOOLEAN, 8, TFS(&ansi_map_SMS_OriginationRestrictions_fmc_bool_val),0x08, - "Force Message Center (FMC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_systemcapabilities_auth, { "Authentication Parameters Requested (AUTH)", "ansi_map.systemcapabilities.auth", FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_auth_bool_val),0x01, - "Authentication Parameters Requested (AUTH)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_systemcapabilities_se, { "Signaling Message Encryption Capable (SE )", "ansi_map.systemcapabilities.se", FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_se_bool_val),0x02, - "Signaling Message Encryption Capable (SE )", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_systemcapabilities_vp, { "Voice Privacy Capable (VP )", "ansi_map.systemcapabilities.vp", FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_vp_bool_val),0x04, - "Voice Privacy Capable (VP )", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_systemcapabilities_cave, { "CAVE Algorithm Capable (CAVE)", "ansi_map.systemcapabilities.cave", FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_cave_bool_val),0x08, - "CAVE Algorithm Capable (CAVE)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_systemcapabilities_ssd, { "Shared SSD (SSD)", "ansi_map.systemcapabilities.ssd", FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_ssd_bool_val),0x10, - "Shared SSD (SSD)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_systemcapabilities_dp, { "Data Privacy (DP)", "ansi_map.systemcapabilities.dp", FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_dp_bool_val),0x20, - "Data Privacy (DP)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_mslocation_lat, { "Latitude in tenths of a second", "ansi_map.mslocation.lat", FT_UINT8, BASE_DEC, NULL, 0, - "Latitude in tenths of a second", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_mslocation_long, { "Longitude in tenths of a second", "ansi_map.mslocation.long", FT_UINT8, BASE_DEC, NULL, 0, @@ -4734,182 +4734,182 @@ void proto_register_ansi_map(void) { { &hf_ansi_map_mslocation_res, { "Resolution in units of 1 foot", "ansi_map.mslocation.res", FT_UINT8, BASE_DEC, NULL, 0, - "Resolution in units of 1 foot", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_nampscallmode_namps, { "Call Mode", "ansi_map.nampscallmode.namps", FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_namps_bool_val),0x01, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_nampscallmode_amps, { "Call Mode", "ansi_map.nampscallmode.amps", FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_nampschanneldata_navca, { "Narrow Analog Voice Channel Assignment (NAVCA)", "ansi_map.nampschanneldata.navca", FT_UINT8, BASE_DEC, VALS(ansi_map_NAMPSChannelData_navca_vals), 0x03, - "Narrow Analog Voice Channel Assignment (NAVCA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_nampschanneldata_CCIndicator, { "Color Code Indicator (CCIndicator)", "ansi_map.nampschanneldata.ccindicator", FT_UINT8, BASE_DEC, VALS(ansi_map_NAMPSChannelData_ccinidicator_vals), 0x1c, - "Color Code Indicator (CCIndicator)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cfufa, { "Call Forwarding Unconditional FeatureActivity, CFU-FA", "ansi_map.callingfeaturesindicator.cfufa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03, - "Call Forwarding Unconditional FeatureActivity, CFU-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cfbfa, { "Call Forwarding Busy FeatureActivity, CFB-FA", "ansi_map.callingfeaturesindicator.cfbafa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c, - "Call Forwarding Busy FeatureActivity, CFB-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cfnafa, { "Call Forwarding No Answer FeatureActivity, CFNA-FA", "ansi_map.callingfeaturesindicator.cfnafa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30, - "Call Forwarding No Answer FeatureActivity, CFNA-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cwfa, { "Call Waiting: FeatureActivity, CW-FA", "ansi_map.callingfeaturesindicator.cwfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0, - "Call Waiting: FeatureActivity, CW-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_3wcfa, { "Three-Way Calling FeatureActivity, 3WC-FA", "ansi_map.callingfeaturesindicator.3wcfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03, - "Three-Way Calling FeatureActivity, 3WC-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_pcwfa, { "Priority Call Waiting FeatureActivity PCW-FA", "ansi_map.callingfeaturesindicator.pcwfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03, - "Priority Call Waiting FeatureActivity PCW-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_dpfa, { "Data Privacy Feature Activity DP-FA", "ansi_map.callingfeaturesindicator.dpfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c, - "Data Privacy Feature Activity DP-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_ahfa, { "Answer Hold: FeatureActivity AH-FA", "ansi_map.callingfeaturesindicator.ahfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30, - "Answer Hold: FeatureActivity AH-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_uscfvmfa, { "USCF divert to voice mail: FeatureActivity USCFvm-FA", "ansi_map.callingfeaturesindicator.uscfvmfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0, - "USCF divert to voice mail: FeatureActivity USCFvm-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_uscfmsfa, { "USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA", "ansi_map.callingfeaturesindicator.uscfmsfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03, - "USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_uscfnrfa, { "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", "ansi_map.callingfeaturesindicator.uscfmsfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c, - "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cpdsfa, { "CDMA-Packet Data Service: FeatureActivity. CPDS-FA", "ansi_map.callingfeaturesindicator.cpdfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30, - "CDMA-Packet Data Service: FeatureActivity. CPDS-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_ccsfa, { "CDMA-Concurrent Service:FeatureActivity. CCS-FA", "ansi_map.callingfeaturesindicator.ccsfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0, - "CDMA-Concurrent Service:FeatureActivity. CCS-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_epefa, { "TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA", "ansi_map.callingfeaturesindicator.epefa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03, - "TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cdfa, { "Call Delivery: FeatureActivity, CD-FA", "ansi_map.callingfeaturesindicator.cdfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c, - "Call Delivery: FeatureActivity, CD-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_vpfa, { "Voice Privacy FeatureActivity, VP-FA", "ansi_map.callingfeaturesindicator.vpfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30, - "Voice Privacy FeatureActivity, VP-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_ctfa, { "Call Transfer: FeatureActivity, CT-FA", "ansi_map.callingfeaturesindicator.ctfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0, - "Call Transfer: FeatureActivity, CT-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cnip1fa, { "One number (network-provided only) Calling Number Identification Presentation: FeatureActivity CNIP1-FA", "ansi_map.callingfeaturesindicator.cnip1fa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03, - "One number (network-provided only) Calling Number Identification Presentation: FeatureActivity CNIP1-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cnip2fa, { "Two number (network-provided and user-provided) Calling Number Identification Presentation: FeatureActivity CNIP2-FA", "ansi_map.callingfeaturesindicator.cnip2fa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c, - "Two number (network-provided and user-provided) Calling Number Identification Presentation: FeatureActivity CNIP2-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cnirfa, { "Calling Number Identification Restriction: FeatureActivity CNIR-FA", "ansi_map.callingfeaturesindicator.cnirfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30, - "Calling Number Identification Restriction: FeatureActivity CNIR-FA", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_callingfeaturesindicator_cniroverfa, { "Calling Number Identification Restriction Override FeatureActivity CNIROver-FA", "ansi_map.callingfeaturesindicator.cniroverfa", FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0, - "", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cdma, { "Call Mode", "ansi_map.cdmacallmode.cdma", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cdma_bool_val),0x01, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_amps, { "Call Mode", "ansi_map.cdmacallmode.amps", FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_namps, { "Call Mode", "ansi_map.cdmacallmode.namps", FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_namps_bool_val),0x04, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls1, { "Call Mode", "ansi_map.cdmacallmode.cls1", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls1_bool_val),0x08, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls2, { "Call Mode", "ansi_map.cdmacallmode.cls2", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls2_bool_val),0x10, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls3, { "Call Mode", "ansi_map.cdmacallmode.cls3", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls3_bool_val),0x20, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls4, { "Call Mode", "ansi_map.cdmacallmode.cls4", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls4_bool_val),0x40, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls5, { "Call Mode", "ansi_map.cdmacallmode.cls5", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls5_bool_val),0x80, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls6, { "Call Mode", "ansi_map.cdmacallmode.cls6", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls6_bool_val),0x01, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls7, { "Call Mode", "ansi_map.cdmacallmode.cls7", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls7_bool_val),0x02, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls8, { "Call Mode", "ansi_map.cdmacallmode.cls8", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls8_bool_val),0x04, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls9, { "Call Mode", "ansi_map.cdmacallmode.cls9", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls9_bool_val),0x08, - "Call Mode", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmacallmode_cls10, { "Call Mode", "ansi_map.cdmacallmode.cls10", FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls10_bool_val),0x10, - "Call Mode", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_Frame_Offset, { "Frame Offset", "ansi_map.cdmachanneldata.frameoffset", FT_UINT8, BASE_DEC, NULL, 0x78, - "Frame Offset", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_CDMA_ch_no, { "CDMA Channel Number", "ansi_map.cdmachanneldata.cdma_ch_no", FT_UINT16, BASE_DEC, NULL, 0x07FF, - "CDMA Channel Number", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_band_cls, { "Band Class", "ansi_map.cdmachanneldata.band_cls", FT_UINT8, BASE_DEC, VALS(ansi_map_cdmachanneldata_band_cls_vals), 0x7c, - "Band Class", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_lc_mask_b6, { "Long Code Mask (byte 6) MSB", "ansi_map.cdmachanneldata.lc_mask_b6", FT_UINT8, BASE_HEX, NULL, 0x03, @@ -4917,19 +4917,19 @@ void proto_register_ansi_map(void) { {&hf_ansi_map_cdmachanneldata_lc_mask_b5, { "Long Code Mask (byte 5)", "ansi_map.cdmachanneldata.lc_mask_b5", FT_UINT8, BASE_HEX, NULL, 0xff, - "Long Code Mask (byte 5)", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_lc_mask_b4, { "Long Code Mask (byte 4)", "ansi_map.cdmachanneldata.lc_mask_b4", FT_UINT8, BASE_HEX, NULL, 0xff, - "Long Code Mask (byte 4)", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_lc_mask_b3, { "Long Code Mask (byte 3)", "ansi_map.cdmachanneldata.lc_mask_b3", FT_UINT8, BASE_HEX, NULL, 0xff, - "Long Code Mask (byte 3)", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_lc_mask_b2, { "Long Code Mask (byte 2)", "ansi_map.cdmachanneldata.lc_mask_b2", FT_UINT8, BASE_HEX, NULL, 0xff, - "Long Code Mask (byte 2)", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_lc_mask_b1, { "Long Code Mask LSB(byte 1)", "ansi_map.cdmachanneldata.lc_mask_b1", FT_UINT8, BASE_HEX, NULL, 0xff, @@ -4937,311 +4937,311 @@ void proto_register_ansi_map(void) { {&hf_ansi_map_cdmachanneldata_np_ext, { "NP EXT", "ansi_map.cdmachanneldata.np_ext", FT_BOOLEAN, 8, NULL,0x80, - "NP EXT", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_nominal_pwr, { "Nominal Power", "ansi_map.cdmachanneldata.nominal_pwr", FT_UINT8, BASE_DEC, NULL, 0x71, - "Nominal Power", HFILL }}, + NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_nr_preamble, { "Number Preamble", "ansi_map.cdmachanneldata.nr_preamble", FT_UINT8, BASE_DEC, NULL, 0x07, - "Number Preamble", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmastationclassmark_pc, { "Power Class(PC)", "ansi_map.cdmastationclassmark.pc", FT_UINT8, BASE_DEC, VALS(ansi_map_CDMAStationClassMark_pc_vals), 0x03, - "Power Class(PC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmastationclassmark_dtx, { "Analog Transmission: (DTX)", "ansi_map.cdmastationclassmark.dtx", FT_BOOLEAN, 8, TFS(&ansi_map_CDMAStationClassMark_dtx_bool_val),0x04, - "Analog Transmission: (DTX)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmastationclassmark_smi, - { " Slotted Mode Indicator: (SMI)", "ansi_map.cdmastationclassmark.smi", + { "Slotted Mode Indicator: (SMI)", "ansi_map.cdmastationclassmark.smi", FT_BOOLEAN, 8, TFS(&ansi_map_CDMAStationClassMark_smi_bool_val),0x20, - " Slotted Mode Indicator: (SMI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_cdmastationclassmark_dmi, { "Dual-mode Indicator(DMI)", "ansi_map.cdmastationclassmark.dmi", FT_BOOLEAN, 8, TFS(&ansi_map_CDMAStationClassMark_dmi_bool_val),0x40, - "Dual-mode Indicator(DMI)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_channeldata_vmac, { "Voice Mobile Attenuation Code (VMAC)", "ansi_map.channeldata.vmac", FT_UINT8, BASE_DEC, NULL, 0x07, - "Voice Mobile Attenuation Code (VMAC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_channeldata_dtx, { "Discontinuous Transmission Mode (DTX)", "ansi_map.channeldata.dtx", FT_UINT8, BASE_DEC, VALS(ansi_map_ChannelData_dtx_vals), 0x18, - "Discontinuous Transmission Mode (DTX)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_channeldata_scc, { "SAT Color Code (SCC)", "ansi_map.channeldata.scc", FT_UINT8, BASE_DEC, NULL, 0xc0, - "SAT Color Code (SCC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_channeldata_chno, { "Channel Number (CHNO)", "ansi_map.channeldata.chno", FT_UINT16, BASE_DEC, NULL, 0x0, - "Channel Number (CHNO)", HFILL }}, + 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, - "Voice Privacy (VP) Confidentiality Status", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_controlchanneldata_dcc, { "Digital Color Code (DCC)", "ansi_map.controlchanneldata.dcc", FT_UINT8, BASE_DEC, NULL, 0xc0, - "Digital Color Code (DCC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_controlchanneldata_cmac, { "Control Mobile Attenuation Code (CMAC)", "ansi_map.controlchanneldata.cmac", FT_UINT8, BASE_DEC, NULL, 0x07, - "Control Mobile Attenuation Code (CMAC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_controlchanneldata_chno, { "Channel Number (CHNO)", "ansi_map.controlchanneldata.cmac", FT_UINT16, BASE_DEC, NULL, 0x0, - "Channel Number (CHNO)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_controlchanneldata_sdcc1, { "Supplementary Digital Color Codes (SDCC1)", "ansi_map.controlchanneldata.ssdc1", FT_UINT8, BASE_DEC, NULL, 0x0c, - "Supplementary Digital Color Codes (SDCC1)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_controlchanneldata_sdcc2, { "Supplementary Digital Color Codes (SDCC2)", "ansi_map.controlchanneldata.ssdc2", FT_UINT8, BASE_DEC, NULL, 0x03, - "Supplementary Digital Color Codes (SDCC2)", HFILL }}, + 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, - "Signaling Message Encryption (SE) Confidentiality Status", HFILL }}, + 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, - "DataPrivacy (DP) Confidentiality Status", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_deniedauthorizationperiod_period, { "Period", "ansi_map.deniedauthorizationperiod.period", FT_UINT8, BASE_DEC, VALS(ansi_map_deniedauthorizationperiod_period_vals), 0x0, - "Period", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_all, { "All Origination (All)", "ansi_map.originationtriggers.all", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_all_bool_val),0x01, - "All Origination (All)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_local, { "Local", "ansi_map.originationtriggers.all", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_local_bool_val),0x02, - "Local", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_ilata, { "Intra-LATA Toll (ILATA)", "ansi_map.originationtriggers.ilata", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_ilata_bool_val),0x04, - "Intra-LATA Toll (ILATA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_olata, { "Inter-LATA Toll (OLATA)", "ansi_map.originationtriggers.olata", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_olata_bool_val),0x08, - "Inter-LATA Toll (OLATA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_int, { "International (Int'l )", "ansi_map.originationtriggers.int", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_int_bool_val),0x10, - "International (Int'l )", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_wz, { "World Zone (WZ)", "ansi_map.originationtriggers.wz", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_wz_bool_val),0x20, - "World Zone (WZ)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_unrec, { "Unrecognized Number (Unrec)", "ansi_map.originationtriggers.unrec", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_unrec_bool_val),0x40, - "Unrecognized Number (Unrec)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_rvtc, { "Revertive Call (RvtC)", "ansi_map.originationtriggers.rvtc", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_rvtc_bool_val),0x80, - "Revertive Call (RvtC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_star, { "Star", "ansi_map.originationtriggers.star", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_star_bool_val),0x01, - "Star", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_ds, { "Double Star (DS)", "ansi_map.originationtriggers.ds", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_ds_bool_val),0x02, - "Double Star (DS)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_pound, { "Pound", "ansi_map.originationtriggers.pound", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_pound_bool_val),0x04, - "Pound", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_dp, { "Double Pound (DP)", "ansi_map.originationtriggers.dp", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_dp_bool_val),0x08, - "Double Pound (DP)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_pa, { "Prior Agreement (PA)", "ansi_map.originationtriggers.pa", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_pa_bool_val),0x10, - "Prior Agreement (PA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_nodig, { "No digits", "ansi_map.originationtriggers.nodig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_nodig_bool_val),0x01, - "No digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_onedig, { "1 digit", "ansi_map.originationtriggers.onedig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_onedig_bool_val),0x02, - "1 digit", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_twodig, { "2 digits", "ansi_map.originationtriggers.twodig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_twodig_bool_val),0x04, - "2 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_threedig, { "3 digits", "ansi_map.originationtriggers.threedig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_threedig_bool_val),0x08, - "3 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_fourdig, { "4 digits", "ansi_map.originationtriggers.fourdig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fourdig_bool_val),0x10, - "4 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_fivedig, { "5 digits", "ansi_map.originationtriggers.fivedig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fivedig_bool_val),0x20, - "5 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_sixdig, { "6 digits", "ansi_map.originationtriggers.sixdig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_sixdig_bool_val),0x40, - "6 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_sevendig, { "7 digits", "ansi_map.originationtriggers.sevendig", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_sevendig_bool_val),0x80, - "7 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_eightdig, { "8 digits", "ansi_map.originationtriggers.eight", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_eightdig_bool_val),0x01, - "8 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_ninedig, { "9 digits", "ansi_map.originationtriggers.nine", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_ninedig_bool_val),0x02, - "9 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_tendig, { "10 digits", "ansi_map.originationtriggers.ten", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_tendig_bool_val),0x04, - "10 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_elevendig, { "11 digits", "ansi_map.originationtriggers.eleven", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_elevendig_bool_val),0x08, - "11 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_twelvedig, { "12 digits", "ansi_map.originationtriggers.twelve", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_twelvedig_bool_val),0x10, - "12 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_thirteendig, { "13 digits", "ansi_map.originationtriggers.thirteen", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_thirteendig_bool_val),0x20, - "13 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_fourteendig, { "14 digits", "ansi_map.originationtriggers.fourteen", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fourteendig_bool_val),0x40, - "14 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_originationtriggers_fifteendig, { "15 digits", "ansi_map.originationtriggers.fifteen", FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fifteendig_bool_val),0x80, - "15 digits", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_init, { "Introducing Star/Pound (INIT)", "ansi_map.triggercapability.init", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01, - "Introducing Star/Pound (INIT)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_kdigit, { "K-digit (K-digit)", "ansi_map.triggercapability.kdigit", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x02, - "K-digit (K-digit)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_all, { "All_Calls (All)", "ansi_map.triggercapability.all", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x04, - "All_Calls (All)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_rvtc, { "Revertive_Call (RvtC)", "ansi_map.triggercapability.rvtc", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x08, - "Revertive_Call (RvtC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_oaa, { "Origination_Attempt_Authorized (OAA)", "ansi_map.triggercapability.oaa", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x10, - "Origination_Attempt_Authorized (OAA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_oans, { "O_Answer (OANS)", "ansi_map.triggercapability.oans", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x20, - "O_Answer (OANS)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_odisc, { "O_Disconnect (ODISC)", "ansi_map.triggercapability.odisc", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x40, - "O_Disconnect (ODISC)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_ona, { "O_No_Answer (ONA)", "ansi_map.triggercapability.ona", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x80, - "O_No_Answer (ONA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_ct , { "Call Types (CT)", "ansi_map.triggercapability.ona", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01, - "Call Types (CT)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_unrec, { "Unrecognized_Number (Unrec)", "ansi_map.triggercapability.unrec", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x02, - "Unrecognized_Number (Unrec)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_pa, { "Prior_Agreement (PA)", "ansi_map.triggercapability.pa", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x04, - "Prior_Agreement (PA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_at, { "Advanced_Termination (AT)", "ansi_map.triggercapability.at", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x08, - "Advanced_Termination (AT)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_cgraa, { "Calling_Routing_Address_Available (CgRAA)", "ansi_map.triggercapability.cgraa", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x10, - "Calling_Routing_Address_Available (CgRAA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_it, { "Initial_Termination (IT)", "ansi_map.triggercapability.it", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x20, - "Initial_Termination (IT)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_cdraa, { "Called_Routing_Address_Available (CdRAA)", "ansi_map.triggercapability.cdraa", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x40, - "Called_Routing_Address_Available (CdRAA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_obsy, { "O_Called_Party_Busy (OBSY)", "ansi_map.triggercapability.ona", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x80, - "O_Called_Party_Busy (OBSY)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_tra , { "Terminating_Resource_Available (TRA)", "ansi_map.triggercapability.tra", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01, - "Terminating_Resource_Available (TRA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_tbusy, { "T_Busy (TBusy)", "ansi_map.triggercapability.tbusy", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x02, - "T_Busy (TBusy)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_tna, { "T_No_Answer (TNA)", "ansi_map.triggercapability.tna", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x04, - "T_No_Answer (TNA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_tans, { "T_Answer (TANS)", "ansi_map.triggercapability.tans", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x08, - "T_Answer (TANS)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_triggercapability_tdisc, - { "T_Disconnect (TDISC) ", "ansi_map.triggercapability.tdisc", + { "T_Disconnect (TDISC)", "ansi_map.triggercapability.tdisc", FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x10, - "T_Disconnect (TDISC) ", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_winoperationscapability_conn, { "ConnectResource (CONN)", "ansi_map.winoperationscapability.conn", FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_conn_bool_val),0x01, - "ConnectResource (CONN)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_winoperationscapability_ccdir, { "CallControlDirective(CCDIR)", "ansi_map.winoperationscapability.ccdir", FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_ccdir_bool_val),0x02, - "CallControlDirective(CCDIR)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_winoperationscapability_pos, { "PositionRequest (POS)", "ansi_map.winoperationscapability.pos", FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_pos_bool_val),0x04, - "PositionRequest (POS)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_pacaindicator_pa, { "Permanent Activation (PA)", "ansi_map.pacaindicator_pa", FT_BOOLEAN, 8, TFS(&ansi_map_pacaindicator_pa_bool_val),0x01, - "Permanent Activation (PA)", HFILL }}, + NULL, HFILL }}, { &hf_ansi_map_PACA_Level, { "PACA Level", "ansi_map.PACA_Level", FT_UINT8, BASE_DEC, VALS(ansi_map_PACA_Level_vals), 0x1e, - "PACA Level", HFILL }}, + NULL, HFILL }}, #include "packet-ansi_map-hfarr.c" }; diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 284a52fe6c..c9a85f95cc 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -547,18 +547,18 @@ void proto_register_camel(void) { { &hf_camel_cause_indicator, /* Currently not enabled */ { "Cause indicator", "camel.cause_indicator", FT_UINT8, BASE_DEC, VALS(q850_cause_code_vals), 0x7f, - "", HFILL }}, + NULL, HFILL }}, { &hf_digit, { "Digit Value", "camel.digit_value", - FT_UINT8, BASE_DEC, VALS(digit_value), 0, "Digit Value", HFILL }}, + FT_UINT8, BASE_DEC, VALS(digit_value), 0, NULL, HFILL }}, { &hf_camel_PDPTypeNumber_etsi, { "ETSI defined PDP Type Value", "camel.PDPTypeNumber_etsi", FT_UINT8, BASE_HEX, VALS(gsm_map_etsi_defined_pdp_vals), 0, - "ETSI defined PDP Type Value", HFILL }}, + NULL, HFILL }}, { &hf_camel_PDPTypeNumber_ietf, { "IETF defined PDP Type Value", "camel.PDPTypeNumber_ietf", FT_UINT8, BASE_HEX, VALS(gsm_map_ietf_defined_pdp_vals), 0, - "IETF defined PDP Type Value", HFILL }}, + NULL, HFILL }}, { &hf_camel_PDPAddress_IPv4, { "PDPAddress IPv4", "camel.PDPAddress_IPv4", FT_IPv4, BASE_NONE, NULL, 0, @@ -569,7 +569,7 @@ void proto_register_camel(void) { "IPAddress IPv6", HFILL }}, { &hf_camel_cellGlobalIdOrServiceAreaIdFixedLength, { "CellGlobalIdOrServiceAreaIdFixedLength", "camel.CellGlobalIdOrServiceAreaIdFixedLength", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "LocationInformationGPRS/CellGlobalIdOrServiceAreaIdOrLAI", HFILL }}, { &hf_camel_RP_Cause, { "RP Cause", "camel.RP_Cause", @@ -579,27 +579,27 @@ void proto_register_camel(void) { { &hf_camel_CAMEL_AChBillingChargingCharacteristics, { "CAMEL-AChBillingChargingCharacteristics", "camel.CAMEL_AChBillingChargingCharacteristics", FT_UINT32, BASE_DEC, VALS(camel_CAMEL_AChBillingChargingCharacteristics_vals), 0, - "CAMEL-AChBillingChargingCharacteristics", HFILL }}, + NULL, HFILL }}, { &hf_camel_CAMEL_FCIBillingChargingCharacteristics, { "CAMEL-FCIBillingChargingCharacteristics", "camel.CAMEL_FCIBillingChargingCharacteristics", FT_UINT32, BASE_DEC, VALS(camel_CAMEL_FCIBillingChargingCharacteristics_vals), 0, - "CAMEL-FCIBillingChargingCharacteristics", HFILL }}, + NULL, HFILL }}, { &hf_camel_CAMEL_FCIGPRSBillingChargingCharacteristics, { "CAMEL-FCIGPRSBillingChargingCharacteristics", "camel.CAMEL_FCIGPRSBillingChargingCharacteristics", FT_UINT32, BASE_DEC, NULL, 0, - "CAMEL-FCIGPRSBillingChargingCharacteristics", HFILL }}, + NULL, HFILL }}, { &hf_camel_CAMEL_FCISMSBillingChargingCharacteristics, { "CAMEL-FCISMSBillingChargingCharacteristics", "camel.CAMEL_FCISMSBillingChargingCharacteristics", FT_UINT32, BASE_DEC, VALS(camel_CAMEL_FCISMSBillingChargingCharacteristics_vals), 0, - "CAMEL-FCISMSBillingChargingCharacteristics", HFILL }}, + NULL, HFILL }}, { &hf_camel_CAMEL_SCIBillingChargingCharacteristics, { "CAMEL-SCIBillingChargingCharacteristics", "camel.CAMEL_SCIBillingChargingCharacteristics", FT_UINT32, BASE_DEC, VALS(camel_CAMEL_SCIBillingChargingCharacteristics_vals), 0, - "CAMEL-SCIBillingChargingCharacteristics", HFILL }}, + NULL, HFILL }}, { &hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics, { "CAMEL-SCIGPRSBillingChargingCharacteristics", "camel.CAMEL_SCIGPRSBillingChargingCharacteristics", @@ -616,19 +616,19 @@ void proto_register_camel(void) { { "Session Id", "camel.srt.session_id", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_camelsrt_RequestNumber, { "Request Number", "camel.srt.request_number", FT_UINT64, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_camelsrt_Duplicate, { "Request Duplicate", "camel.srt.duplicate", FT_UINT32, BASE_DEC, NULL, 0x0, - "", HFILL } + NULL, HFILL } }, { &hf_camelsrt_RequestFrame, { "Requested Frame", diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 2327d14c69..49d4546bdb 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -126,10 +126,10 @@ void proto_register_ftam(void) { { { &hf_ftam_unstructured_text, { "ISO FTAM unstructured text", "ftam.unstructured_text", FT_STRING, - BASE_DEC, NULL, 0x0, "ISO FTAM unstructured text", HFILL } }, + BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ftam_unstructured_binary, { "ISO FTAM unstructured binary", "ftam.unstructured_binary", FT_BYTES, - BASE_DEC, NULL, 0x0, "ISO FTAM unstructured binary", HFILL } }, + BASE_NONE, NULL, 0x0, NULL, HFILL } }, #include "packet-ftam-hfarr.c" }; diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c index 2abdc08562..e1d23c27ad 100644 --- a/asn1/gsmmap/packet-gsmmap-template.c +++ b/asn1/gsmmap/packet-gsmmap-template.c @@ -2194,87 +2194,87 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_old_Component_PDU, { "Component", "gsm_map.old.Component", FT_UINT32, BASE_DEC, VALS(gsm_old_Component_vals), 0, - "gsm_map.old.Component", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_getPassword, { "getPassword", "gsm_map.getPassword", FT_UINT8, BASE_DEC, VALS(gsm_old_GetPasswordArg_vals), 0, - "getPassword", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_currentPassword, { "currentPassword", "gsm_map.currentPassword", FT_STRING, BASE_NONE, NULL, 0, - "", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_extension, { "Extension", "gsm_map.extension", FT_BOOLEAN, 8, TFS(&gsm_map_extension_value), 0x80, - "Extension", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_nature_of_number, { "Nature of number", "gsm_map.nature_of_number", FT_UINT8, BASE_HEX, VALS(gsm_map_nature_of_number_values), 0x70, - "Nature of number", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_number_plan, { "Number plan", "gsm_map.number_plan", FT_UINT8, BASE_HEX, VALS(gsm_map_number_plan_values), 0x0f, - "Number plan", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_isdn_address_digits, { "ISDN Address digits", "gsm_map.isdn.address.digits", FT_STRING, BASE_NONE, NULL, 0, - "ISDN Address digits", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_address_digits, { "Address digits", "gsm_map.address.digits", FT_STRING, BASE_NONE, NULL, 0, - "Address digits", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_servicecentreaddress_digits, { "ServiceCentreAddress digits", "gsm_map.servicecentreaddress_digits", FT_STRING, BASE_NONE, NULL, 0, - "ServiceCentreAddress digits", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_imsi_digits, { "IMSI digits", "gsm_map.imsi_digits", FT_STRING, BASE_NONE, NULL, 0, - "IMSI digits", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_TBCD_digits, { "TBCD digits", "gsm_map.imsi_digits", FT_STRING, BASE_NONE, NULL, 0, - "TBCD digits", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_Ss_Status_unused, { "Unused", "gsm_map.unused", FT_UINT8, BASE_HEX, NULL, 0xf0, - "Unused", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_Ss_Status_q_bit, { "Q bit", "gsm_map.ss_status_q_bit", FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_q_bit_values), 0x08, - "Q bit", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_Ss_Status_p_bit, { "P bit", "gsm_map.ss_status_p_bit", FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_p_values), 0x04, - "P bit", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_Ss_Status_r_bit, { "R bit", "gsm_map.ss_status_r_bit", FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_r_values), 0x02, - "R bit", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_Ss_Status_a_bit, { "A bit", "gsm_map.ss_status_a_bit", FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_a_values), 0x01, - "A bit", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_notification_to_forwarding_party, { "Notification to forwarding party", "gsm_map.notification_to_forwarding_party", FT_BOOLEAN, 8, TFS(¬ification_value), 0x80, - "Notification to forwarding party", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_redirecting_presentation, { "Redirecting presentation", "gsm_map.redirecting_presentation", FT_BOOLEAN, 8, TFS(&redirecting_presentation_value), 0x40, - "Redirecting presentation", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_notification_to_calling_party, { "Notification to calling party", "gsm_map.notification_to_clling_party", FT_BOOLEAN, 8, TFS(¬ification_value), 0x20, - "Notification to calling party", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_forwarding_reason, { "Forwarding reason", "gsm_map.forwarding_reason", FT_UINT8, BASE_HEX, VALS(forwarding_reason_values), 0x0c, - "forwarding reason", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_pdp_type_org, { "PDP Type Organization", "gsm_map.pdp_type_org", FT_UINT8, BASE_HEX, VALS(pdp_type_org_values), 0x0f, - "PDP Type Organization", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_etsi_pdp_type_number, { "PDP Type Number", "gsm_map.pdp_type_org", FT_UINT8, BASE_HEX, VALS(etsi_pdp_type_number_values), 0, @@ -2286,36 +2286,36 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ext_qos_subscribed_pri, { "Allocation/Retention priority", "gsm_map.ext_qos_subscribed_pri", FT_UINT8, BASE_DEC, NULL, 0xff, - "Allocation/Retention priority", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_traffic_cls, { "Traffic class", "gsm_map.qos.traffic_cls", FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traffic_cls_vals), 0xe0, - "Traffic class", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_del_order, { "Delivery order", "gsm_map.qos.del_order", FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traffic_cls_vals), 0x18, - "Delivery order", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_del_of_err_sdu, { "Delivery of erroneous SDUs", "gsm_map.qos.del_of_err_sdu", FT_UINT8, BASE_DEC, VALS(gsm_a_qos_del_of_err_sdu_vals), 0x03, - "Delivery of erroneous SDUs", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_ber, { "Residual Bit Error Rate (BER)", "gsm_map.qos.ber", FT_UINT8, BASE_DEC, VALS(gsm_a_qos_ber_vals), 0xf0, - "Residual Bit Error Rate (BER)", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_sdu_err_rat, { "SDU error ratio", "gsm_map.qos.sdu_err_rat", FT_UINT8, BASE_DEC, VALS(gsm_a_qos_sdu_err_rat_vals), 0x0f, - "SDU error ratio", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_traff_hdl_pri, { "Traffic handling priority", "gsm_map.qos.traff_hdl_pri", FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traff_hdl_pri_vals), 0x03, - "Traffic handling priority", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_qos_max_sdu, { "Maximum SDU size", "gsm_map.qos.max_sdu", FT_UINT32, BASE_DEC, NULL, 0x0, - "Maximum SDU size", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_max_brate_ulink, { "Maximum bit rate for uplink in kbit/s", "gsm_map.qos.max_brate_ulink", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -2367,61 +2367,61 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_cbs_coding_grp, { "Coding Group","gsm_map.cbs.coding_grp", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_data_coding_scheme_coding_grp_vals), 0xf0, - "Coding Group", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp0_lang, { "Language","gsm_map.cbs.coding_grp0_lang", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp0_lang_vals), 0x0f, - "Language", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp1_lang, { "Language","gsm_map.cbs.coding_grp1_lang", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp1_lang_vals), 0x0f, - "Language", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp2_lang, { "Language","gsm_map.cbs.coding_grp2_lang", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp2_lang_vals), 0x0f, - "Language", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp3_lang, { "Language","gsm_map.cbs.coding_grp3_lang", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp3_lang_vals), 0x0f, - "Language", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp4_7_comp, { "Compressed indicator","gsm_map.cbs.coding_grp4_7_comp", FT_BOOLEAN, 8, TFS(&gsm_map_cbs_coding_grp4_7_comp_vals), 0x20, - "Compressed indicator", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp4_7_class_ind, { "Message Class present","gsm_map.cbs.coding_grp4_7_class_ind", FT_BOOLEAN, 8, TFS(&gsm_map_cbs_coding_grp4_7_class_ind_vals), 0x10, - "Message Class present", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp4_7_char_set, { "Character set being used","gsm_map.cbs.coding_grp4_7_char_set", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp4_7_char_set_vals), 0x0c, - "Character set being used", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp4_7_class, { "Message Class","gsm_map.cbs.coding_grp4_7_class", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp4_7_class_vals), 0x03, - "Message Class", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp15_mess_code, { "Message coding","gsm_map.cbs.cbs_coding_grp15_mess_code", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp15_mess_code_vals), 0x04, - "Message coding", HFILL } + NULL, HFILL } }, { &hf_gsm_map_cbs_coding_grp15_class, { "Message Class","gsm_map.cbs.gsm_map_cbs_coding_grp15_class", FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp15_class_vals), 0x03, - "Message Class", HFILL } + NULL, HFILL } }, { &hf_gsm_map_tmsi, { "tmsi", "gsm_map.tmsi", - FT_BYTES, BASE_HEX, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "gsm_map.TMSI", HFILL }}, { &hf_gsm_map_ie_tag, @@ -2431,11 +2431,11 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_len, { "Length", "gsm_map.length", FT_UINT8, BASE_DEC, NULL, 0, - "Length", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_disc_par, { "Discrimination parameter", "gsm_map.disc_par", FT_UINT8, BASE_DEC, VALS(gsm_map_disc_par_vals), 0, - "Discrimination parameter", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_dlci, { "DLCI", "gsm_map.disc_par", FT_UINT8, BASE_DEC, NULL, 0, diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 975a57a3a1..b1d37ab51a 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -225,16 +225,16 @@ void proto_register_h225(void) { static hf_register_info hf[] = { { &hf_h221Manufacturer, { "H.221 Manufacturer", "h221.Manufacturer", FT_UINT32, BASE_HEX, - VALS(H221ManufacturerCode_vals), 0, "H.221 Manufacturer", HFILL }}, + VALS(H221ManufacturerCode_vals), 0, NULL, HFILL }}, { &hf_h225_ras_req_frame, { "RAS Request Frame", "h225.ras.reqframe", FT_FRAMENUM, BASE_NONE, - NULL, 0, "RAS Request Frame", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_h225_ras_rsp_frame, { "RAS Response Frame", "h225.ras.rspframe", FT_FRAMENUM, BASE_NONE, - NULL, 0, "RAS Response Frame", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_h225_ras_dup, { "Duplicate RAS Message", "h225.ras.dup", FT_UINT32, BASE_DEC, - NULL, 0, "Duplicate RAS Message", HFILL }}, + NULL, 0, NULL, HFILL }}, { &hf_h225_ras_deltatime, { "RAS Service Response Time", "h225.ras.timedelta", FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "Timedelta between RAS-Request and RAS-Response", HFILL }}, diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index 88ffc9c1a8..fb979fc9ff 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -246,10 +246,10 @@ void proto_register_h450(void) { static hf_register_info hf[] = { { &hf_h450_operation, { "Operation", "h450.operation", FT_UINT8, BASE_DEC, VALS(h450_str_operation), 0x0, - "Operation", HFILL }}, + NULL, HFILL }}, { &hf_h450_error, { "Error", "h450.error", FT_UINT8, BASE_DEC, VALS(h450_str_error), 0x0, - "Error", HFILL }}, + NULL, HFILL }}, #include "packet-h450-hfarr.c" }; diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c index e0f5111898..476481056a 100644 --- a/asn1/ocsp/packet-ocsp-template.c +++ b/asn1/ocsp/packet-ocsp-template.c @@ -121,7 +121,7 @@ void proto_register_ocsp(void) { { &hf_ocsp_responseType_id, { "ResponseType Id", "x509af.responseType.id", FT_STRING, BASE_NONE, NULL, 0, - "ResponseType Id", HFILL }}, + NULL, HFILL }}, #include "packet-ocsp-hfarr.c" }; diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index 9a88a54b93..47d977ae02 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -603,7 +603,7 @@ void proto_register_qsig(void) { FT_UINT8, BASE_DEC, NULL, 0x0, "Information Element Length", HFILL }}, { &hf_qsig_ie_data, { "Data", "qsig.ie.data", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_qsig_tc, { "Transit count", "qsig.tc", FT_UINT8, BASE_DEC, NULL, 0x1F, |