aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isi.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-isi.c')
-rw-r--r--epan/dissectors/packet-isi.c288
1 files changed, 144 insertions, 144 deletions
diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c
index f0f2b5d664..cc40c1876b 100644
--- a/epan/dissectors/packet-isi.c
+++ b/epan/dissectors/packet-isi.c
@@ -537,130 +537,130 @@ static const value_string isi_sms_common_message_id[] = {
};
-static int proto_isi = -1;
-
-static int hf_isi_rdev = -1;
-static int hf_isi_sdev = -1;
-static int hf_isi_res = -1;
-static int hf_isi_len = -1;
-static int hf_isi_robj = -1;
-static int hf_isi_sobj = -1;
-static int hf_isi_id = -1;
-
-static int hf_isi_sim_auth_payload = -1;
-static int hf_isi_sim_auth_cmd = -1;
-static int hf_isi_sim_auth_status_rsp = -1;
-static int hf_isi_sim_auth_protection_req = -1;
-static int hf_isi_sim_auth_protection_rsp = -1;
-static int hf_isi_sim_auth_pin = -1;
-static int hf_isi_sim_auth_puk = -1;
-static int hf_isi_sim_auth_new_pin = -1;
-static int hf_isi_sim_auth_pw_type = -1;
-static int hf_isi_sim_auth_indication = -1;
-static int hf_isi_sim_auth_indication_cfg = -1;
-
-static int hf_isi_sim_payload = -1;
-static int hf_isi_sim_message_id = -1;
-static int hf_isi_sim_service_type = -1;
-static int hf_isi_sim_cause = -1;
-static int hf_isi_sim_secondary_cause = -1;
-static int hf_isi_sim_subblock_count = -1;
-static int hf_isi_sim_subblock_size = -1;
-static int hf_isi_sim_pb_subblock = -1;
-static int hf_isi_sim_pb_type = -1;
-static int hf_isi_sim_pb_location = -1;
-static int hf_isi_sim_pb_tag_count = -1;
-static int hf_isi_sim_pb_tag = -1;
-static int hf_isi_sim_imsi_length = -1;
-
-static int hf_isi_gss_payload = -1;
-static int hf_isi_gss_message_id = -1;
+static int proto_isi;
+
+static int hf_isi_rdev;
+static int hf_isi_sdev;
+static int hf_isi_res;
+static int hf_isi_len;
+static int hf_isi_robj;
+static int hf_isi_sobj;
+static int hf_isi_id;
+
+static int hf_isi_sim_auth_payload;
+static int hf_isi_sim_auth_cmd;
+static int hf_isi_sim_auth_status_rsp;
+static int hf_isi_sim_auth_protection_req;
+static int hf_isi_sim_auth_protection_rsp;
+static int hf_isi_sim_auth_pin;
+static int hf_isi_sim_auth_puk;
+static int hf_isi_sim_auth_new_pin;
+static int hf_isi_sim_auth_pw_type;
+static int hf_isi_sim_auth_indication;
+static int hf_isi_sim_auth_indication_cfg;
+
+static int hf_isi_sim_payload;
+static int hf_isi_sim_message_id;
+static int hf_isi_sim_service_type;
+static int hf_isi_sim_cause;
+static int hf_isi_sim_secondary_cause;
+static int hf_isi_sim_subblock_count;
+static int hf_isi_sim_subblock_size;
+static int hf_isi_sim_pb_subblock;
+static int hf_isi_sim_pb_type;
+static int hf_isi_sim_pb_location;
+static int hf_isi_sim_pb_tag_count;
+static int hf_isi_sim_pb_tag;
+static int hf_isi_sim_imsi_length;
+
+static int hf_isi_gss_payload;
+static int hf_isi_gss_message_id;
#if 0
-static int hf_isi_gss_subblock = -1;
+static int hf_isi_gss_subblock;
#endif
-static int hf_isi_gss_operation = -1;
-static int hf_isi_gss_subblock_count = -1;
-static int hf_isi_gss_cause = -1;
-static int hf_isi_gss_common_message_id = -1;
-
-static int hf_isi_gps_payload = -1;
-static int hf_isi_gps_cmd = -1;
-static int hf_isi_gps_sub_pkgs = -1;
-static int hf_isi_gps_sub_type = -1;
-static int hf_isi_gps_sub_len = -1;
-static int hf_isi_gps_status = -1;
-static int hf_isi_gps_year = -1;
-static int hf_isi_gps_month = -1;
-static int hf_isi_gps_day = -1;
-static int hf_isi_gps_hour = -1;
-static int hf_isi_gps_minute = -1;
-static int hf_isi_gps_second = -1;
-static int hf_isi_gps_latitude = -1;
-static int hf_isi_gps_longitude = -1;
-static int hf_isi_gps_eph = -1;
-static int hf_isi_gps_altitude = -1;
-static int hf_isi_gps_epv = -1;
-static int hf_isi_gps_course = -1;
-static int hf_isi_gps_epd = -1;
-static int hf_isi_gps_speed = -1;
-static int hf_isi_gps_eps = -1;
-static int hf_isi_gps_climb = -1;
-static int hf_isi_gps_epc = -1;
-static int hf_isi_gps_mcc = -1;
-static int hf_isi_gps_mnc = -1;
-static int hf_isi_gps_lac = -1;
-static int hf_isi_gps_cid = -1;
-static int hf_isi_gps_ucid = -1;
-static int hf_isi_gps_satellites = -1;
-static int hf_isi_gps_prn = -1;
-static int hf_isi_gps_sat_used = -1;
-static int hf_isi_gps_sat_strength = -1;
-static int hf_isi_gps_sat_elevation = -1;
-static int hf_isi_gps_sat_azimuth = -1;
-
-static int hf_isi_ss_payload = -1;
-static int hf_isi_ss_message_id = -1;
-static int hf_isi_ss_ussd_type = -1;
-static int hf_isi_ss_subblock_count = -1;
-static int hf_isi_ss_subblock = -1;
-static int hf_isi_ss_operation = -1;
-static int hf_isi_ss_service_code = -1;
-static int hf_isi_ss_status_indication = -1;
-static int hf_isi_ss_ussd_length = -1;
-static int hf_isi_ss_common_message_id = -1;
-
-static int hf_isi_network_payload = -1;
-static int hf_isi_network_cmd = -1;
-static int hf_isi_network_data_sub_pkgs = -1;
-static int hf_isi_network_status_sub_type = -1;
-static int hf_isi_network_status_sub_len = -1;
-static int hf_isi_network_status_sub_lac = -1;
-static int hf_isi_network_status_sub_cid = -1;
-static int hf_isi_network_status_sub_msg = -1;
-static int hf_isi_network_status_sub_msg_len = -1;
-static int hf_isi_network_cell_info_sub_type = -1;
-static int hf_isi_network_cell_info_sub_len = -1;
-static int hf_isi_network_cell_info_sub_operator = -1;
-static int hf_isi_network_gsm_band_900 = -1;
-static int hf_isi_network_gsm_band_1800 = -1;
-static int hf_isi_network_gsm_band_1900 = -1;
-static int hf_isi_network_gsm_band_850 = -1;
-
-static int hf_isi_sms_payload = -1;
-static int hf_isi_sms_message_id = -1;
-static int hf_isi_sms_routing_command = -1;
-static int hf_isi_sms_routing_mode = -1;
-static int hf_isi_sms_route = -1;
-static int hf_isi_sms_subblock_count = -1;
-static int hf_isi_sms_send_status = -1;
-static int hf_isi_sms_common_message_id = -1;
-
-static int ett_isi = -1;
-static int ett_isi_msg = -1;
-static int ett_isi_network_gsm_band_info = -1;
-
-static expert_field ei_isi_len = EI_INIT;
-static expert_field ei_isi_unsupported_packet = EI_INIT;
+static int hf_isi_gss_operation;
+static int hf_isi_gss_subblock_count;
+static int hf_isi_gss_cause;
+static int hf_isi_gss_common_message_id;
+
+static int hf_isi_gps_payload;
+static int hf_isi_gps_cmd;
+static int hf_isi_gps_sub_pkgs;
+static int hf_isi_gps_sub_type;
+static int hf_isi_gps_sub_len;
+static int hf_isi_gps_status;
+static int hf_isi_gps_year;
+static int hf_isi_gps_month;
+static int hf_isi_gps_day;
+static int hf_isi_gps_hour;
+static int hf_isi_gps_minute;
+static int hf_isi_gps_second;
+static int hf_isi_gps_latitude;
+static int hf_isi_gps_longitude;
+static int hf_isi_gps_eph;
+static int hf_isi_gps_altitude;
+static int hf_isi_gps_epv;
+static int hf_isi_gps_course;
+static int hf_isi_gps_epd;
+static int hf_isi_gps_speed;
+static int hf_isi_gps_eps;
+static int hf_isi_gps_climb;
+static int hf_isi_gps_epc;
+static int hf_isi_gps_mcc;
+static int hf_isi_gps_mnc;
+static int hf_isi_gps_lac;
+static int hf_isi_gps_cid;
+static int hf_isi_gps_ucid;
+static int hf_isi_gps_satellites;
+static int hf_isi_gps_prn;
+static int hf_isi_gps_sat_used;
+static int hf_isi_gps_sat_strength;
+static int hf_isi_gps_sat_elevation;
+static int hf_isi_gps_sat_azimuth;
+
+static int hf_isi_ss_payload;
+static int hf_isi_ss_message_id;
+static int hf_isi_ss_ussd_type;
+static int hf_isi_ss_subblock_count;
+static int hf_isi_ss_subblock;
+static int hf_isi_ss_operation;
+static int hf_isi_ss_service_code;
+static int hf_isi_ss_status_indication;
+static int hf_isi_ss_ussd_length;
+static int hf_isi_ss_common_message_id;
+
+static int hf_isi_network_payload;
+static int hf_isi_network_cmd;
+static int hf_isi_network_data_sub_pkgs;
+static int hf_isi_network_status_sub_type;
+static int hf_isi_network_status_sub_len;
+static int hf_isi_network_status_sub_lac;
+static int hf_isi_network_status_sub_cid;
+static int hf_isi_network_status_sub_msg;
+static int hf_isi_network_status_sub_msg_len;
+static int hf_isi_network_cell_info_sub_type;
+static int hf_isi_network_cell_info_sub_len;
+static int hf_isi_network_cell_info_sub_operator;
+static int hf_isi_network_gsm_band_900;
+static int hf_isi_network_gsm_band_1800;
+static int hf_isi_network_gsm_band_1900;
+static int hf_isi_network_gsm_band_850;
+
+static int hf_isi_sms_payload;
+static int hf_isi_sms_message_id;
+static int hf_isi_sms_routing_command;
+static int hf_isi_sms_routing_mode;
+static int hf_isi_sms_route;
+static int hf_isi_sms_subblock_count;
+static int hf_isi_sms_send_status;
+static int hf_isi_sms_common_message_id;
+
+static int ett_isi;
+static int ett_isi_msg;
+static int ett_isi_network_gsm_band_info;
+
+static expert_field ei_isi_len;
+static expert_field ei_isi_unsupported_packet;
static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree, void* data _U_) {
proto_item *item;
@@ -679,11 +679,11 @@ static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *i
cmd = tvb_get_guint8(tvb, 2);
switch(cmd) {
case 0x00: /* DISABLE */
- proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII);
col_set_str(pinfo->cinfo, COL_INFO, "disable SIM startup protection");
break;
case 0x01: /* ENABLE */
- proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 3, -1, ENC_ASCII);
col_set_str(pinfo->cinfo, COL_INFO, "enable SIM startup protection");
break;
case 0x04: /* STATUS */
@@ -707,8 +707,8 @@ static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *i
switch(code) {
case 0x02: /* PIN */
col_set_str(pinfo->cinfo, COL_INFO, "update SIM PIN");
- proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII|ENC_NA);
- proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII);
+ proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII);
break;
case 0x03: /* PUK */
col_set_str(pinfo->cinfo, COL_INFO, "update SIM PUK");
@@ -730,12 +730,12 @@ static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *i
switch(code) {
case 0x02: /* PIN */
col_set_str(pinfo->cinfo, COL_INFO, "SIM Authentication with PIN");
- proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_isi_sim_auth_pin, tvb, 2, 11, ENC_ASCII);
break;
case 0x03: /* PUK */
col_set_str(pinfo->cinfo, COL_INFO, "SIM Authentication with PUK");
- proto_tree_add_item(tree, hf_isi_sim_auth_puk, tvb, 2, 11, ENC_ASCII|ENC_NA);
- proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tree, hf_isi_sim_auth_puk, tvb, 2, 11, ENC_ASCII);
+ proto_tree_add_item(tree, hf_isi_sim_auth_new_pin, tvb, 13, 11, ENC_ASCII);
break;
default:
col_set_str(pinfo->cinfo, COL_INFO, "unknown SIM Authentication request");
@@ -907,7 +907,7 @@ static int dissect_isi_sim(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitre
next_tvb = tvb_new_subset_remaining(tvb, 0);
proto_tree_add_item(tree, hf_isi_sim_imsi_byte_1, next_tvb, 4, 1, ENC_LITTLE_ENDIAN);
dissect_e212_mcc_mnc(next_tvb, pinfo, tree, 4, FALSE );
- proto_tree_add_item(tree, hf_E212_msin, tvb, 2, 7, FALSE);
+ proto_tree_add_item(tree, hf_E212_msin, tvb, 2, 7, ENC_BIG_ENDIAN);
*/
@@ -1100,7 +1100,7 @@ static int dissect_isi_gss(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitre
break;
case 0x01: /* GSS_CS_SERVICE_RESP */
- /* proto_tree_add_item(tree, hf_isi_gss_service_type, tvb, 1, 1, FALSE); */
+ /* proto_tree_add_item(tree, hf_isi_gss_service_type, tvb, 1, 1, ENC_NA); */
code = tvb_get_guint8(tvb, 1);
switch(code) {
/* case 0x9C:
@@ -1359,7 +1359,7 @@ static int dissect_isi_ss(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree
break;
case 0x02: /* SS_SERVICE_FAILED_RESP */
- /* proto_tree_add_item(tree, hf_isi_ss_service_type, tvb, 1, 1, FALSE); */
+ /* proto_tree_add_item(tree, hf_isi_ss_service_type, tvb, 1, 1, ENC_NA); */
code = tvb_get_guint8(tvb, 1);
switch(code) {
/* case 0x2F:
@@ -1389,7 +1389,7 @@ static int dissect_isi_ss(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree
break;
case 0x05: /* SS_GSM_USSD_SEND_RESP */
- /* proto_tree_add_item(tree, hf_isi_ss_service_type, tvb, 1, 1, FALSE); */
+ /* proto_tree_add_item(tree, hf_isi_ss_service_type, tvb, 1, 1, ENC_NA); */
code = tvb_get_guint8(tvb, 1);
switch(code) {
/* case 0x2F:
@@ -1670,7 +1670,7 @@ static int dissect_isi_sms(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitre
break;
case 0x07: /* SMS_PP_ROUTING_RESP */
- /* proto_tree_add_item(tree, hf_isi_sms_service_type, tvb, 1, 1, FALSE); */
+ /* proto_tree_add_item(tree, hf_isi_sms_service_type, tvb, 1, 1, ENC_NA); */
code = tvb_get_guint8(tvb, 1);
switch(code) {
/* case 0x2F:
@@ -1686,10 +1686,10 @@ static int dissect_isi_sms(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitre
proto_tree_add_item(tree, hf_isi_sms_routing_command, tvb, 1, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_isi_sms_routing_mode, tvb, 2, 1, ENC_BIG_ENDIAN);
#if 0
- proto_tree_add_item(tree, hf_isi_sms_cb_subject_list_type, tvb, 3, 1, FALSE);
- proto_tree_add_item(tree, hf_isi_sms_cb_subject_count, tvb, 4, 1, FALSE);
- proto_tree_add_item(tree, hf_isi_sms_cb_language_count, tvb, 5, 1, FALSE);
- proto_tree_add_item(tree, hf_isi_sms_cb_range, tvb, 6, 1, FALSE);
+ proto_tree_add_item(tree, hf_isi_sms_cb_subject_list_type, tvb, 3, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_isi_sms_cb_subject_count, tvb, 4, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_isi_sms_cb_language_count, tvb, 5, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_isi_sms_cb_range, tvb, 6, 1, ENC_BIG_ENDIAN);
#endif
code = tvb_get_guint8(tvb, 1);
switch(code) {
@@ -1707,8 +1707,8 @@ static int dissect_isi_sms(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitre
case 0x0C: /* SMS_GSM_CB_ROUTING_RESP */
#if 0
- proto_tree_add_item(tree, hf_isi_sms_operation, tvb, 1, 1, FALSE);
- proto_tree_add_item(tree, hf_isi_sms_service_code, tvb, 2, 1, FALSE);
+ proto_tree_add_item(tree, hf_isi_sms_operation, tvb, 1, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_isi_sms_service_code, tvb, 2, 1, ENC_BIG_ENDIAN);
#endif
code = tvb_get_guint8(tvb, 1);
switch(code) {
@@ -1873,7 +1873,7 @@ proto_register_isi(void)
{ &hf_isi_sim_auth_protection_req,
{ "Protection Request", "isi.sim.auth.request.protection", FT_UINT8, BASE_HEX, VALS(isi_sim_auth_protection_req), 0x0, NULL, HFILL }},
{ &hf_isi_sim_auth_protection_rsp,
- { "Protection Response", "isi.sim.auth.response.protection", FT_BOOLEAN, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+ { "Protection Response", "isi.sim.auth.response.protection", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_isi_sim_auth_status_rsp,
{ "Status Response", "isi.sim.auth.response.status", FT_UINT8, BASE_HEX, VALS(isi_sim_auth_resp), 0x0, NULL, HFILL }},
{ &hf_isi_sim_auth_indication,
@@ -1894,15 +1894,15 @@ proto_register_isi(void)
{ &hf_isi_sim_secondary_cause,
{ "Secondary Cause", "isi.sim.secondary_cause", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &isi_sim_cause_ext, 0x0, NULL, HFILL }},
{&hf_isi_sim_subblock_count,
- { "Subblock Count", "isi.sim.subblock_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "Subblock Count", "isi.sim.subblock_count", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{&hf_isi_sim_subblock_size,
- { "Subblock Size", "isi.sim.subblock_size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "Subblock Size", "isi.sim.subblock_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_isi_sim_pb_subblock,
{ "Subblock", "isi.sim.pb.subblock", FT_UINT8, BASE_HEX, VALS(isi_sim_pb_subblock), 0x0, NULL, HFILL }},
{ &hf_isi_sim_pb_type,
{ "Phonebook Type", "isi.sim.pb.type", FT_UINT8, BASE_HEX, VALS(isi_sim_pb_type), 0x0, NULL, HFILL }},
{&hf_isi_sim_pb_location,
- { "Phonebook Location", "isi.sim.pb.location", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+ { "Phonebook Location", "isi.sim.pb.location", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{&hf_isi_sim_pb_tag_count,
{ "Tag Count", "isi.sim.pb.tag.count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_isi_sim_pb_tag,
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 02:33:50 +0000