diff options
| -rw-r--r-- | src/atcmd.c | 227 | ||||
| -rw-r--r-- | src/atcmd.h | 8 | ||||
| -rw-r--r-- | src/global.h | 7 | ||||
| -rw-r--r-- | src/pdu_decode.c | 878 | ||||
| -rw-r--r-- | src/pdu_encode.c | 780 | ||||
| -rw-r--r-- | src/phonebook.c | 2 | ||||
| -rw-r--r-- | src/sms_delete.c | 4 | ||||
| -rw-r--r-- | src/sms_list.c | 20 | ||||
| -rw-r--r-- | src/sms_send.c | 74 | ||||
| -rw-r--r-- | src/utils.c | 16 |
10 files changed, 1057 insertions, 959 deletions
diff --git a/src/atcmd.c b/src/atcmd.c index b988a57..d17c03f 100644 --- a/src/atcmd.c +++ b/src/atcmd.c @@ -873,17 +873,17 @@ int atcmd_plus_cpms_read(int fd, struct data_store *read_store, char *token; int tmp; int i; - int data_stores_size; + int data_stores_size; struct data_store *store; - struct data_store *data_stores[] = {read_store, send_store, new_store}; + struct data_store *data_stores[] = {read_store, send_store, new_store}; - if (isCdmaTypeModel()) { - data_stores_size = 2; - } - else { - data_stores_size = 3; - } + if (is_telit_3gpp2_format()) { + data_stores_size = 2; + } + else { + data_stores_size = 3; + } atcmd_writeline(fd, "AT+CPMS?"); tmp = atcmd_expect_line(fd, buf, sizeof(buf), "+CPMS: "); @@ -944,7 +944,7 @@ int atcmd_plus_cpms_test(int fd, struct store_locations *read_loc, int tmp; int i, j; - struct store_locations *locations[] = {read_loc, send_loc, new_loc}; + struct store_locations *locations[] = {read_loc, send_loc, new_loc}; struct store_locations *loc; atcmd_writeline(fd, "AT+CPMS=?"); @@ -1006,14 +1006,14 @@ int atcmd_plus_cpms_write(int fd, const char *read_name, char buf[ATCMD_LINE_SIZE]; int tmp; - if (isCdmaTypeModel()) { - atcmd_writeline(fd, "AT+CPMS=\"%s\",\"%s\"", read_name, send_name); - } - else - { - atcmd_writeline(fd, "AT+CPMS=\"%s\",\"%s\",\"%s\"", - read_name, send_name, new_name); - } + if (is_telit_3gpp2_format()) { + atcmd_writeline(fd, "AT+CPMS=\"%s\",\"%s\"", read_name, send_name); + } + else + { + atcmd_writeline(fd, "AT+CPMS=\"%s\",\"%s\",\"%s\"", + read_name, send_name, new_name); + } tmp = atcmd_expect_line(fd, buf, sizeof(buf), "OK"); if (tmp <= 0) { log_debug("expected OK but it was not received"); @@ -1224,15 +1224,15 @@ int atcmd_plus_gmm_read(int fd) int tmp; atcmd_writeline(fd, "AT+GMM"); - //Swallow extra "\r\n" - tmp = atcmd_readline(fd, buf, sizeof(buf)); + //Swallow extra "\r\n" + tmp = atcmd_readline(fd, buf, sizeof(buf)); if (tmp <= 0) { log_debug("expected \\r\\n but it was not received"); return -1; } - //Read model string - tmp = atcmd_readline(fd, buf, sizeof(buf)); + //Read model string + tmp = atcmd_readline(fd, buf, sizeof(buf)); if (tmp <= 0) { log_debug("expected model but it was not received"); return -1; @@ -1300,7 +1300,7 @@ int atcmd_plus_gmi_read(int fd) return 0; } -/* ICCID needed for LNA3 to determine carrier */ +/* ICCID needed to detect Verizon on multi-carrier radios */ int atcmd_plus_iccid_read(int fd) { char buf[ATCMD_LINE_SIZE]; @@ -1313,7 +1313,7 @@ int atcmd_plus_iccid_read(int fd) if (is_telit_model()) { command = "AT#CCID"; if (strstr(Global.core.model, "FN980")) { - command = "AT+ICCID"; + command = "AT+ICCID"; } } else if (is_quectel_model()) { command = "AT+QCCID"; @@ -1323,18 +1323,18 @@ int atcmd_plus_iccid_read(int fd) } atcmd_writeline(fd, command); - //Swallow extra "\r\n" - tmp = atcmd_readline(fd, buf, sizeof(buf)); + //Swallow extra "\r\n" + tmp = atcmd_readline(fd, buf, sizeof(buf)); if (tmp <= 0) { log_debug("expected \\r\\n but it was not received"); return -1; } - //Read iccid string - tmp = atcmd_readline(fd, buf, sizeof(buf)); + //Read iccid string + tmp = atcmd_readline(fd, buf, sizeof(buf)); if (tmp <= 0) { log_debug("expected ICCID but it was not received"); - /* Currently only LNA3 models will need the ICCID */ + /* Currently only LNA3 models will need the ICCID */ return -1; } @@ -1342,12 +1342,12 @@ int atcmd_plus_iccid_read(int fd) log_debug("buf=%s for %d", buf,strlen(buf)); token = atcmd_value_tok(&save); if (!token) { - log_debug("atcmd_value_tok model"); + log_debug("atcmd_value_tok iccid"); return -1; } else { log_debug("token is %s",token); } - tmp_buf = strrchr(token,' '); + tmp_buf = strrchr(token,' '); if (tmp_buf) { token = ++tmp_buf; log_debug("Found blank, incrementing tmp"); @@ -1371,6 +1371,65 @@ int atcmd_plus_iccid_read(int fd) return 0; } +/* IMSI needed to detect Verizon when the ICCID is unrecognized */ +int atcmd_plus_imsi_read(int fd) +{ + char buf[ATCMD_LINE_SIZE]; + char *save; + char *token; + int tmp; + char *tmp_buf; + char* command = "AT+CIMI"; + + atcmd_writeline(fd, command); + //Swallow extra "\r\n" + tmp = atcmd_readline(fd, buf, sizeof(buf)); + if (tmp <= 0) { + log_debug("expected \\r\\n but it was not received"); + return -1; + } + + //Read imsi string + tmp = atcmd_readline(fd, buf, sizeof(buf)); + if (tmp <= 0) { + log_debug("expected IMSI but it was not received"); + /* Currently only LNA7/LNA7D/L4G1 models will need the IMSI */ + return -1; + } + + save = buf; + log_debug("buf=%s for %d", buf,strlen(buf)); + token = atcmd_value_tok(&save); + if (!token) { + log_debug("atcmd_value_tok imsi"); + return -1; + } else { + log_debug("token is %s",token); + } + tmp_buf = strrchr(token,' '); + if (tmp_buf) { + token = ++tmp_buf; + log_debug("Found blank, incrementing tmp"); + } else { + tmp_buf = strrchr(token,'\t'); + log_debug("Found tab, incrementing tmp"); + if(tmp_buf) + token = ++tmp_buf; + } + log_debug("token[0]=%2.2x token[1]=%2.2x",token[0],token[1]); + strncpy(Global.core.imsi, token, IMSI_LEN); + + log_debug("imsi: %s", Global.core.imsi); + + tmp = atcmd_expect_line(fd, buf, sizeof(buf), "OK"); + if (tmp <= 0) { + log_debug("expected OK but it was not received"); + return -1; + } + + return 0; +} + int atcmd_init(int fd, int read_timeout) { int tmp; @@ -1421,19 +1480,25 @@ static int sms_atcmd_init(int fd) tmp = atcmd_plus_gmm_read(fd); if (tmp < 0) { - log_error("failed to read radio model"); + log_error("failed to read radio model"); return -1; } tmp = atcmd_plus_gmi_read(fd); if (tmp < 0) { - log_error("failed to read radio manufacturer"); + log_error("failed to read radio manufacturer"); + return -1; + } + + tmp = atcmd_plus_iccid_read(fd); + if (tmp < 0) { + log_error("failed to read SIM ICCID"); return -1; } - tmp = atcmd_plus_iccid_read(fd); + tmp = atcmd_plus_imsi_read(fd); if (tmp < 0) { - log_error("failed to read SIM ICCID"); + log_error("failed to read SIM IMSI"); return -1; } @@ -1446,22 +1511,22 @@ static int sms_atcmd_init(int fd) memset(&send_store, 0, sizeof(send_store)); memset(&new_store, 0, sizeof(new_store)); - if (!strcmp(Global.core.model, "CE910-DUAL") || !strcmp(Global.core.model, "DE910-DUAL")) { - log_info("Changing message storage locations to ME for CE/DE910-DUAL"); - free(Global.core.msg_store_read); - free(Global.core.msg_store_send); - free(Global.core.pb_store); - Global.core.msg_store_read = strdup("ME"); - Global.core.msg_store_send = strdup("ME"); - Global.core.pb_store = strdup("ME"); - } + if (!strcmp(Global.core.model, "CE910-DUAL") || !strcmp(Global.core.model, "DE910-DUAL")) { + log_info("Changing message storage locations to ME for CE/DE910-DUAL"); + free(Global.core.msg_store_read); + free(Global.core.msg_store_send); + free(Global.core.pb_store); + Global.core.msg_store_read = strdup("ME"); + Global.core.msg_store_send = strdup("ME"); + Global.core.pb_store = strdup("ME"); + } atcmd_plus_cpms_test(fd, &read_store.choices, &send_store.choices, &new_store.choices); atcmd_plus_cpms_read(fd, &read_store.selected, &send_store.selected, &new_store.selected, Global.core.model); if (Global.core.msg_store_read && Global.core.msg_store_send && - Global.core.msg_store_new) { + Global.core.msg_store_new) { if (!msg_store_choice(&read_store, Global.core.msg_store_read)) { log_error("message storage location %s is not a choice", @@ -1474,8 +1539,8 @@ static int sms_atcmd_init(int fd) return -1; } - //Doesn't apply to CDMA type radios - if (!isCdmaTypeModel() && !msg_store_choice(&new_store, Global.core.msg_store_new)) { + //Doesn't apply to CDMA type radios + if (!is_telit_3gpp2_format() && !msg_store_choice(&new_store, Global.core.msg_store_new)) { log_error("message storage location %s is not a choice", Global.core.msg_store_new); return -1; @@ -1543,45 +1608,71 @@ int sms_device_open(void) return fd; } -int is_vzw_lte(void) +/* Detect Telit LTE radios that use the 3GPP2 SMS format for Verizon */ +int is_telit_lte_vzw_3gpp2_format(void) { - if (!strcmp(Global.core.model, "LE910-NA1")) { - log_debug("Found LE910-NA1"); - /* Verizon Wireless SIM */ - if (strncmp(Global.core.iccid,"891480",6) == 0) { - log_debug("Found VZW SIM"); - return 1; - } - } - - return (!strncmp(Global.core.model, "LE910-SVG", MODEL_LEN) || - !strncmp(Global.core.model, "LE910-SV1", MODEL_LEN)); + if (!strcmp(Global.core.model, "LE910-NA1")) { + log_debug("Found LE910-NA1"); + /* Verizon Wireless SIM */ + if (strncmp(Global.core.iccid,"891480",6) == 0) { + log_debug("Found VZW SIM"); + return 1; + } + } + + return (!strncmp(Global.core.model, "LE910-SVG", MODEL_LEN) || + !strncmp(Global.core.model, "LE910-SV1", MODEL_LEN)); } -/* Detect LNA7/L4G1 radio with Verizon SIM */ -int is_quectel_dual_sms_format(void) +/* Detect LNA7/LNA7D/L4G1 radios with Verizon SIM that support both 3GPP and 3GPP2 */ +int is_quectel_dual_format(void) { if (!strncmp(Global.core.model, "EG95", MODEL_LEN) || !strncmp(Global.core.model, "EG25", MODEL_LEN)) { log_debug("Found Quectel radio with dual SMS format support"); - /* Verizon Wireless SIM */ + + /* Verizon Wireless SIM ICCID */ if (strncmp(Global.core.iccid,"891480",6) == 0) { - log_debug("Found VZW SIM"); + log_debug("Found VZW SIM by ICCID"); return 1; } + + /* Extract PLMN ID - the first 5 or 6 digits of IMSI. + Assume 6 digits for Verizon. + NOTE: Other carriers may use shorter codes */ + char plmn_id_str[PLMN_ID_SIZE_VZW] = {0}; + strncpy(plmn_id_str, Global.core.imsi, PLMN_ID_LEN_VZW); + + /* Parse as integer for easier comparison */ + int plmn_id_num = atoi(plmn_id_str); + + /* Verizon Wireless SIM MCC/MNC */ + switch (plmn_id_num) { + case 310590: + case 310890: + case 311270: + case 311480: + case 312770: + log_debug("Found VZW SIM by IMSI"); + return 1; + default: + /* ignore, not Verizon */ + break; + }; } return 0; } -int isCdmaTypeModel() +/* Detect Telit LTE and CDMA radios that use the 3GPP2 SMS format for Verizon */ +int is_telit_3gpp2_format() { - /* Test for possible dual firmware model */ - if (is_vzw_lte()) - return 1; + /* Test for possible dual firmware model */ + if (is_telit_lte_vzw_3gpp2_format()) + return 1; - return (!strncmp(Global.core.model, "DE910-DUAL", MODEL_LEN) || - !strncmp(Global.core.model, "CE910-DUAL", MODEL_LEN)); + return (!strncmp(Global.core.model, "DE910-DUAL", MODEL_LEN) || + !strncmp(Global.core.model, "CE910-DUAL", MODEL_LEN)); } int is_telit_model() diff --git a/src/atcmd.h b/src/atcmd.h index 28bc384..bbab2d7 100644 --- a/src/atcmd.h +++ b/src/atcmd.h @@ -72,7 +72,7 @@ int atcmd_plus_cmgd_write(int fd, int index); int atcmd_plus_qcfg_write(int fd, int sms_format); -int isCdmaTypeModel(); +int is_telit_3gpp2_format(); #define STORE_NAME_LEN 2 #define STORE_NAME_SIZE (STORE_NAME_LEN + 1) @@ -117,12 +117,14 @@ int atcmd_plus_cpbr_test(int fd, struct phonebook_store *store); int atcmd_plus_gmm_read(int fd); int atcmd_plus_gmi_read(int fd); +int atcmd_plus_iccid_read(int fd); +int atcmd_plus_imsi_read(int fd); int atcmd_init(int fd, int read_timeout); int sms_device_close(int fd); int sms_device_open(void); -int is_vzw_lte(void); -int is_quectel_dual_sms_format(void); +int is_telit_lte_vzw_3gpp2_format(void); +int is_quectel_dual_format(void); int is_telit_model(void); int is_quectel_model(void); diff --git a/src/global.h b/src/global.h index a6073dd..4b83cb5 100644 --- a/src/global.h +++ b/src/global.h @@ -14,6 +14,10 @@ #define ICCID_LEN 23 #define ICCID_SIZE (ICCID_LEN + 1) +#define IMSI_LEN 15 +#define IMSI_SIZE (IMSI_LEN + 1) +#define PLMN_ID_LEN_VZW 6 +#define PLMN_ID_SIZE_VZW (PLMN_ID_LEN_VZW + 1) #define MODEL_LEN 1023 #define MODEL_SIZE (MODEL_LEN + 1) #define MANUFACTURER_LEN 1023 @@ -37,7 +41,8 @@ struct global_core { char *msg_store_new; char *pb_store; char model[MODEL_SIZE]; - char iccid[ICCID_SIZE]; /* Needed for LNA3/Verizon */ + char iccid[ICCID_SIZE]; /* Needed for Verizon 3GPP2 SMS format detection */ + char imsi[IMSI_SIZE]; /* Needed for Verizon 3GPP2 SMS format detection */ char manufacturer[MANUFACTURER_SIZE]; /* Needed to pick proper manufacturer-specific commands */ char *editor; diff --git a/src/pdu_decode.c b/src/pdu_decode.c index 9c0ced5..9014162 100644 --- a/src/pdu_decode.c +++ b/src/pdu_decode.c @@ -37,134 +37,134 @@ #define DECODE_FAIL(cond, name, ret) \ do { \ - if (cond) { \ - log_error("decode failed at %s", name); \ - return ret; \ - } \ + if (cond) { \ + log_error("decode failed at %s", name); \ + return ret; \ + } \ } while (0) int pdu_decode_timestamp(const char *pdu_str, struct tm *tm) { - char buf[PDU_TIMESTAMP_SIZE + 3]; - char *cp; - int off_upper; - int off_lower; - int off; + char buf[PDU_TIMESTAMP_SIZE + 3]; + char *cp; + int off_upper; + int off_lower; + int off; - STRLEN_CHECK(pdu_str, PDU_TIMESTAMP_LEN, -1); + STRLEN_CHECK(pdu_str, PDU_TIMESTAMP_LEN, -1); - memset(tm, 0, sizeof(*tm)); - memset(buf, 0, sizeof(buf)); + memset(tm, 0, sizeof(*tm)); + memset(buf, 0, sizeof(buf)); - strncpy(buf, pdu_str, PDU_TIMESTAMP_LEN); - nibble_swap(buf, PDU_TIMESTAMP_LEN); - strunpad(buf, 'F'); + strncpy(buf, pdu_str, PDU_TIMESTAMP_LEN); + nibble_swap(buf, PDU_TIMESTAMP_LEN); + strunpad(buf, 'F'); - off_upper = hex_nibble_scan(buf + GMT_OFFSET_IDX, 1); - off_lower = hex_nibble_scan(buf + GMT_OFFSET_IDX + 1, 1); + off_upper = hex_nibble_scan(buf + GMT_OFFSET_IDX, 1); + off_lower = hex_nibble_scan(buf + GMT_OFFSET_IDX + 1, 1); - if (off_upper & BIT(3)) { - off_upper &= ~BIT(3); - buf[GMT_OFFSET_IDX] = '-'; - } else { - buf[GMT_OFFSET_IDX] = '+'; - } + if (off_upper & BIT(3)) { + off_upper &= ~BIT(3); + buf[GMT_OFFSET_IDX] = '-'; + } else { + buf[GMT_OFFSET_IDX] = '+'; + } - off = (off_upper * 10 + off_lower) * 15; + off = (off_upper * 10 + off_lower) * 15; - snprintf(buf + GMT_OFFSET_IDX + 1, 5, "%02d%02d", off / 60, off % 60); + snprintf(buf + GMT_OFFSET_IDX + 1, 5, "%02d%02d", off / 60, off % 60); - cp = (char *) strptime(buf, "%y%m%d%H%M%S%z", tm); - if (!cp || *cp) { - log_error("timestamp could not be converted to tm"); - return -1; - } + cp = (char *) strptime(buf, "%y%m%d%H%M%S%z", tm); + if (!cp || *cp) { + log_error("timestamp could not be converted to tm"); + return -1; + } - return PDU_TIMESTAMP_LEN; + return PDU_TIMESTAMP_LEN; } int pdu_decode_cdma_timestamp(const char *pdu_str, struct tm *tm) { - char buf[PDU_CDMA_TIMESTAMP_LEN + 1]; - char *cp; + char buf[PDU_CDMA_TIMESTAMP_LEN + 1]; + char *cp; - STRLEN_CHECK(pdu_str, PDU_CDMA_TIMESTAMP_LEN, -1); + STRLEN_CHECK(pdu_str, PDU_CDMA_TIMESTAMP_LEN, -1); - memset(tm, 0, sizeof(*tm)); - memset(buf, 0, sizeof(buf)); + memset(tm, 0, sizeof(*tm)); + memset(buf, 0, sizeof(buf)); - strncpy(buf, pdu_str, PDU_CDMA_TIMESTAMP_LEN); + strncpy(buf, pdu_str, PDU_CDMA_TIMESTAMP_LEN); - cp = (char *) strptime(buf, "%y%m%d%H%M%S", tm); - if (!cp || *cp) { - log_error("timestamp could not be converted to tm"); - return -1; - } + cp = (char *) strptime(buf, "%y%m%d%H%M%S", tm); + if (!cp || *cp) { + log_error("timestamp could not be converted to tm"); + return -1; + } - return PDU_CDMA_TIMESTAMP_LEN; + return PDU_CDMA_TIMESTAMP_LEN; } int pdu_decode_addr(const char *pdu_str, struct pdu_addr *addr, int smsc) { - const char *begin = pdu_str; - int addr_len; - int tmp; - - memset(addr, 0, sizeof(*addr)); - - STRLEN_CHECK(pdu_str, HEX_BYTE_LEN, -1); - - tmp = hex_byte_decode(pdu_str); - DECODE_FAIL(tmp < 0, "addr-len", -1); - pdu_str += HEX_BYTE_LEN; - addr->len = tmp; - - addr_len = addr->len; - if (smsc) { - if (!addr_len) { - goto done; - } - addr_len = addr_len * HEX_BYTE_LEN - HEX_BYTE_LEN; - } else { - if (addr_len & 1) { - addr_len++; - } - } - - STRLEN_CHECK(pdu_str, HEX_BYTE_LEN, -1); - - tmp = hex_byte_decode(pdu_str); - DECODE_FAIL(tmp < 0, "addr-type", -1); - pdu_str += HEX_BYTE_LEN; - addr->type = tmp; - - if (addr_len < 0 || addr_len >= sizeof(addr->addr)) { - log_error("invalid length: 0x%02X", addr_len); - return -1; - } - - log_debug("addr-len [transformed]: 0x%02X", addr_len); - log_debug("addr-type: 0x%02X", addr->type); - - STRLEN_CHECK(pdu_str, addr_len, -1); - - strncpy(addr->addr, pdu_str, addr_len); - - nibble_swap(addr->addr, addr_len); - strunpad(addr->addr, 'F'); - if(addr->type == 0x91) {//91 indicates international format of the phone number - memmove(&addr->addr[1],addr->addr,addr_len); - addr->addr[0]='+'; - }; - pdu_str += addr_len; + const char *begin = pdu_str; + int addr_len; + int tmp; + + memset(addr, 0, sizeof(*addr)); + + STRLEN_CHECK(pdu_str, HEX_BYTE_LEN, -1); + + tmp = hex_byte_decode(pdu_str); + DECODE_FAIL(tmp < 0, "addr-len", -1); + pdu_str += HEX_BYTE_LEN; + addr->len = tmp; + + addr_len = addr->len; + if (smsc) { + if (!addr_len) { + goto done; + } + addr_len = addr_len * HEX_BYTE_LEN - HEX_BYTE_LEN; + } else { + if (addr_len & 1) { + addr_len++; + } + } + + STRLEN_CHECK(pdu_str, HEX_BYTE_LEN, -1); + + tmp = hex_byte_decode(pdu_str); + DECODE_FAIL(tmp < 0, "addr-type", -1); + pdu_str += HEX_BYTE_LEN; + addr->type = tmp; + + if (addr_len < 0 || addr_len >= sizeof(addr->addr)) { + log_error("invalid length: 0x%02X", addr_len); + return -1; + } + + log_debug("addr-len [transformed]: 0x%02X", addr_len); + log_debug("addr-type: 0x%02X", addr->type); + + STRLEN_CHECK(pdu_str, addr_len, -1); + + strncpy(addr->addr, pdu_str, addr_len); + + nibble_swap(addr->addr, addr_len); + strunpad(addr->addr, 'F'); + if (addr->type == 0x91) {//91 indicates international format of the phone number + memmove(&addr->addr[1],addr->addr,addr_len); + addr->addr[0]='+'; + }; + pdu_str += addr_len; done: - log_debug("addr: %s", addr->addr); - log_debug("addr-len: 0x%02X", addr->len); + log_debug("addr: %s", addr->addr); + log_debug("addr-len: 0x%02X", addr->len); - return pdu_str - begin; + return pdu_str - begin; } @@ -178,400 +178,400 @@ shiftl(buf[octet_idx(n) - 1], cycledown(n, 8)) & 0x7F int pdu_decode_user_data(const char *pdu_str, struct pdu_info *pdu, int *nr_octets) { - const char *begin = pdu_str; - int tmp; - uint8_t octets[PDU_OCTETS_MAX + 1]; - int user_data_start_index = 0; - int i; - - STRLEN_CHECK(pdu_str, HEX_BYTE_LEN, -1); - - tmp = hex_byte_decode(pdu_str); - DECODE_FAIL(tmp < 0, "user-data-len", -1); - pdu_str += HEX_BYTE_LEN; - pdu->user_data_len = tmp; - - if (pdu->data_coding.general.unused) { - log_error("data coding group 0x%02X not implemented", - pdu->data_coding.data_coding & 0xF0); - return -1; - } - - - if (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT || - pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2 ) - { - log_debug("data coding alphabet is default (7-bit)"); - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI) { - log_debug("data coding alphabet is default (7-bit) multi-part"); - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_DEFAULT) { - log_debug("data coding alphabet is CDMA default (7-bit)"); - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_EIGHT) { - log_debug("data coding alphabet is eight"); - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_EIGHT) { - log_debug("data coding alphabet is CDMA eight"); - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_TE) { - log_debug("data coding alphabet is TE specific 7-bit"); - } else { - log_debug("data coding alphabet 0x%02X not implemented", - pdu->data_coding.general.alphabet); - return -1; - } - - // ----------------------------------------------------------------------------- - // VERIFY DATA LENGTH AND GET NUMBER OF OCTETS (ACTUAL DATA BYTES IN PDU STRING) - // ----------------------------------------------------------------------------- - if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI)|| - (pdu->data_coding.general.alphabet == PDU_ALPHABET_TE)) { - if (pdu->user_data_len > PDU_UD_7BIT_MAX) { - log_warning("pdu contains invalid user-data-len: 0x%02X", - pdu->user_data_len); - pdu->user_data_len = PDU_UD_7BIT_MAX; - } - - //GSM 7-bit data (septets) length is encoded in PDU as number of septets - // (which is same as user_data_len), but octets is needed for decoding loop - *nr_octets = octets_from_septets(pdu->user_data_len); - - // CDMA 7-BIT ENCODING - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_DEFAULT) { - if (is_vzw_lte()) { - // LE910-SVG stores data length as # of septets - log_debug("counting PDU length byte as number of septets (LE910-SVG/LE910-SV1/LE910-NA1/VZW)"); - *nr_octets = octets_from_septets(pdu->user_data_len); - } - else { - // Other CDMA radios store data length as # of octets - // NOTE: CE910 send PDU needs # of septets but receive PDU is in # of octets - log_debug("counting PDU length byte as number of octets"); - *nr_octets = pdu->user_data_len; - pdu->user_data_len = septets_from_octets(pdu->user_data_len); - } - - - if (pdu->user_data_len > PDU_UD_7BIT_MAX) { - log_warning("pdu contains invalid user-data-len: 0x%02X", pdu->user_data_len); - pdu->user_data_len = PDU_UD_7BIT_MAX; - } - - // GSM & CDMA 8-BIT ENCODING - } else if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_EIGHT) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_EIGHT)) { - if (pdu->user_data_len > PDU_UD_8BIT_MAX) { - log_warning("pdu contains invalid user-data-len: 0x%02X", - pdu->user_data_len); - pdu->user_data_len = PDU_UD_8BIT_MAX; - } - - //Original data is octets (all 8 bits could contain data) - //Therefore, octets = user_data_len - *nr_octets = pdu->user_data_len; - } - - STRLEN_CHECK(pdu_str, *nr_octets * 2, -1); - - log_debug("nr_octets: 0x%02X (encoded data length)", *nr_octets); - log_debug("user-data-len: 0x%02X (decoded data length)", pdu->user_data_len); - - //Copy user data from pdu string into octets - for (i = 0; i < *nr_octets; i++) { - octets[i] = hex_byte_decode(pdu_str); - pdu_str += HEX_BYTE_LEN; - } - - - // --------------------------------------------------------- - // DECODE USER DATA (IF NEEDED) AND COPY INTO pdu->user_data - // --------------------------------------------------------- - // GSM 7-BIT & LVW2 7-BIT MULTI-PART - if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI)|| - (pdu->data_coding.general.alphabet == PDU_ALPHABET_TE)) { - // Keep UDH for concatenated SMS ONLY. - // Otherwise it is impossible to process correctly concatenated SMS. - i = 0; - if (pdu->type.user_data_header || - // For LVW3, LNA3 and LVW2 - Save header ONLY when it's actually a multi-part message. - // Multi-part messages should use Teleservice ID 4101 (0x1005) in LVW2 7-BIT MULTI-PART format. - // See 3GPP2 X.S0004-550-E for details on Teleservice ID. - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI - && pdu->teleservice_id == PDU_TELE_ID_CDMA_WEMT)) { - for (i = 0; i <= octets[0]; ++i) { - pdu->user_data[i] = octets[i]; - } - i = octets[0] + 1; // Set message text start after UDH. - // Process octets padding for 7-bit encoding. - if (0 != (i * 8) % 7) { - pdu->user_data[i] = 0; // set padding data to 0; - i++; - } - } - - user_data_start_index = i; - for (; i < pdu->user_data_len; i++) { - pdu->user_data[i] = decode_septet_from_octet(octets, i); - log_debug("DECODE: i: %d octet: 0x%02X --> data: 0x%02X", i, octets[i], pdu->user_data[i]); - } - pdu->user_data[i] = '\0'; - - // CDMA 7-BIT - } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_DEFAULT) { - // Keep UDH for concatenated SMS. - // Otherwise it is impossible to process correctly concatenated SMS. - i = 0; - if (pdu->type.user_data_header) { - for (i = 0; i <= octets[0]; ++i) { - pdu->user_data[i] = octets[i]; - } - i = octets[0] + 1; // Set message text start after UDH. - // Process octets padding for 7-bit encoding. - if (0 != (i * 8) % 7) { - pdu->user_data[i] = 0; // set padding data to 0; - i++; - } - } - - for (; i < pdu->user_data_len; i++) { - pdu->user_data[i] = decode_cdma_septet_from_octet(octets, i); - log_debug("DECODE: i: %d octet: 0x%02X --> data: 0x%02X", i, octets[i], pdu->user_data[i]); - } - - //Remove padded byte for data length of 7 characters if not LE910-SVG - if (!is_vzw_lte() && (pdu->user_data[i-1] == 0)) { - log_debug("Removing padded char"); - i--; - pdu->user_data_len--; - } - pdu->user_data[i] = '\0'; - - // ALL 8-BIT ENCODING - } else { - for (i = 0; i < pdu->user_data_len; i++) { - pdu->user_data[i] = octets[i]; - } - pdu->user_data[i] = '\0'; - } - - - // --------------------------------------------------------------------- - // FOR GSM 7-BIT ENCODING ONLY, DECODE FROM GSM ALPHABET TO IRA ALPHABET - // (includes LVW2 multi-part) - // --------------------------------------------------------------------- - if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2) || - (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI)) { - int read = user_data_start_index; - int store = user_data_start_index; - - log_debug("Converting from GSM character set to IRA"); - for (; read < pdu->user_data_len; read++) { - if (pdu->user_data[read] == 0x1B) { - //Character from the extended set using the escape char (27) - read++; - log_debug("GSM before: 0x1B%02X | IRA after: 0x%02X", pdu->user_data[read], strExtendedTable[pdu->user_data[read]]); - pdu->user_data[store] = strExtendedTable[pdu->user_data[read]]; - } - else { - log_debug("GSM before: 0x%02X | IRA after: 0x%02X", pdu->user_data[read], strGSMTable[pdu->user_data[read]]); - pdu->user_data[store] = strGSMTable[pdu->user_data[read]]; - } - store++; - } - //Update lengths - pdu->user_data_len -= read - store; - pdu_str -= (read - store) * HEX_BYTE_LEN; - } - - return pdu_str - begin; + const char *begin = pdu_str; + int tmp; + uint8_t octets[PDU_OCTETS_MAX + 1]; + int user_data_start_index = 0; + int i; + + STRLEN_CHECK(pdu_str, HEX_BYTE_LEN, -1); + + tmp = hex_byte_decode(pdu_str); + DECODE_FAIL(tmp < 0, "user-data-len", -1); + pdu_str += HEX_BYTE_LEN; + pdu->user_data_len = tmp; + + if (pdu->data_coding.general.unused) { + log_error("data coding group 0x%02X not implemented", + pdu->data_coding.data_coding & 0xF0); + return -1; + } + + + if (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT || + pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2 ) + { + log_debug("data coding alphabet is default (7-bit)"); + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI) { + log_debug("data coding alphabet is default (7-bit) multi-part"); + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_DEFAULT) { + log_debug("data coding alphabet is CDMA default (7-bit)"); + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_EIGHT) { + log_debug("data coding alphabet is eight"); + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_EIGHT) { + log_debug("data coding alphabet is CDMA eight"); + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_TE) { + log_debug("data coding alphabet is TE specific 7-bit"); + } else { + log_debug("data coding alphabet 0x%02X not implemented", + pdu->data_coding.general.alphabet); + return -1; + } + + // ----------------------------------------------------------------------------- + // VERIFY DATA LENGTH AND GET NUMBER OF OCTETS (ACTUAL DATA BYTES IN PDU STRING) + // ----------------------------------------------------------------------------- + if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT) || + (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2) || + (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI)|| + (pdu->data_coding.general.alphabet == PDU_ALPHABET_TE)) { + if (pdu->user_data_len > PDU_UD_7BIT_MAX) { + log_warning("pdu contains invalid user-data-len: 0x%02X", + pdu->user_data_len); + pdu->user_data_len = PDU_UD_7BIT_MAX; + } + + //GSM 7-bit data (septets) length is encoded in PDU as number of septets + // (which is same as user_data_len), but octets is needed for decoding loop + *nr_octets = octets_from_septets(pdu->user_data_len); + + // CDMA 7-BIT ENCODING + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_DEFAULT) { + if (is_telit_lte_vzw_3gpp2_format()) { + // LE910-SVG stores data length as # of septets + log_debug("counting PDU length byte as number of septets (LE910-SVG/LE910-SV1/LE910-NA1/VZW)"); + *nr_octets = octets_from_septets(pdu->user_data_len); + } + else { + // Other CDMA radios store data length as # of octets + // NOTE: CE910 send PDU needs # of septets but receive PDU is in # of octets + log_debug("counting PDU length byte as number of octets"); + *nr_octets = pdu->user_data_len; + pdu->user_data_len = septets_from_octets(pdu->user_data_len); + } + + + if (pdu->user_data_len > PDU_UD_7BIT_MAX) { + log_warning("pdu contains invalid user-data-len: 0x%02X", pdu->user_data_len); + pdu->user_data_len = PDU_UD_7BIT_MAX; + } + + // GSM & CDMA 8-BIT ENCODING + } else if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_EIGHT) || + (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_EIGHT)) { + if (pdu->user_data_len > PDU_UD_8BIT_MAX) { + log_warning("pdu contains invalid user-data-len: 0x%02X", + pdu->user_data_len); + pdu->user_data_len = PDU_UD_8BIT_MAX; + } + + //Original data is octets (all 8 bits could contain data) + //Therefore, octets = user_data_len + *nr_octets = pdu->user_data_len; + } + + STRLEN_CHECK(pdu_str, *nr_octets * 2, -1); + + log_debug("nr_octets: 0x%02X (encoded data length)", *nr_octets); + log_debug("user-data-len: 0x%02X (decoded data length)", pdu->user_data_len); + + //Copy user data from pdu string into octets + for (i = 0; i < *nr_octets; i++) { + octets[i] = hex_byte_decode(pdu_str); + pdu_str += HEX_BYTE_LEN; + } + + + // --------------------------------------------------------- + // DECODE USER DATA (IF NEEDED) AND COPY INTO pdu->user_data + // --------------------------------------------------------- + // GSM 7-BIT & LVW2 7-BIT MULTI-PART + if ((pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT) || + (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT2) || + (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI)|| + (pdu->data_coding.general.alphabet == PDU_ALPHABET_TE)) { + // Keep UDH for concatenated SMS ONLY. + // Otherwise it is impossible to process correctly concatenated SMS. + i = 0; + if (pdu->type.user_data_header || + // For LVW3, LNA3 and LVW2 - Save header ONLY when it's actually a multi-part message. + // Multi-part messages should use Teleservice ID 4101 (0x1005) in LVW2 7-BIT MULTI-PART format. + // See 3GPP2 X.S0004-550-E for details on Teleservice ID. + (pdu->data_coding.general.alphabet == PDU_ALPHABET_DEFAULT_MULTI + && pdu->teleservice_id == PDU_TELE_ID_CDMA_WEMT)) { + for (i = 0; i <= octets[0]; ++i) { + pdu->user_data[i] = octets[i]; + } + i = octets[0] + 1; // Set message text start after UDH. + // Process octets padding for 7-bit encoding. + if (0 != (i * 8) % 7) { + pdu->user_data[i] = 0; // set padding data to 0; + i++; + } + } + + user_data_start_index = i; + for (; i < pdu->user_data_len; i++) { + pdu->user_data[i] = decode_septet_from_octet(octets, i); + log_debug("DECODE: i: %d octet: 0x%02X --> data: 0x%02X", i, octets[i], pdu->user_data[i]); + } + pdu->user_data[i] = '\0'; + + // CDMA 7-BIT + } else if (pdu->data_coding.general.alphabet == PDU_ALPHABET_CDMA_DEFAULT) { + // Keep UDH for concatenated SMS. + // Otherwise it is impossible to process correctly concatenated SMS. + i = 0; + if (pdu->type.user_data_header) { + for (i = 0; i <= octets[0]; ++i) { + pdu->user_data[i] = octets[i]; + } + i = octets[0] + 1; // Set message text start after UDH. + // Process octets padding for 7-bit encoding. + if (0 != (i * 8) % 7) { + pdu->user_data[i] = 0; // set padding data to 0; + i++; + } + } + + for (; i < pdu->user_data_len; i++) { + pdu->user_data[i] = decode_cdma_septet_from_octet(octets, i); + log_debug("DECODE: i: %d octet: 0x%02X --> data: 0x%02X", i, octets[i], pdu->user_data[i]); + } + + //Remove padded byte for data length of 7 characters if not LE910-SVG + if (!is_telit_lte_vzw_3gpp2_format() && (pdu->user_data[i-1] == 0)) { + log_debug("Removing padded char"); + i--; |