diff options
author | Harald Welte <laforge@gnumonks.org> | 2009-03-30 20:56:32 +0000 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2009-03-30 20:56:32 +0000 |
commit | 7e310b12ff120bdfd4b98eb52d10b013b00a2eaa (patch) | |
tree | 75e704d9e7a1c32214ecf72d59ce7076329642b2 /include | |
parent | 93d9303331b7e103da810e851db1adb1fcf57f6d (diff) |
Store incoming SMS into SQL database
* gsm_util now uses caller-allocated data (rather than callee-allocated)
* correctly parse destination address
* parse (but not transcode) non-default encodings of SMS
* reject SMS to unknown destination number
* resolve target subscriber id and store incoming SMS (without header) in 'sms' table
What we're now missing is the sending part, i.e. a regular task iterating over
all pending SMS and trying to deliver them. Also, check for pending SMS once
we get a LOCATION UPDATE.
Diffstat (limited to 'include')
-rw-r--r-- | include/openbsc/db.h | 4 | ||||
-rw-r--r-- | include/openbsc/gsm_04_11.h | 98 | ||||
-rw-r--r-- | include/openbsc/gsm_data.h | 11 | ||||
-rw-r--r-- | include/openbsc/gsm_utils.h | 5 |
4 files changed, 110 insertions, 8 deletions
diff --git a/include/openbsc/db.h b/include/openbsc/db.h index 9ce718136..61a3ac47c 100644 --- a/include/openbsc/db.h +++ b/include/openbsc/db.h @@ -37,4 +37,8 @@ int db_sync_subscriber(struct gsm_subscriber* subscriber); int db_subscriber_alloc_tmsi(struct gsm_subscriber* subscriber); int db_subscriber_assoc_imei(struct gsm_subscriber* subscriber, char *imei); +/* SMS store-and-forward */ +int db_sms_store(struct gsm_sms *sms); +struct gsm_sms *db_sms_get_unsent(int min_id); +int db_sms_mark_sent(struct gsm_sms *sms); #endif /* _DB_H */ diff --git a/include/openbsc/gsm_04_11.h b/include/openbsc/gsm_04_11.h index 71f6c0c5e..12c607f54 100644 --- a/include/openbsc/gsm_04_11.h +++ b/include/openbsc/gsm_04_11.h @@ -38,24 +38,110 @@ struct gsm411_rp_hdr { u_int8_t data[0]; } __attribute__ ((packed)); +/* our own enum, not related to on-air protocol */ +enum sms_alphabet { + DCS_NONE, + DCS_7BIT_DEFAULT, + DCS_UCS2, + DCS_8BIT_DATA, +}; + /* SMS submit PDU */ struct sms_submit { u_int8_t *smsc; u_int8_t mti:2; - u_int8_t mms:1; u_int8_t vpf:2; - u_int8_t sri:1; - u_int8_t udhi:1; - u_int8_t rp:1; u_int8_t msg_ref; - u_int8_t *dest_addr; u_int8_t pid; u_int8_t dcs; - u_int8_t vp; + u_int8_t *vp; u_int8_t ud_len; u_int8_t *user_data; + + /* interpreted */ + u_int8_t mms:1; + u_int8_t sri:1; + u_int8_t udhi:1; + u_int8_t rp:1; + enum sms_alphabet alphabet; + char dest_addr[20+1]; /* DA LV is 12 bytes max, i.e. 10 bytes BCD == 20 bytes string */ + unsigned long validity_mins; + char decoded[256]; }; +/* GSM 03.40 / Chapter 9.2.3.1: TP-Message-Type-Indicator */ +#define GSM340_SMS_DELIVER_SC2MS 0x00 +#define GSM340_SMS_DELIVER_REP_MS2SC 0x00 +#define GSM340_SMS_STATUS_REP_SC2MS 0x02 +#define GSM340_SMS_COMMAND_MS2SC 0x02 +#define GSM340_SMS_SUBMIT_MS2SC 0x01 +#define GSM340_SMS_SUBMIT_REP_SC2MS 0x01 +#define GSM340_SMS_RESSERVED 0x03 + +/* GSM 03.40 / Chapter 9.2.3.2: TP-More-Messages-to-Send */ +#define GSM340_TP_MMS_MORE 0 +#define GSM340_TP_MMS_NO_MORE 1 + +/* GSM 03.40 / Chapter 9.2.3.3: TP-Validity-Period-Format */ +#define GSM340_TP_VPF_NONE 0 +#define GSM340_TP_VPF_RELATIVE 2 +#define GSM340_TP_VPF_ENHANCED 1 +#define GSM340_TP_VPF_ABSOLUTE 3 + +/* GSM 03.40 / Chapter 9.2.3.4: TP-Status-Report-Indication */ +#define GSM340_TP_SRI_NONE 0 +#define GSM340_TP_SRI_PRESENT 1 + +/* GSM 03.40 / Chapter 9.2.3.5: TP-Status-Report-Request */ +#define GSM340_TP_SRR_NONE 0 +#define GSM340_TP_SRR_REQUESTED 1 + +/* GSM 03.40 / Chapter 9.2.3.9: TP-Protocol-Identifier */ +/* telematic interworking (001 or 111 in bits 7-5) */ +#define GSM340_TP_PID_IMPLICIT 0x00 +#define GSM340_TP_PID_TELEX 0x01 +#define GSM340_TP_PID_FAX_G3 0x02 +#define GSM340_TP_PID_FAX_G4 0x03 +#define GSM340_TP_PID_VOICE 0x04 +#define GSM430_TP_PID_ERMES 0x05 +#define GSM430_TP_PID_NATIONAL_PAGING 0x06 +#define GSM430_TP_PID_VIDEOTEX 0x07 +#define GSM430_TP_PID_TELETEX_UNSPEC 0x08 +#define GSM430_TP_PID_TELETEX_PSPDN 0x09 +#define GSM430_TP_PID_TELETEX_CSPDN 0x0a +#define GSM430_TP_PID_TELETEX_PSTN 0x0b +#define GSM430_TP_PID_TELETEX_ISDN 0x0c +#define GSM430_TP_PID_TELETEX_UCI 0x0d +#define GSM430_TP_PID_MSG_HANDLING 0x10 +#define GSM430_TP_PID_MSG_X400 0x11 +#define GSM430_TP_PID_EMAIL 0x12 +#define GSM430_TP_PID_GSM_MS 0x1f +/* if bit 7 = 0 and bit 6 = 1 */ +#define GSM430_TP_PID_SMS_TYPE_0 0 +#define GSM430_TP_PID_SMS_TYPE_1 1 +#define GSM430_TP_PID_SMS_TYPE_2 2 +#define GSM430_TP_PID_SMS_TYPE_3 3 +#define GSM430_TP_PID_SMS_TYPE_4 4 +#define GSM430_TP_PID_SMS_TYPE_5 5 +#define GSM430_TP_PID_SMS_TYPE_6 6 +#define GSM430_TP_PID_SMS_TYPE_7 7 +#define GSM430_TP_PID_RETURN_CALL_MSG 0x1f +#define GSM430_TP_PID_ME_DATA_DNLOAD 0x3d +#define GSM430_TP_PID_ME_DE_PERSONAL 0x3e +#define GSM430_TP_PID_ME_SIM_DNLOAD 0x3f + +/* GSM 03.38 Chapter 4: SMS Data Coding Scheme */ +#define GSM338_DCS_00_ + +#define GSM338_DCS_1110_7BIT (0 << 2) +#define GSM338_DCS_1111_7BIT (0 << 2) +#define GSM338_DCS_1111_8BIT_DATA (1 << 2) +#define GSM338_DCS_1111_CLASS0 0 +#define GSM338_DCS_1111_CLASS1_ME 1 +#define GSM338_DCS_1111_CLASS2_SIM 2 +#define GSM338_DCS_1111_CLASS3_TE 3 /* See TS 07.05 */ + + /* SMS deliver PDU */ struct sms_deliver { u_int8_t *smsc; diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 84d33d2c4..614c63d17 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -317,6 +317,17 @@ struct gsm_network { struct gsm_bts bts[GSM_MAX_BTS+1]; }; +#define SMS_HDR_SIZE 128 +#define SMS_TEXT_SIZE 256 +struct gsm_sms { + u_int64_t id; + struct gsm_subscriber *sender; + struct gsm_subscriber *receiver; + + unsigned char header[SMS_HDR_SIZE]; + char text[SMS_TEXT_SIZE]; +}; + struct gsm_network *gsm_network_init(unsigned int num_bts, enum gsm_bts_type bts_type, u_int16_t country_code, u_int16_t network_code); diff --git a/include/openbsc/gsm_utils.h b/include/openbsc/gsm_utils.h index b5637c880..c46837185 100644 --- a/include/openbsc/gsm_utils.h +++ b/include/openbsc/gsm_utils.h @@ -2,6 +2,7 @@ /* * (C) 2008 by Daniel Willmann <daniel@totalueberwachung.de> * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org> + * (C) 2009 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -26,7 +27,7 @@ #include <sys/types.h> -char *gsm_7bit_decode(u_int8_t *user_data, u_int8_t length); -u_int8_t *gsm_7bit_encode(const char *data, u_int8_t *length); +int gsm_7bit_decode(char *decoded, const u_int8_t *user_data, u_int8_t length); +int gsm_7bit_encode(u_int8_t *result, const char *data); #endif |