From a18b9d1e1a014290691d63a7f335085dadc83e46 Mon Sep 17 00:00:00 2001 From: Sukanya Rajkhowa Date: Tue, 10 Sep 2013 12:30:13 -0700 Subject: [PATCH] RIL: Support SMS over IMS RIL_REQUEST_IMS_REGISTRATION_STATE is used to aquire IMS registration state. RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED is called when IMS registration state has changed. RIL_REQUEST_IMS_SEND_SMS is used to send MO SMS over IMS. However, if retry field is set in case of failure, RIL_REQUEST_IMS_SEND_SMS sets messageRef from RIL_SMS_RESPONSE of corresponding failed MO SMS, and sets retry field to non-zero. If voice is available, sends RIL_REQUEST_IMS_SEND_SMS retries with data encoded based on voice tech available. Bug: 9626411 Change-Id: If0ecc9fa47661f6560171e472f3c464713e97968 --- include/telephony/ril.h | 88 +++++++++++++++++++++- libril/ril.cpp | 168 +++++++++++++++++++++++++++++++++++++++++- libril/ril_commands.h | 2 + libril/ril_unsol_commands.h | 1 + reference-ril/reference-ril.c | 113 ++++++++++++++++++++++++++-- 5 files changed, 362 insertions(+), 10 deletions(-) diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 766d5da..803d965 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -19,6 +19,7 @@ #include #include +#include #ifndef FEATURE_UNIT_TEST #include #endif /* !FEATURE_UNIT_TEST */ @@ -27,7 +28,7 @@ extern "C" { #endif -#define RIL_VERSION 8 /* Current version */ +#define RIL_VERSION 9 /* Current version */ #define RIL_VERSION_MIN 6 /* Minimum RIL_VERSION supported */ #define CDMA_ALPHA_INFO_BUFFER_LENGTH 64 @@ -233,6 +234,28 @@ typedef struct { to point connections. */ } RIL_Data_Call_Response_v6; +typedef enum { + RADIO_TECH_3GPP = 1, /* 3GPP Technologies - GSM, WCDMA */ + RADIO_TECH_3GPP2 = 2 /* 3GPP2 Technologies - CDMA */ +} RIL_RadioTechnologyFamily; + +typedef struct { + RIL_RadioTechnologyFamily tech; + unsigned char retry; /* 0 == not retry, nonzero == retry */ + int messageRef; /* Valid field if retry is set to nonzero. + Contains messageRef from RIL_SMS_Response + corresponding to failed MO SMS. + */ + + union { + /* Valid field if tech is RADIO_TECH_3GPP2. See RIL_REQUEST_CDMA_SEND_SMS */ + RIL_CDMA_SMS_Message* cdmaMessage; + + /* Valid field if tech is RADIO_TECH_3GPP. See RIL_REQUEST_SEND_SMS */ + char** gsmMessage; + } message; +} RIL_IMS_SMS_Message; + typedef struct { int messageRef; /* TP-Message-Reference for GSM, and BearerData MessageId for CDMA @@ -3498,6 +3521,50 @@ typedef struct { */ #define RIL_REQUEST_SET_INITIAL_ATTACH_APN 111 +/** + * RIL_REQUEST_IMS_REGISTRATION_STATE + * + * Request current IMS registration state + * + * "data" is NULL + * + * "response" is int * + * ((int *)response)[0] is registration state: + * 0 - Not registered + * 1 - Registered + * ((int *)response)[1] is bitmap of the supported services: + * & 0x1 - SMS supported + * + * If IMS is registered and supports SMS, then ((int *) response)[2] + * must follow with IMS SMS format: + * + * ((int *) response)[2] is of type const RIL_IMS_SMS_Format + */ +#define RIL_REQUEST_IMS_REGISTRATION_STATE 112 + +/** + * RIL_REQUEST_IMS_SEND_SMS + * + * Send a SMS message over IMS + * + * "data" is const RIL_IMS_SMS_Message * + * + * "response" is a const RIL_SMS_Response * + * + * Based on the return error, caller decides to resend if sending sms + * fails. SMS_SEND_FAIL_RETRY means retry, and other errors means no retry. + * In case of retry, data is encoded based on Voice Technology available. + * + * Valid errors: + * SUCCESS + * RADIO_NOT_AVAILABLE + * SMS_SEND_FAIL_RETRY + * FDN_CHECK_FAILURE + * GENERIC_FAILURE + * + */ +#define RIL_REQUEST_IMS_SEND_SMS 113 + /***********************************************************************/ @@ -3988,6 +4055,25 @@ typedef struct { */ #define RIL_UNSOL_CELL_INFO_LIST 1036 +/* + * RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED + * + * Called when IMS registration state has changed + * + * "data" is int * + * ((int *)response)[0] is registration state: + * 0 - Not registered + * 1 - Registered + * ((int *)response)[1] is bitmap of the services supported: + * & 0x1 - SMS supported + * + * If IMS is registered and supports SMS, then ((int *) response)[2] + * must follow with IMS SMS format: + * + * ((int *) response)[2] is of type const RIL_IMS_SMS_Format + */ +#define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1037 + /***********************************************************************/ diff --git a/libril/ril.cpp b/libril/ril.cpp index 46a150f..1957939 100644 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -208,6 +208,9 @@ static void dispatchSetInitialAttachApn (Parcel& p, RequestInfo *pRI); static void dispatchCdmaSubscriptionSource (Parcel& p, RequestInfo *pRI); static void dispatchCdmaSms(Parcel &p, RequestInfo *pRI); +static void dispatchImsSms(Parcel &p, RequestInfo *pRI); +static void dispatchImsCdmaSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef); +static void dispatchImsGsmSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef); static void dispatchCdmaSmsAck(Parcel &p, RequestInfo *pRI); static void dispatchGsmBrSmsCnf(Parcel &p, RequestInfo *pRI); static void dispatchCdmaBrSmsCnf(Parcel &p, RequestInfo *pRI); @@ -879,9 +882,8 @@ invalid: return; } -static void -dispatchCdmaSms(Parcel &p, RequestInfo *pRI) { - RIL_CDMA_SMS_Message rcsm; +static status_t +constructCdmaSms(Parcel &p, RequestInfo *pRI, RIL_CDMA_SMS_Message& rcsm) { int32_t t; uint8_t ut; status_t status; @@ -945,7 +947,7 @@ dispatchCdmaSms(Parcel &p, RequestInfo *pRI) { } if (status != NO_ERROR) { - goto invalid; + return status; } startRequest; @@ -957,6 +959,18 @@ dispatchCdmaSms(Parcel &p, RequestInfo *pRI) { printRequest(pRI->token, pRI->pCI->requestNumber); + return status; +} + +static void +dispatchCdmaSms(Parcel &p, RequestInfo *pRI) { + RIL_CDMA_SMS_Message rcsm; + + ALOGD("dispatchCdmaSms"); + if (NO_ERROR != constructCdmaSms(p, pRI, rcsm)) { + goto invalid; + } + s_callbacks.onRequest(pRI->pCI->requestNumber, &rcsm, sizeof(rcsm),pRI); #ifdef MEMSET_FREED @@ -971,6 +985,149 @@ invalid: } static void +dispatchImsCdmaSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef) { + RIL_IMS_SMS_Message rism; + RIL_CDMA_SMS_Message rcsm; + + ALOGD("dispatchImsCdmaSms: retry=%d, messageRef=%d", retry, messageRef); + + if (NO_ERROR != constructCdmaSms(p, pRI, rcsm)) { + goto invalid; + } + memset(&rism, 0, sizeof(rism)); + rism.tech = RADIO_TECH_3GPP2; + rism.retry = retry; + rism.messageRef = messageRef; + rism.message.cdmaMessage = &rcsm; + + s_callbacks.onRequest(pRI->pCI->requestNumber, &rism, + sizeof(RIL_RadioTechnologyFamily)+sizeof(uint8_t)+sizeof(int32_t) + +sizeof(rcsm),pRI); + +#ifdef MEMSET_FREED + memset(&rcsm, 0, sizeof(rcsm)); + memset(&rism, 0, sizeof(rism)); +#endif + + return; + +invalid: + invalidCommandBlock(pRI); + return; +} + +static void +dispatchImsGsmSms(Parcel &p, RequestInfo *pRI, uint8_t retry, int32_t messageRef) { + RIL_IMS_SMS_Message rism; + int32_t countStrings; + status_t status; + size_t datalen; + char **pStrings; + ALOGD("dispatchImsGsmSms: retry=%d, messageRef=%d", retry, messageRef); + + status = p.readInt32 (&countStrings); + + if (status != NO_ERROR) { + goto invalid; + } + + memset(&rism, 0, sizeof(rism)); + rism.tech = RADIO_TECH_3GPP; + rism.retry = retry; + rism.messageRef = messageRef; + + startRequest; + appendPrintBuf("%sformat=%d,", printBuf, rism.format); + if (countStrings == 0) { + // just some non-null pointer + pStrings = (char **)alloca(sizeof(char *)); + datalen = 0; + } else if (((int)countStrings) == -1) { + pStrings = NULL; + datalen = 0; + } else { + datalen = sizeof(char *) * countStrings; + + pStrings = (char **)alloca(datalen); + + for (int i = 0 ; i < countStrings ; i++) { + pStrings[i] = strdupReadString(p); + appendPrintBuf("%s%s,", printBuf, pStrings[i]); + } + } + removeLastChar; + closeRequest; + printRequest(pRI->token, pRI->pCI->requestNumber); + + rism.message.gsmMessage = pStrings; + s_callbacks.onRequest(pRI->pCI->requestNumber, &rism, + sizeof(RIL_RadioTechnologyFamily)+sizeof(uint8_t)+sizeof(int32_t) + +datalen, pRI); + + if (pStrings != NULL) { + for (int i = 0 ; i < countStrings ; i++) { +#ifdef MEMSET_FREED + memsetString (pStrings[i]); +#endif + free(pStrings[i]); + } + +#ifdef MEMSET_FREED + memset(pStrings, 0, datalen); +#endif + } + +#ifdef MEMSET_FREED + memset(&rism, 0, sizeof(rism)); +#endif + return; +invalid: + ALOGE("dispatchImsGsmSms invalid block"); + invalidCommandBlock(pRI); + return; +} + +static void +dispatchImsSms(Parcel &p, RequestInfo *pRI) { + int32_t t; + status_t status = p.readInt32(&t); + RIL_RadioTechnologyFamily format; + uint8_t retry; + int32_t messageRef; + + ALOGD("dispatchImsSms"); + if (status != NO_ERROR) { + goto invalid; + } + format = (RIL_RadioTechnologyFamily) t; + + // read retry field + status = p.read(&retry,sizeof(retry)); + if (status != NO_ERROR) { + goto invalid; + } + // read messageRef field + status = p.read(&messageRef,sizeof(messageRef)); + if (status != NO_ERROR) { + goto invalid; + } + + if (RADIO_TECH_3GPP == format) { + dispatchImsGsmSms(p, pRI, retry, messageRef); + } else if (RADIO_TECH_3GPP2 == format) { + dispatchImsCdmaSms(p, pRI, retry, messageRef); + } else { + ALOGE("requestImsSendSMS invalid format value =%d", format); + } + + return; + +invalid: + invalidCommandBlock(pRI); + return; +} + +static void dispatchCdmaSmsAck(Parcel &p, RequestInfo *pRI) { RIL_CDMA_SMS_Ack rcsa; int32_t t; @@ -3653,6 +3810,8 @@ requestToString(int request) { case RIL_REQUEST_GET_CELL_INFO_LIST: return"GET_CELL_INFO_LIST"; case RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE: return"SET_UNSOL_CELL_INFO_LIST_RATE"; case RIL_REQUEST_SET_INITIAL_ATTACH_APN: return "RIL_REQUEST_SET_INITIAL_ATTACH_APN"; + case RIL_REQUEST_IMS_REGISTRATION_STATE: return "IMS_REGISTRATION_STATE"; + case RIL_REQUEST_IMS_SEND_SMS: return "IMS_SEND_SMS"; case RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED: return "UNSOL_RESPONSE_RADIO_STATE_CHANGED"; case RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED: return "UNSOL_RESPONSE_CALL_STATE_CHANGED"; case RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED: return "UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED"; @@ -3689,6 +3848,7 @@ requestToString(int request) { case RIL_UNSOL_RIL_CONNECTED: return "UNSOL_RIL_CONNECTED"; case RIL_UNSOL_VOICE_RADIO_TECH_CHANGED: return "UNSOL_VOICE_RADIO_TECH_CHANGED"; case RIL_UNSOL_CELL_INFO_LIST: return "UNSOL_CELL_INFO_LIST"; + case RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED: return "RESPONSE_IMS_NETWORK_STATE_CHANGED"; default: return ""; } } diff --git a/libril/ril_commands.h b/libril/ril_commands.h index 3e5a619..16daa72 100644 --- a/libril/ril_commands.h +++ b/libril/ril_commands.h @@ -126,3 +126,5 @@ {RIL_REQUEST_GET_CELL_INFO_LIST, dispatchVoid, responseCellInfoList}, {RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE, dispatchInts, responseVoid}, {RIL_REQUEST_SET_INITIAL_ATTACH_APN, dispatchSetInitialAttachApn, responseVoid}, + {RIL_REQUEST_IMS_REGISTRATION_STATE, dispatchVoid, responseInts}, + {RIL_REQUEST_IMS_SEND_SMS, dispatchImsSms, responseSMS}, diff --git a/libril/ril_unsol_commands.h b/libril/ril_unsol_commands.h index 0711225..b6d532f 100644 --- a/libril/ril_unsol_commands.h +++ b/libril/ril_unsol_commands.h @@ -51,3 +51,4 @@ {RIL_UNSOL_RIL_CONNECTED, responseInts, WAKE_PARTIAL}, {RIL_UNSOL_VOICE_RADIO_TECH_CHANGED, responseInts, WAKE_PARTIAL}, {RIL_UNSOL_CELL_INFO_LIST, responseCellInfoList, WAKE_PARTIAL}, + {RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED, responseVoid, WAKE_PARTIAL}, diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 77c6f31..1b7a7bc 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -211,6 +211,14 @@ static const struct timeval TIMEVAL_SIMPOLL = {1,0}; static const struct timeval TIMEVAL_CALLSTATEPOLL = {0,500000}; static const struct timeval TIMEVAL_0 = {0,0}; +static int s_ims_registered = 0; // 0==unregistered +static int s_ims_services = 1; // & 0x1 == sms over ims supported +static int s_ims_format = 1; // FORMAT_3GPP(1) vs FORMAT_3GPP2(2); +static int s_ims_cause_retry = 0; // 1==causes sms over ims to temp fail +static int s_ims_cause_perm_failure = 0; // 1==causes sms over ims to permanent fail +static int s_ims_gsm_retry = 0; // 1==causes sms over gsm to temp fail +static int s_ims_gsm_fail = 0; // 1==causes sms over gsm to permanent fail + #ifdef WORKAROUND_ERRONEOUS_ANSWER // Max number of times we'll try to repoll when we think // we have a AT+CLCC race condition @@ -1499,12 +1507,14 @@ static void requestCdmaSendSMS(void *data, size_t datalen, RIL_Token t) // But it is not implemented yet. memset(&response, 0, sizeof(response)); + response.messageRef = 1; RIL_onRequestComplete(t, RIL_E_SUCCESS, &response, sizeof(response)); return; error: // Cdma Send SMS will always cause send retry error. - RIL_onRequestComplete(t, RIL_E_SMS_SEND_FAIL_RETRY, NULL, 0); + response.messageRef = -1; + RIL_onRequestComplete(t, RIL_E_SMS_SEND_FAIL_RETRY, &response, sizeof(response)); } static void requestSendSMS(void *data, size_t datalen, RIL_Token t) @@ -1517,6 +1527,12 @@ static void requestSendSMS(void *data, size_t datalen, RIL_Token t) RIL_SMS_Response response; ATResponse *p_response = NULL; + memset(&response, 0, sizeof(response)); + RLOGD("requestSendSMS datalen =%d", datalen); + + if (s_ims_gsm_fail != 0) goto error; + if (s_ims_gsm_retry != 0) goto error2; + smsc = ((const char **)data)[0]; pdu = ((const char **)data)[1]; @@ -1534,17 +1550,68 @@ static void requestSendSMS(void *data, size_t datalen, RIL_Token t) if (err != 0 || p_response->success == 0) goto error; - memset(&response, 0, sizeof(response)); - /* FIXME fill in messageRef and ackPDU */ - + response.messageRef = 1; RIL_onRequestComplete(t, RIL_E_SUCCESS, &response, sizeof(response)); at_response_free(p_response); return; error: - RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); + response.messageRef = -2; + RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, &response, sizeof(response)); + at_response_free(p_response); + return; +error2: + // send retry error. + response.messageRef = -1; + RIL_onRequestComplete(t, RIL_E_SMS_SEND_FAIL_RETRY, &response, sizeof(response)); at_response_free(p_response); + return; + } + +static void requestImsSendSMS(void *data, size_t datalen, RIL_Token t) +{ + RIL_IMS_SMS_Message *p_args; + RIL_SMS_Response response; + + memset(&response, 0, sizeof(response)); + + RLOGD("requestImsSendSMS: datalen=%d, " + "registered=%d, service=%d, format=%d, ims_perm_fail=%d, " + "ims_retry=%d, gsm_fail=%d, gsm_retry=%d", + datalen, s_ims_registered, s_ims_services, s_ims_format, + s_ims_cause_perm_failure, s_ims_cause_retry, s_ims_gsm_fail, + s_ims_gsm_retry); + + // figure out if this is gsm/cdma format + // then route it to requestSendSMS vs requestCdmaSendSMS respectively + p_args = (RIL_IMS_SMS_Message *)data; + + if (0 != s_ims_cause_perm_failure ) goto error; + + // want to fail over ims and this is first request over ims + if (0 != s_ims_cause_retry && 0 == p_args->retry) goto error2; + + if (RADIO_TECH_3GPP == p_args->tech) { + return requestSendSMS(p_args->message.gsmMessage, + datalen - sizeof(RIL_RadioTechnologyFamily), + t); + } else if (RADIO_TECH_3GPP2 == p_args->tech) { + return requestCdmaSendSMS(p_args->message.cdmaMessage, + datalen - sizeof(RIL_RadioTechnologyFamily), + t); + } else { + RLOGE("requestImsSendSMS invalid format value =%d", p_args->tech); + } + +error: + response.messageRef = -2; + RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, &response, sizeof(response)); + return; + +error2: + response.messageRef = -1; + RIL_onRequestComplete(t, RIL_E_SMS_SEND_FAIL_RETRY, &response, sizeof(response)); } static void requestSetupDataCall(void *data, size_t datalen, RIL_Token t) @@ -2051,6 +2118,9 @@ onRequest (int request, void *data, size_t datalen, RIL_Token t) case RIL_REQUEST_CDMA_SEND_SMS: requestCdmaSendSMS(data, datalen, t); break; + case RIL_REQUEST_IMS_SEND_SMS: + requestImsSendSMS(data, datalen, t); + break; case RIL_REQUEST_SETUP_DATA_CALL: requestSetupDataCall(data, datalen, t); break; @@ -2168,6 +2238,27 @@ onRequest (int request, void *data, size_t datalen, RIL_Token t) requestEnterSimPin(data, datalen, t); break; + case RIL_REQUEST_IMS_REGISTRATION_STATE: { + int reply[2]; + //0==unregistered, 1==registered + reply[0] = s_ims_registered; + + //to be used when changed to include service supporated info + //reply[1] = s_ims_services; + + // FORMAT_3GPP(1) vs FORMAT_3GPP2(2); + reply[1] = s_ims_format; + + RLOGD("IMS_REGISTRATION=%d, format=%d ", + reply[0], reply[1]); + if (reply[1] != -1) { + RIL_onRequestComplete(t, RIL_E_SUCCESS, reply, sizeof(reply)); + } else { + RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); + } + break; + } + case RIL_REQUEST_VOICE_RADIO_TECH: { int tech = techFromModemType(TECH(sMdmInfo)); @@ -2927,6 +3018,18 @@ static void waitForClose() pthread_mutex_unlock(&s_state_mutex); } +static void sendUnsolImsNetworkStateChanged() +{ +#if 0 // to be used when unsol is changed to return data. + int reply[2]; + reply[0] = s_ims_registered; + reply[1] = s_ims_services; + reply[1] = s_ims_format; +#endif + RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED, + NULL, 0); +} + /** * Called by atchannel when an unsolicited line appears * This is called on atchannel's reader thread. AT commands may -- 2.11.0