From 3ba288c3960866450e0a065e05b9ae682d825f72 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 15 Jun 2010 11:03:53 -0500 Subject: [PATCH] stkutil: Minor style cleanups in stkutil --- src/stkutil.c | 3 + src/stkutil.h | 217 ++++++++++++++++++++++++++------------------------ 2 files changed, 114 insertions(+), 106 deletions(-) diff --git a/src/stkutil.c b/src/stkutil.c index 9d25143a..fc7efcee 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -4236,6 +4236,7 @@ static gboolean build_dataobj_pdp_context_params(struct stk_tlv_builder *tlv, if (params->len < 1) return TRUE; + if (params->len > 0x7f) return FALSE; @@ -4527,6 +4528,7 @@ static gboolean build_dataobj_eps_pdn_conn_params(struct stk_tlv_builder *tlv, if (params->len < 1) return TRUE; + if (params->len > 0x7f) return FALSE; @@ -4924,6 +4926,7 @@ static gboolean build_envelope_call_control( NULL); break; } + if (ok != TRUE) return FALSE; diff --git a/src/stkutil.h b/src/stkutil.h index eb59fed2..79502cd1 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -156,7 +156,7 @@ enum stk_data_object_type { STK_DATA_OBJECT_TYPE_SERVICE_AVAILABILITY = 0x45, STK_DATA_OBJECT_TYPE_ESN = 0x46, STK_DATA_OBJECT_TYPE_NETWORK_ACCESS_NAME = 0x47, - STK_DATA_OBJECT_TYPE_CDMA_SMS_TPDU = 0x48, + STK_DATA_OBJECT_TYPE_CDMA_SMS_TPDU = 0x48, STK_DATA_OBJECT_TYPE_REMOTE_ENTITY_ADDRESS = 0x49, STK_DATA_OBJECT_TYPE_I_WLAN_ID_TAG = 0x4A, STK_DATA_OBJECT_TYPE_I_WLAN_ACCESS_STATUS = 0x4B, @@ -190,27 +190,27 @@ enum stk_data_object_type { }; enum stk_device_identity_type { - STK_DEVICE_IDENTITY_TYPE_KEYPAD = 0x01, - STK_DEVICE_IDENTITY_TYPE_DISPLAY = 0x02, - STK_DEVICE_IDENTITY_TYPE_EARPIECE = 0x03, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_0 = 0x10, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_1 = 0x11, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_2 = 0x12, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_3 = 0x13, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_4 = 0x14, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_5 = 0x15, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_6 = 0x16, - STK_DEVICE_IDENTITY_TYPE_CARD_READER_7 = 0x17, - STK_DEVICE_IDENTITY_TYPE_CHANNEL_1 = 0x21, - STK_DEVICE_IDENTITY_TYPE_CHANNEL_7 = 0x27, - STK_DEVICE_IDENTITY_TYPE_UICC = 0x81, - STK_DEVICE_IDENTITY_TYPE_TERMINAL = 0x82, - STK_DEVICE_IDENTITY_TYPE_NETWORK = 0x83, + STK_DEVICE_IDENTITY_TYPE_KEYPAD = 0x01, + STK_DEVICE_IDENTITY_TYPE_DISPLAY = 0x02, + STK_DEVICE_IDENTITY_TYPE_EARPIECE = 0x03, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_0 = 0x10, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_1 = 0x11, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_2 = 0x12, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_3 = 0x13, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_4 = 0x14, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_5 = 0x15, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_6 = 0x16, + STK_DEVICE_IDENTITY_TYPE_CARD_READER_7 = 0x17, + STK_DEVICE_IDENTITY_TYPE_CHANNEL_1 = 0x21, + STK_DEVICE_IDENTITY_TYPE_CHANNEL_7 = 0x27, + STK_DEVICE_IDENTITY_TYPE_UICC = 0x81, + STK_DEVICE_IDENTITY_TYPE_TERMINAL = 0x82, + STK_DEVICE_IDENTITY_TYPE_NETWORK = 0x83, }; enum stk_qualifier_get_reader_status_type { - STK_QUALIFIER_TYPE_CARD_READER_STATUS = 0x00, - STK_QUALIFIER_TYPE_CARD_READER_ID = 0x01, + STK_QUALIFIER_TYPE_CARD_READER_STATUS = 0x00, + STK_QUALIFIER_TYPE_CARD_READER_ID = 0x01, }; enum stk_duration_type { @@ -316,68 +316,68 @@ enum stk_event_type { }; enum stk_service_state { - STK_NORMAL_SERVICE = 0x00, - STK_LIMITED_SERVICE = 0x01, - STK_NO_SERVICE = 0x02 + STK_NORMAL_SERVICE = 0x00, + STK_LIMITED_SERVICE = 0x01, + STK_NO_SERVICE = 0x02 }; enum stk_icon_qualifier { - STK_ICON_QUALIFIER_TYPE_SELF_EXPLANATORY = 0x00, + STK_ICON_QUALIFIER_TYPE_SELF_EXPLANATORY = 0x00, STK_ICON_QUALIFIER_TYPE_NON_SELF_EXPLANATORY = 0x01 }; enum stk_ins { - STK_INS_DEACTIVATE_FILE = 0x04, - STK_INS_ERASE_RECORDS = 0x0C, - STK_INS_ERASE_BINARY_0E = 0x0E, - STK_INS_ERASE_BINARY_0F = 0x0F, - STK_INS_PERFORM_SCQL_OPERATION = 0x10, - STK_INS_PERFORM_TRANSACTION_OPERATION = 0x12, - STK_INS_PERFORM_USER_OPERATION = 0x14, - STK_INS_VERIFY_20 = 0x20, - STK_INS_VERIFY_21 = 0x21, - STK_INS_MANAGE_SECURITY_ENVIRONMENT = 0x22, - STK_INS_CHANGE_REFERENCE_DATA = 0x24, - STK_INS_DISABLE_VERIFICATION_REQUIREMENT = 0x26, - STK_INS_ENABLE_VERIFICATION_REQUIREMENT = 0x28, - STK_INS_PERFORM_SECURITY_OPERATION = 0x2A, - STK_INS_RESET_RETRY_COUNTER = 0x2C, - STK_INS_ACTIVATE_FILE = 0x44, - STK_INS_GENERATE_ASYMMETRIC_KEY_PAIR = 0x46, - STK_INS_MANAGE_CHANNEL = 0x70, - STK_INS_EXTERNAL_AUTHENTICATE = 0x82, - STK_INS_GET_CHALLENGE = 0x84, - STK_INS_GENERAL_AUTHENTICATE_86 = 0x86, - STK_INS_GENERAL_AUTHENTICATE_87 = 0x87, - STK_INS_INTERNAL_AUTHENTICATE = 0x88, - STK_INS_SEARCH_BINARY_A0 = 0xA0, - STK_INS_SEARCH_BINARY_A1 = 0xA1, - STK_INS_SEARCH_RECORD = 0xA2, - STK_INS_SELECT = 0xA4, - STK_INS_READ_BINARY_B0 = 0xB0, - STK_INS_READ_BINARY_B1 = 0xB1, - STK_INS_READ_RECORDS_B2 = 0xB2, - STK_INS_READ_RECORDS_B3 = 0xB3, - STK_INS_GET_RESPONSE = 0xC0, - STK_INS_ENVELOPE_C2 = 0xC2, + STK_INS_DEACTIVATE_FILE = 0x04, + STK_INS_ERASE_RECORDS = 0x0C, + STK_INS_ERASE_BINARY_0E = 0x0E, + STK_INS_ERASE_BINARY_0F = 0x0F, + STK_INS_PERFORM_SCQL_OPERATION = 0x10, + STK_INS_PERFORM_TRANSACTION_OPERATION = 0x12, + STK_INS_PERFORM_USER_OPERATION = 0x14, + STK_INS_VERIFY_20 = 0x20, + STK_INS_VERIFY_21 = 0x21, + STK_INS_MANAGE_SECURITY_ENVIRONMENT = 0x22, + STK_INS_CHANGE_REFERENCE_DATA = 0x24, + STK_INS_DISABLE_VERIFICATION_REQUIREMENT = 0x26, + STK_INS_ENABLE_VERIFICATION_REQUIREMENT = 0x28, + STK_INS_PERFORM_SECURITY_OPERATION = 0x2A, + STK_INS_RESET_RETRY_COUNTER = 0x2C, + STK_INS_ACTIVATE_FILE = 0x44, + STK_INS_GENERATE_ASYMMETRIC_KEY_PAIR = 0x46, + STK_INS_MANAGE_CHANNEL = 0x70, + STK_INS_EXTERNAL_AUTHENTICATE = 0x82, + STK_INS_GET_CHALLENGE = 0x84, + STK_INS_GENERAL_AUTHENTICATE_86 = 0x86, + STK_INS_GENERAL_AUTHENTICATE_87 = 0x87, + STK_INS_INTERNAL_AUTHENTICATE = 0x88, + STK_INS_SEARCH_BINARY_A0 = 0xA0, + STK_INS_SEARCH_BINARY_A1 = 0xA1, + STK_INS_SEARCH_RECORD = 0xA2, + STK_INS_SELECT = 0xA4, + STK_INS_READ_BINARY_B0 = 0xB0, + STK_INS_READ_BINARY_B1 = 0xB1, + STK_INS_READ_RECORDS_B2 = 0xB2, + STK_INS_READ_RECORDS_B3 = 0xB3, + STK_INS_GET_RESPONSE = 0xC0, + STK_INS_ENVELOPE_C2 = 0xC2, STK_INS_ENVELOPE_C3 = 0xC3, STK_INS_GET_DATA_CA = 0xCA, STK_INS_GET_DATA_CB = 0xCB, STK_INS_WRITE_BINARY_D0 = 0xD0, - STK_INS_WRITE_BINARY_D1 = 0xD1, - STK_INS_WRITE_RECORD = 0xD2, - STK_INS_UPDATE_BINARY_D6 = 0xD6, - STK_INS_UPDATE_BINARY_D7 = 0xD7, - STK_INS_PUT_DATA_DA = 0xDA, - STK_INS_PUT_DATA_DB = 0xDB, - STK_INS_UPDATE_RECORD_DC = 0xDC, - STK_INS_UPDATE_RECORD_DD = 0xDD, - STK_INS_CREATE_FILE = 0xE0, - STK_INS_APPEND_RECORD = 0xE2, - STK_INS_DELETE_FILE = 0xE4, - STK_INS_TERMINATE_DF = 0xE6, - STK_INS_TERMINATE_EF = 0xE8, - STK_INS_TERMINATE_CARD_USAGE = 0xFE + STK_INS_WRITE_BINARY_D1 = 0xD1, + STK_INS_WRITE_RECORD = 0xD2, + STK_INS_UPDATE_BINARY_D6 = 0xD6, + STK_INS_UPDATE_BINARY_D7 = 0xD7, + STK_INS_PUT_DATA_DA = 0xDA, + STK_INS_PUT_DATA_DB = 0xDB, + STK_INS_UPDATE_RECORD_DC = 0xDC, + STK_INS_UPDATE_RECORD_DD = 0xDD, + STK_INS_CREATE_FILE = 0xE0, + STK_INS_APPEND_RECORD = 0xE2, + STK_INS_DELETE_FILE = 0xE4, + STK_INS_TERMINATE_DF = 0xE6, + STK_INS_TERMINATE_EF = 0xE8, + STK_INS_TERMINATE_CARD_USAGE = 0xFE }; enum stk_browser_id { @@ -389,65 +389,65 @@ enum stk_browser_id { }; enum stk_bearer { - STK_BEARER_SMS = 0x00, + STK_BEARER_SMS = 0x00, STK_BEARER_CS_DATA = 0x01, STK_BEARER_GSM_3G = 0x02, - STK_BEARER_PS = 0x03 + STK_BEARER_PS = 0x03 }; enum stk_browser_termination_cause { - STK_BROWSER_USER_TERMINATION = 0x00, - STK_BROWSER_ERROR_TERMINATION = 0x01 + STK_BROWSER_USER_TERMINATION = 0x00, + STK_BROWSER_ERROR_TERMINATION = 0x01 }; enum stk_bearer_type { - STK_BEARER_TYPE_DEFAULT = 0x03, - STK_BEARER_TYPE_INDEPENDENT = 0x04, + STK_BEARER_TYPE_DEFAULT = 0x03, + STK_BEARER_TYPE_INDEPENDENT = 0x04, STK_BEARER_TYPE_BLUETOOTH = 0x05, STK_BEARER_TYPE_IRDA = 0x06, - STK_BEARER_TYPE_RS232 = 0x07, - STK_BEARER_TYPE_PACKET_DATA_SERVICE = 0x08, - STK_BEARER_TYPE_I_WLAN = 0x0a, - STK_BEARER_TYPE_USB = 0x10 + STK_BEARER_TYPE_RS232 = 0x07, + STK_BEARER_TYPE_PACKET_DATA_SERVICE = 0x08, + STK_BEARER_TYPE_I_WLAN = 0x0a, + STK_BEARER_TYPE_USB = 0x10 }; enum stk_address_type { - STK_ADDRESS_AUTO = -1, - STK_ADDRESS_IPV4 = 0x21, - STK_ADDRESS_IPV6 = 0x57 + STK_ADDRESS_AUTO = -1, + STK_ADDRESS_IPV4 = 0x21, + STK_ADDRESS_IPV6 = 0x57 }; enum stk_access_technology_type { - STK_ACCESS_TECHNOLOGY_GSM = 0x00, + STK_ACCESS_TECHNOLOGY_GSM = 0x00, STK_ACCESS_TECHNOLOGY_TIA_EIA_553 = 0x01, STK_ACCESS_TECHNOLOGY_TIA_EIA_136_C = 0x02, - STK_ACCESS_TECHNOLOGY_UTRAN = 0x03, - STK_ACCESS_TECHNOLOGY_TETRA = 0x04, - STK_ACCESS_TECHNOLOGY_TIA_EIA_95 = 0x05, + STK_ACCESS_TECHNOLOGY_UTRAN = 0x03, + STK_ACCESS_TECHNOLOGY_TETRA = 0x04, + STK_ACCESS_TECHNOLOGY_TIA_EIA_95 = 0x05, STK_ACCESS_TECHNOLOGY_CDMA2000_1X = 0x06, - STK_ACCESS_TECHNOLOGY_CDMA2000_HRPD = 0x07, - STK_ACCESS_TECHNOLOGY_EUTRAN = 0x08 + STK_ACCESS_TECHNOLOGY_CDMA2000_HRPD = 0x07, + STK_ACCESS_TECHNOLOGY_EUTRAN = 0x08 }; enum stk_technology_id { - STK_TECHNOLOGY_INDEPENDENT = 0x00, - STK_TECHNOLOGY_BLUETOOTH = 0x01, - STK_TECHNOLOGY_IRDA = 0x02, - STK_TECHNOLOGY_RS232 = 0x03, - STK_TECHNOLOGY_USB = 0x04 + STK_TECHNOLOGY_INDEPENDENT = 0x00, + STK_TECHNOLOGY_BLUETOOTH = 0x01, + STK_TECHNOLOGY_IRDA = 0x02, + STK_TECHNOLOGY_RS232 = 0x03, + STK_TECHNOLOGY_USB = 0x04 }; enum stk_battery_state { - STK_BATTERY_VERY_LOW = 0x00, - STK_BATTERY_LOW = 0x01, - STK_BATTERY_AVERAGE = 0x02, - STK_BATTERY_GOOD = 0x03, - STK_BATTERY_FULL = 0x04 + STK_BATTERY_VERY_LOW = 0x00, + STK_BATTERY_LOW = 0x01, + STK_BATTERY_AVERAGE = 0x02, + STK_BATTERY_GOOD = 0x03, + STK_BATTERY_FULL = 0x04 }; enum stk_frame_layout_type { - STK_LAYOUT_HORIZONTAL = 0x01, - STK_LAYOUT_VERTICAL = 0x02 + STK_LAYOUT_HORIZONTAL = 0x01, + STK_LAYOUT_VERTICAL = 0x02 }; enum stk_broadcast_network_technology { @@ -1196,7 +1196,8 @@ struct stk_answer_text { char *text; ofono_bool_t packed; ofono_bool_t yesno; - /* If a "Yes/No" answer was requested in a GET INKEY command, + /* + * If a "Yes/No" answer was requested in a GET INKEY command, * .yesno must be TRUE and text should be non-NULL to indicate * a Yes response or NULL to indicate a No response. */ @@ -1247,9 +1248,11 @@ struct stk_response_local_info { STK_TIMING_ADVANCE_ME_IDLE = 0x00, STK_TIMING_ADVANCE_ME_NOT_IDLE = 0x01, } status; - /* Contains bit periods number according to 3GPP TS + /* + * Contains bit periods number according to 3GPP TS * 44.118 Section 9.3.106 / 3GPP TS 44.018 Section - * 10.5.2.40.1, not microseconds */ + * 10.5.2.40.1, not microseconds + */ int advance; } tadv; /* Bits[31:24]: manufacturer, bits[23:0]: serial number */ @@ -1357,9 +1360,11 @@ struct stk_envelope_call_control { struct stk_common_byte_array pdp_ctx_params; struct stk_common_byte_array eps_pdn_params; }; - /* At least one of the following two fields must be present in a + /* + * At least one of the following two fields must be present in a * response indicating modification of the call. - * In an EVELOPE message, only allowed for a call setup. */ + * In an EVELOPE message, only allowed for a call setup. + */ struct stk_ccp ccp1; struct stk_subaddress subaddress; struct stk_location_info location;