From 175851fb4096f54c860935c6a816928a9f2e87b0 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 31 Jul 2012 18:54:11 +0000 Subject: Updated GSM dissectors display filters per checkfiltername.pl Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name. svn path=/trunk/; revision=44162 --- epan/dissectors/packet-gsm_sim.c | 228 +++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 114 deletions(-) (limited to 'epan/dissectors/packet-gsm_sim.c') diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index 7eb8027c7e..1256737a2e 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -1030,82 +1030,82 @@ proto_register_gsm_sim(void) { static hf_register_info hf[] = { { &hf_apdu_cla, - { "Class", "iso7816.apdu.cla", + { "Class", "gsm_sim.apdu.cla", FT_UINT8, BASE_HEX, VALS(apdu_cla_vals), 0, "ISO 7816-4 APDU CLA (Class) Byte", HFILL } }, { &hf_apdu_ins, - { "Instruction", "iso7816.apdu.ins", + { "Instruction", "gsm_sim.apdu.ins", FT_UINT8, BASE_HEX, VALS(apdu_ins_vals), 0, "ISO 7816-4 APDU INS (Instruction) Byte", HFILL } }, { &hf_apdu_p1, - { "Parameter 1", "iso7816.apdu.p1", + { "Parameter 1", "gsm_sim.apdu.p1", FT_UINT8, BASE_HEX, NULL, 0, "ISO 7816-4 APDU P1 (Parameter 1) Byte", HFILL } }, { &hf_apdu_p2, - { "Parameter 2", "iso7816.apdu.p2", + { "Parameter 2", "gsm_sim.apdu.p2", FT_UINT8, BASE_HEX, NULL, 0, "ISO 7816-4 APDU P2 (Parameter 2) Byte", HFILL } }, { &hf_apdu_p3, - { "Length (Parameter 3)", "iso7816.apdu.p3", + { "Length (Parameter 3)", "gsm_sim.apdu.p3", FT_UINT8, BASE_HEX, NULL, 0, "ISO 7816-4 APDU P3 (Parameter 3) Byte", HFILL } }, { &hf_apdu_data, - { "APDU Payload", "iso7816.apdu.data", + { "APDU Payload", "gsm_sim.apdu.data", FT_BYTES, BASE_NONE, NULL, 0, "ISO 7816-4 APDU Data Payload", HFILL } }, { &hf_apdu_sw, - { "Status Word (SW1:SW2)", "iso7816.apdu.sw", + { "Status Word (SW1:SW2)", "gsm_sim.apdu.sw", FT_UINT16, BASE_HEX, VALS(sw_vals), 0, "ISO 7816-4 APDU Status Word", HFILL } }, { &hf_file_id, - { "File ID", "iso7816.file_id", + { "File ID", "gsm_sim.file_id", FT_UINT16, BASE_HEX, VALS(mf_dfs), 0, "ISO 7816-4 File ID", HFILL } }, { &hf_aid, - { "Application ID", "iso7816.aid", + { "Application ID", "gsm_sim.aid", FT_BYTES, BASE_NONE, NULL, 0, "ISO 7816-4 Application ID", HFILL } }, { &hf_bin_offset, - { "Offset", "iso7816.bin_offset", + { "Offset", "gsm_sim.bin_offset", FT_UINT16, BASE_DEC, NULL, 0, "Offset into binary file", HFILL } }, { &hf_record_nr, - { "Record number", "iso7816.record_nr", + { "Record number", "gsm_sim.record_nr", FT_UINT8, BASE_DEC, NULL, 0, "Offset into binary file", HFILL } }, { &hf_auth_rand, - { "Random Challenge", "iso7816.auth_rand", + { "Random Challenge", "gsm_sim.auth_rand", FT_BYTES, BASE_NONE, NULL, 0, "GSM Authentication Random Challenge", HFILL } }, { &hf_auth_sres, - { "SRES", "iso7816.auth_sres", + { "SRES", "gsm_sim.auth_sres", FT_BYTES, BASE_NONE, NULL, 0, "GSM Authentication SRES Response", HFILL } }, { &hf_auth_kc, - { "Kc", "iso7816.auth_kc", + { "Kc", "gsm_sim.auth_kc", FT_BYTES, BASE_NONE, NULL, 0, "GSM Authentication Kc result", HFILL } }, { &hf_chan_nr, - { "Channel Number", "iso7816.chan_nr", + { "Channel Number", "gsm_sim.chan_nr", FT_UINT8, BASE_DEC, NULL, 0, "ISO 7816-4 Logical Channel Number", HFILL } }, { &hf_chan_op, - { "Channel Operation", "iso7816.chan_op", + { "Channel Operation", "gsm_sim.chan_op", FT_UINT8, BASE_HEX, VALS(chan_op_vals), 0, "ISO 7816-4 Logical Channel Operation", HFILL } }, @@ -1113,410 +1113,410 @@ proto_register_gsm_sim(void) /* Terminal Profile Byte 1 */ { &hf_tprof_b1, - { "Terminal Profile Byte 1 (Download)", "iso7816.tp.b1", + { "Terminal Profile Byte 1 (Download)", "gsm_sim.tp.b1", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_prof_dld, - { "Profile Download", "iso7816.tp.prof_dld", + { "Profile Download", "gsm_sim.tp.prof_dld", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, "TP Profile Downolad", HFILL } }, { &hf_tp_sms_data_dld, - { "SMS-PP Data Download", "iso7816.tp.sms_data_dld", + { "SMS-PP Data Download", "gsm_sim.tp.sms_data_dld", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, "TP SMS-PP Data Downolad", HFILL } }, { &hf_tp_cb_data_dld, - { "CB Data Download", "iso7816.tp.cb_data_dld", + { "CB Data Download", "gsm_sim.tp.cb_data_dld", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, "TP Cell Broadcast Data Downolad", HFILL } }, { &hf_tp_menu_sel, - { "Menu Selection", "iso7816.tp.menu_sel", + { "Menu Selection", "gsm_sim.tp.menu_sel", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, "TP Menu Selection", HFILL } }, { &hf_tp_9e_err, - { "Menu Selection", "iso7816.tp.9e_err", + { "Menu Selection", "gsm_sim.tp.9e_err", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, "TP 9EXX response code for SIM data download error", HFILL } }, { &hf_tp_timer_exp, - { "Timer expiration", "iso7816.tp.timer_exp", + { "Timer expiration", "gsm_sim.tp.timer_exp", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, "TP Timer expiration", HFILL } }, { &hf_tp_ussd_cc, - { "USSD string data in Call Control", "iso7816.tp.ussd_cc", + { "USSD string data in Call Control", "gsm_sim.tp.ussd_cc", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, "TP USSD string data object in Call Control", HFILL } }, { &hf_tp_auto_redial, - { "Envelope CC during automatic redial", "iso7816.tp.auto_redial", + { "Envelope CC during automatic redial", "gsm_sim.tp.auto_redial", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, "TP Envelope CC always sent to SIM during automatic redial", HFILL } }, /* Terminal Profile Byte 2 */ { &hf_tprof_b2, - { "Terminal Profile Byte 2 (Other)", "iso7816.tp.b2", + { "Terminal Profile Byte 2 (Other)", "gsm_sim.tp.b2", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_cmd_res, - { "Command result", "iso7816.tp.cmd_res", + { "Command result", "gsm_sim.tp.cmd_res", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, "TP Command result", HFILL } }, { &hf_tp_cc_sim, - { "Call Control by SIM", "iso7816.tp.cc_sim", + { "Call Control by SIM", "gsm_sim.tp.cc_sim", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, "TP Call Control by SIM", HFILL } }, { &hf_tp_cc_sim_cellid, - { "Cell ID in Call Control by SIM", "iso7816.tp.cc_sim_cellid", + { "Cell ID in Call Control by SIM", "gsm_sim.tp.cc_sim_cellid", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, "TP Cell ID included in Call Control by SIM", HFILL } }, { &hf_tp_mo_sms_sim, - { "MO SMS control by SIM", "iso7816.tp.mo_sms_sim", + { "MO SMS control by SIM", "gsm_sim.tp.mo_sms_sim", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, "TP MO short message control by SIM", HFILL } }, { &hf_tp_alpha_id, - { "Alpha identifier according 9.1.3", "iso7816.tp.alpha_id", + { "Alpha identifier according 9.1.3", "gsm_sim.tp.alpha_id", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, "TP Handling of alpha identifier according to 9.1.3", HFILL } }, { &hf_tp_ucs2_entry, - { "UCS2 Entry", "iso7816.tp.ucs2_entry", + { "UCS2 Entry", "gsm_sim.tp.ucs2_entry", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, "TP UCS2 Entry", HFILL } }, { &hf_tp_ucs2_display, - { "UCS2 Display", "iso7816.tp.ucs2_display", + { "UCS2 Display", "gsm_sim.tp.ucs2_display", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, "TP UCS2 Display", HFILL } }, { &hf_tp_display_ext, - { "Display of Extension Text", "iso7816.tp.display_ext", + { "Display of Extension Text", "gsm_sim.tp.display_ext", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, "TP Display of the Extension Text", HFILL } }, /* Terminal Profile Byte 3 */ { &hf_tprof_b3, - { "Terminal Profile Byte 3 (Proactive SIM)", "iso7816.tp.b3", + { "Terminal Profile Byte 3 (Proactive SIM)", "gsm_sim.tp.b3", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_pa_display_text, - { "Proactive SIM: DISPLAY TEXT", "iso7816.tp.pa.display_text", + { "Proactive SIM: DISPLAY TEXT", "gsm_sim.tp.pa.display_text", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_pa_get_inkey, - { "Proactive SIM: GET INKEY", "iso7816.tp.pa.get_inkey", + { "Proactive SIM: GET INKEY", "gsm_sim.tp.pa.get_inkey", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_pa_get_input, - { "Proactive SIM: GET INPUT", "iso7816.tp.pa.get_input", + { "Proactive SIM: GET INPUT", "gsm_sim.tp.pa.get_input", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_pa_more_time, - { "Proactive SIM: MORE TIME", "iso7816.tp.pa.more_time", + { "Proactive SIM: MORE TIME", "gsm_sim.tp.pa.more_time", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, { &hf_tp_pa_play_tone, - { "Proactive SIM: PLAY TONE", "iso7816.tp.pa.play_tone", + { "Proactive SIM: PLAY TONE", "gsm_sim.tp.pa.play_tone", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL } }, { &hf_tp_pa_poll_intv, - { "Proactive SIM: POLL INTERVAL", "iso7816.tp.pa.poll_intv", + { "Proactive SIM: POLL INTERVAL", "gsm_sim.tp.pa.poll_intv", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, NULL, HFILL } }, { &hf_tp_pa_polling_off, - { "Proactive SIM: POLLING OFF", "iso7816.tp.pa.polling_off", + { "Proactive SIM: POLLING OFF", "gsm_sim.tp.pa.polling_off", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, NULL, HFILL } }, { &hf_tp_pa_refresh, - { "Proactive SIM: REFRESH", "iso7816.tp.pa.refresh", + { "Proactive SIM: REFRESH", "gsm_sim.tp.pa.refresh", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL } }, /* Terminal Profile Byte 4 */ { &hf_tprof_b4, - { "Terminal Profile Byte 4 (Proactive SIM)", "iso7816.tp.b4", + { "Terminal Profile Byte 4 (Proactive SIM)", "gsm_sim.tp.b4", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_pa_select_item, - { "Proactive SIM: SELECT ITEM", "iso7816.tp.pa.select_item", + { "Proactive SIM: SELECT ITEM", "gsm_sim.tp.pa.select_item", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_pa_send_sms, - { "Proactive SIM: SEND SHORT MESSAGE", "iso7816.tp.pa.send_sms", + { "Proactive SIM: SEND SHORT MESSAGE", "gsm_sim.tp.pa.send_sms", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_pa_send_ss, - { "Proactive SIM: SEND SS", "iso7816.tp.pa.send_ss", + { "Proactive SIM: SEND SS", "gsm_sim.tp.pa.send_ss", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_pa_send_ussd, - { "Proactive SIM: SEND USSD", "iso7816.tp.pa.send_ussd", + { "Proactive SIM: SEND USSD", "gsm_sim.tp.pa.send_ussd", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, { &hf_tp_pa_set_up_call, - { "Proactive SIM: SET UP CALL", "iso7816.tp.pa.set_up_call", + { "Proactive SIM: SET UP CALL", "gsm_sim.tp.pa.set_up_call", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL } }, { &hf_tp_pa_set_up_menu, - { "Proactive SIM: SET UP MENU", "iso7816.tp.pa.set_up_menu", + { "Proactive SIM: SET UP MENU", "gsm_sim.tp.pa.set_up_menu", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, NULL, HFILL } }, { &hf_tp_pa_prov_loci, - { "Proactive SIM: PROVIDE LOCAL INFORMATION", "iso7816.tp.pa.prov_loci", + { "Proactive SIM: PROVIDE LOCAL INFORMATION", "gsm_sim.tp.pa.prov_loci", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, NULL, HFILL } }, { &hf_tp_pa_prov_loci_nmr, - { "Proactive SIM: PROVIDE LOCAL INFORMATION (NMR)", "iso7816.tp.pa.prov_loci_nmr", + { "Proactive SIM: PROVIDE LOCAL INFORMATION (NMR)", "gsm_sim.tp.pa.prov_loci_nmr", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL } }, /* Terminal Profile Byte 5 */ { &hf_tprof_b5, - { "Terminal Profile Byte 5 (Event driven information)", "iso7816.tp.b5", + { "Terminal Profile Byte 5 (Event driven information)", "gsm_sim.tp.b5", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_pa_evt_list, - { "Proactive SIM: SET UP EVENT LIST", "iso7816.tp.pa.set_up_evt_list", + { "Proactive SIM: SET UP EVENT LIST", "gsm_sim.tp.pa.set_up_evt_list", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_ev_mt_call, - { "Event: MT call", "iso7816.tp.evt.mt_call", + { "Event: MT call", "gsm_sim.tp.evt.mt_call", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_ev_call_connected, - { "Event: Call connected", "iso7816.tp.evt.call_conn", + { "Event: Call connected", "gsm_sim.tp.evt.call_conn", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_ev_call_disconnected, - { "Event: Call disconnected", "iso7816.tp.evt.call_disc", + { "Event: Call disconnected", "gsm_sim.tp.evt.call_disc", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, { &hf_tp_ev_location_status, - { "Event: Location status", "iso7816.tp.evt.loc_status", + { "Event: Location status", "gsm_sim.tp.evt.loc_status", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL } }, { &hf_tp_ev_user_activity, - { "Event: User activity", "iso7816.tp.evt.user_activity", + { "Event: User activity", "gsm_sim.tp.evt.user_activity", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, NULL, HFILL } }, { &hf_tp_ev_idle_screen, - { "Event: Idle screen available", "iso7816.tp.evt.idle_screen", + { "Event: Idle screen available", "gsm_sim.tp.evt.idle_screen", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, NULL, HFILL } }, { &hf_tp_ev_cardreader_status, - { "Event: Cardreader status", "iso7816.tp.evt.card_status", + { "Event: Cardreader status", "gsm_sim.tp.evt.card_status", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL } }, /* Terminal Profile Byte 6 */ { &hf_tprof_b6, - { "Terminal Profile Byte 6 (Event driven information extension)", "iso7816.tp.b6", + { "Terminal Profile Byte 6 (Event driven information extension)", "gsm_sim.tp.b6", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_ev_lang_sel, - { "Event: Language Selection", "iso7816.tp.evt.lang_sel", + { "Event: Language Selection", "gsm_sim.tp.evt.lang_sel", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_ev_brows_term, - { "Event: Browser Termination", "iso7816.tp.evt.brows_term", + { "Event: Browser Termination", "gsm_sim.tp.evt.brows_term", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_ev_data_avail, - { "Event: Data Available", "iso7816.tp.evt.data_avail", + { "Event: Data Available", "gsm_sim.tp.evt.data_avail", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_ev_chan_status, - { "Event: Channel Status", "iso7816.tp.evt.chan_status", + { "Event: Channel Status", "gsm_sim.tp.evt.chan_status", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, /* Terminal Profile Byte 7 */ { &hf_tprof_b7, - { "Terminal Profile Byte 7 (Multiple card proactive commands)", "iso7816.tp.b7", + { "Terminal Profile Byte 7 (Multiple card proactive commands)", "gsm_sim.tp.b7", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_pa_power_on, - { "Proactive SIM: POWER ON CARD", "iso7816.tp.pa.power_on_card", + { "Proactive SIM: POWER ON CARD", "gsm_sim.tp.pa.power_on_card", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_pa_power_off, - { "Proactive SIM: POWER OFF CARD", "iso7816.tp.pa.power_off_card", + { "Proactive SIM: POWER OFF CARD", "gsm_sim.tp.pa.power_off_card", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_pa_perform_card_apdu, - { "Proactive SIM: PERFORM CARD APDU", "iso7816.tp.pa.perf_card_apdu", + { "Proactive SIM: PERFORM CARD APDU", "gsm_sim.tp.pa.perf_card_apdu", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_pa_get_reader_status, - { "Proactive SIM: GET READER STATUS (status)", "iso7816.tp.pa.get_rdr_status", + { "Proactive SIM: GET READER STATUS (status)", "gsm_sim.tp.pa.get_rdr_status", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, { &hf_tp_pa_get_reader_status_id, - { "Proactive SIM: GET READER STATUS (identifier)", "iso7816.tp.pa.get_rdr_status_id", + { "Proactive SIM: GET READER STATUS (identifier)", "gsm_sim.tp.pa.get_rdr_status_id", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL } }, /* Terminal Profile Byte 8 */ { &hf_tprof_b8, - { "Terminal Profile Byte 8 (Proactive SIM)", "iso7816.tp.b8", + { "Terminal Profile Byte 8 (Proactive SIM)", "gsm_sim.tp.b8", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_pa_timer_start_stop, - { "Proactive SIM: TIMER MANAGEMENT (start, stop)", "iso7816.tp.pa.timer_start_stop", + { "Proactive SIM: TIMER MANAGEMENT (start, stop)", "gsm_sim.tp.pa.timer_start_stop", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_pa_timer_get_current, - { "Proactive SIM: TIMER MANAGEMENT (get current value)", "iso7816.tp.pa.timer_get_current", + { "Proactive SIM: TIMER MANAGEMENT (get current value)", "gsm_sim.tp.pa.timer_get_current", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_pa_prov_loci_date_tz, - { "Proactive SIM: PROVIDE LOCAL INFORMATION (date, time, tz)", "iso7816.tp.pa.prov_loci_date", + { "Proactive SIM: PROVIDE LOCAL INFORMATION (date, time, tz)", "gsm_sim.tp.pa.prov_loci_date", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_pa_get_inkey_binary, - { "Proactive SIM: Binary choice in GET INKEY", "iso7816.tp.pa.get_inkey_bin", + { "Proactive SIM: Binary choice in GET INKEY", "gsm_sim.tp.pa.get_inkey_bin", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, { &hf_tp_pa_set_up_idle_mode_text, - { "Proactive SIM: SET UP IDLE MODE TEXT", "iso7816.tp.pa.set_up_idle_text", + { "Proactive SIM: SET UP IDLE MODE TEXT", "gsm_sim.tp.pa.set_up_idle_text", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL } }, { &hf_tp_pa_run_at_command, - { "Proactive SIM: RUN AT COMMAND", "iso7816.tp.pa.run_at_command", + { "Proactive SIM: RUN AT COMMAND", "gsm_sim.tp.pa.run_at_command", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, NULL, HFILL } }, { &hf_tp_pa_2nd_alpha_setup_call, - { "Proactive SIM: 2nd alpha identifier in SET UP CALL", "iso7816.tp.pa.2nd_alpha_id", + { "Proactive SIM: 2nd alpha identifier in SET UP CALL", "gsm_sim.tp.pa.2nd_alpha_id", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, NULL, HFILL } }, { &hf_tp_pa_2nd_capability_param, - { "Proactive SIM: 2nd capability config param", "iso7816.tp.pa.2nd_capa_conf", + { "Proactive SIM: 2nd capability config param", "gsm_sim.tp.pa.2nd_capa_conf", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL } }, /* Terminal Profile Byte 9 */ { &hf_tprof_b9, - { "Terminal Profile Byte 9", "iso7816.tp.b9", + { "Terminal Profile Byte 9", "gsm_sim.tp.b9", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, /* Terminal Profile Byte 10 */ { &hf_tprof_b10, - { "Terminal Profile Byte 10", "iso7816.tp.b10", + { "Terminal Profile Byte 10", "gsm_sim.tp.b10", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, /* Terminal Profile Byte 11 */ { &hf_tprof_b11, - { "Terminal Profile Byte 11", "iso7816.tp.b11", + { "Terminal Profile Byte 11", "gsm_sim.tp.b11", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, /* Terminal Profile Byte 12 */ { &hf_tprof_b12, - { "Terminal Profile Byte 12", "iso7816.tp.b12", + { "Terminal Profile Byte 12", "gsm_sim.tp.b12", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_pa_open_chan, - { "Proactive SIM: OPEN CHANNEL", "iso7816.tp.pa.open_chan", + { "Proactive SIM: OPEN CHANNEL", "gsm_sim.tp.pa.open_chan", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_pa_close_chan, - { "Proactive SIM: CLOSE CHANNEL", "iso7816.tp.pa.close_chan", + { "Proactive SIM: CLOSE CHANNEL", "gsm_sim.tp.pa.close_chan", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_pa_recv_data, - { "Proactive SIM: RECEIVE DATA", "iso7816.tp.pa.recv_data", + { "Proactive SIM: RECEIVE DATA", "gsm_sim.tp.pa.recv_data", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL } }, { &hf_tp_pa_send_data, - { "Proactive SIM: SEND DATA", "iso7816.tp.pa.send_data", + { "Proactive SIM: SEND DATA", "gsm_sim.tp.pa.send_data", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x08, NULL, HFILL } }, { &hf_tp_pa_get_chan_status, - { "Proactive SIM: GET CHANNEL STATUS", "iso7816.tp.pa.get_chan_status", + { "Proactive SIM: GET CHANNEL STATUS", "gsm_sim.tp.pa.get_chan_status", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL } }, /* Terminal Profile Byte 13 */ { &hf_tprof_b13, - { "Terminal Profile Byte 13 (Bearer Independent protocol)", "iso7816.tp.b13", + { "Terminal Profile Byte 13 (Bearer Independent protocol)", "gsm_sim.tp.b13", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_bip_csd, - { "CSD bearer", "iso7816.tp.bip.csd", + { "CSD bearer", "gsm_sim.tp.bip.csd", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_bip_gprs, - { "GPRS bearer", "iso7816.tp.bip.gprs", + { "GPRS bearer", "gsm_sim.tp.bip.gprs", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, { &hf_tp_num_chans, - { "Number of Channels", "iso7816.tp.num_chans", + { "Number of Channels", "gsm_sim.tp.num_chans", FT_UINT8, BASE_DEC, NULL, 0xe0, NULL, HFILL } }, @@ -1524,97 +1524,97 @@ proto_register_gsm_sim(void) /* Terminal Profile Byte 14 */ { &hf_tprof_b14, - { "Terminal Profile Byte 14 (Screen height)", "iso7816.tp.b14", + { "Terminal Profile Byte 14 (Screen height)", "gsm_sim.tp.b14", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_char_height, - { "Display height (chars)", "iso7816.tp.display.height", + { "Display height (chars)", "gsm_sim.tp.display.height", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }, }, { &hf_tp_sizing_supp, - { "Screen Sizing", "iso7816.tp.disp_sizing", + { "Screen Sizing", "gsm_sim.tp.disp_sizing", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL }, }, /* Terminal Profile Byte 15 */ { &hf_tprof_b15, - { "Terminal Profile Byte 15 (Screen width)", "iso7816.tp.b15", + { "Terminal Profile Byte 15 (Screen width)", "gsm_sim.tp.b15", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_char_width, - { "Display width (chars)", "iso7816.tp.display.width", + { "Display width (chars)", "gsm_sim.tp.display.width", FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL }, }, { &hf_tp_var_fonts, - { "Variable-size fonts", "iso7816.tp.var_fonts", + { "Variable-size fonts", "gsm_sim.tp.var_fonts", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL }, }, /* Terminal Profile Byte 16 */ { &hf_tprof_b16, - { "Terminal Profile Byte 16 (Screen effects)", "iso7816.tp.b16", + { "Terminal Profile Byte 16 (Screen effects)", "gsm_sim.tp.b16", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_display_resize, - { "Display resize", "iso7816.tp.display.resize", + { "Display resize", "gsm_sim.tp.display.resize", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL }, }, { &hf_tp_text_wrapping, - { "Text Wrapping", "iso7816.tp.display.wrapping", + { "Text Wrapping", "gsm_sim.tp.display.wrapping", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL }, }, { &hf_tp_text_scrolling, - { "Text Scrolling", "iso7816.tp.display.scrolling", + { "Text Scrolling", "gsm_sim.tp.display.scrolling", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x04, NULL, HFILL }, }, { &hf_tp_width_red_menu, - { "Width reduction when in menu", "iso7816.tp.display.width_red_menu", + { "Width reduction when in menu", "gsm_sim.tp.display.width_red_menu", FT_UINT8, BASE_DEC, NULL, 0xe0, NULL, HFILL }, }, /* Terminal Profile Byte 17 */ { &hf_tprof_b17, - { "Terminal Profile Byte 17 (Bearer independent protocol)", "iso7816.tp.b17", + { "Terminal Profile Byte 17 (Bearer independent protocol)", "gsm_sim.tp.b17", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_bip_tcp, - { "TCP transport", "iso7816.tp.bip.tcp", + { "TCP transport", "gsm_sim.tp.bip.tcp", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x01, NULL, HFILL } }, { &hf_tp_bip_udp, - { "UDP transport", "iso7816.tp.bip.udp", + { "UDP transport", "gsm_sim.tp.bip.udp", FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x02, NULL, HFILL } }, /* Terminal Profile Byte 18 */ { &hf_tprof_b18, - { "Terminal Profile Byte 18 (Bearer independent protocol)", "iso7816.tp.b18", + { "Terminal Profile Byte 18 (Bearer independent protocol)", "gsm_sim.tp.b18", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, /* Terminal Profile Byte 19 */ { &hf_tprof_b19, - { "Terminal Profile Byte 19", "iso7816.tp.b19", + { "Terminal Profile Byte 19", "gsm_sim.tp.b19", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }, }, { &hf_tp_tia_eia_version, - { "TIA/EIA Version", "iso7816.tp.tia_eia_version", + { "TIA/EIA Version", "gsm_sim.tp.tia_eia_version", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL } }, @@ -1626,17 +1626,17 @@ proto_register_gsm_sim(void) }, { &hf_seek_mode, - { "Seek Mode", "iso7816.seek_mode", + { "Seek Mode", "gsm_sim.seek_mode", FT_UINT8, BASE_HEX, VALS(seek_mode_vals), 0x0F, NULL, HFILL }, }, { &hf_seek_type, - { "Seek Type", "iso7816.seek_type", + { "Seek Type", "gsm_sim.seek_type", FT_UINT8, BASE_DEC, VALS(seek_type_vals), 0x0F, NULL, HFILL }, }, { &hf_seek_rec_nr, - { "Seek Record Number", "iso7816.seek_rec_nr", + { "Seek Record Number", "gsm_sim.seek_rec_nr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }, }, }; -- cgit v1.2.3