diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 18:58:19 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 18:58:19 +0000 |
commit | b4fa3185fc94fcf96b101e11fa7811e79f6724fd (patch) | |
tree | ae63c6f17ebaadcadb73ed7a759036981b5b0a39 /apps | |
parent | 5c1699bb4e08d422404b8b789608ff85b3bfa508 (diff) |
App is ignoring 'p' parameter -- initial pause.
(closes issue #13617)
Reported by: alecdavis
Patches:
app_sms.13oct.diff.txt uploaded by alecdavis (license 585)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@148985 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_sms.c | 889 |
1 files changed, 495 insertions, 394 deletions
diff --git a/apps/app_sms.c b/apps/app_sms.c index 8df98354f..d32491a2d 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -42,7 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <ctype.h> #include <sys/stat.h> -#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR and LOG_DIR */ +#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR and LOG_DIR */ #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/channel.h" @@ -53,7 +53,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" -/* #define OUTALAW */ /* enable this to output Alaw rather than linear */ +/* #define OUTALAW */ /* enable this to output Alaw rather than linear */ /* ToDo */ /* Add full VP support */ @@ -61,8 +61,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /* Time zones on time stamps */ /* user ref field */ -static volatile unsigned char message_ref; /* arbitary message ref */ -static volatile unsigned int seq; /* arbitrary message sequence number for unqiue files */ +static volatile unsigned char message_ref; /* arbitary message ref */ +static volatile unsigned int seq; /* arbitrary message sequence number for unqiue files */ static char log_file[255]; @@ -113,15 +113,15 @@ static signed short wave[] = { #ifdef OUTALAW static unsigned char wavea[80]; typedef unsigned char output_t; -static const output_t *wave_out = wavea; /* outgoing samples */ +static const output_t *wave_out = wavea; /* outgoing samples */ #define __OUT_FMT AST_FORMAT_ALAW; #else typedef signed short output_t; -static const output_t *wave_out = wave; /* outgoing samples */ +static const output_t *wave_out = wave; /* outgoing samples */ #define __OUT_FMT AST_FORMAT_SLINEAR #endif -#define OSYNC_BITS 80 /* initial sync bits */ +#define OSYNC_BITS 80 /* initial sync bits */ /*! * The SMS spec ETSI ES 201 912 defines two protocols with different message types. @@ -131,32 +131,32 @@ static const output_t *wave_out = wave; /* outgoing samples */ * for Protocol 2, 0x00 means that the message is complete; */ enum message_types { - DLL_SMS_MASK = 0x7f, /* mask for the valid bits */ + DLL_SMS_MASK = 0x7f, /* mask for the valid bits */ /* Protocol 1 values */ - DLL1_SMS_DATA = 0x11, /* data packet */ - DLL1_SMS_ERROR = 0x12, - DLL1_SMS_EST = 0x13, /* start the connection */ - DLL1_SMS_REL = 0x14, /* end the connection */ - DLL1_SMS_ACK = 0x15, - DLL1_SMS_NACK = 0x16, + DLL1_SMS_DATA = 0x11, /* data packet */ + DLL1_SMS_ERROR = 0x12, + DLL1_SMS_EST = 0x13, /* start the connection */ + DLL1_SMS_REL = 0x14, /* end the connection */ + DLL1_SMS_ACK = 0x15, + DLL1_SMS_NACK = 0x16, - DLL1_SMS_COMPLETE = 0x80, /* packet is complete */ - DLL1_SMS_MORE = 0x00, /* more data to follow */ + DLL1_SMS_COMPLETE = 0x80, /* packet is complete */ + DLL1_SMS_MORE = 0x00, /* more data to follow */ /* Protocol 2 values */ - DLL2_SMS_EST = 0x7f, /* magic number. No message body */ - DLL2_SMS_INFO_MO = 0x10, - DLL2_SMS_INFO_MT = 0x11, - DLL2_SMS_INFO_STA = 0x12, - DLL2_SMS_NACK = 0x13, - DLL2_SMS_ACK0 = 0x14, /* ack even-numbered frame */ - DLL2_SMS_ACK1 = 0x15, /* ack odd-numbered frame */ - DLL2_SMS_ENQ = 0x16, - DLL2_SMS_REL = 0x17, /* end the connection */ - - DLL2_SMS_COMPLETE = 0x00, /* packet is complete */ - DLL2_SMS_MORE = 0x80, /* more data to follow */ + DLL2_SMS_EST = 0x7f, /* magic number. No message body */ + DLL2_SMS_INFO_MO = 0x10, + DLL2_SMS_INFO_MT = 0x11, + DLL2_SMS_INFO_STA = 0x12, + DLL2_SMS_NACK = 0x13, + DLL2_SMS_ACK0 = 0x14, /* ack even-numbered frame */ + DLL2_SMS_ACK1 = 0x15, /* ack odd-numbered frame */ + DLL2_SMS_ENQ = 0x16, + DLL2_SMS_REL = 0x17, /* end the connection */ + + DLL2_SMS_COMPLETE = 0x00, /* packet is complete */ + DLL2_SMS_MORE = 0x80, /* more data to follow */ }; /* SMS 7 bit character mapping to UCS-2 */ @@ -184,8 +184,8 @@ static const unsigned short escapes[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -#define SMSLEN 160 /*!< max SMS length */ -#define SMSLEN_8 140 /*!< max SMS length for 8-bit char */ +#define SMSLEN 160 /*!< max SMS length */ +#define SMSLEN_8 140 /*!< max SMS length for 8-bit char */ typedef struct sms_s { unsigned char hangup; /*!< we are done... */ @@ -244,21 +244,22 @@ typedef struct sms_s { int protocol; /*!< ETSI SMS protocol to use (passed at app call) */ int oseizure; /*!< protocol 2: channel seizure bits to send */ int framenumber; /*!< protocol 2: frame number (for sending ACK0 or ACK1) */ - char udtxt[SMSLEN]; /*!< user data (message), PLAIN text */ + char udtxt[SMSLEN]; /*!< user data (message), PLAIN text */ } sms_t; /* different types of encoding */ -#define is7bit(dcs) ( ((dcs) & 0xC0) ? (!((dcs)&4) ) : (((dcs) & 0xc) == 0) ) -#define is8bit(dcs) ( ((dcs) & 0xC0) ? ( ((dcs)&4) ) : (((dcs) & 0xc) == 4) ) -#define is16bit(dcs) ( ((dcs) & 0xC0) ? 0 : (((dcs) & 0xc) == 8) ) +#define is7bit(dcs) ( ((dcs) & 0xC0) ? (!((dcs) & 4) ) : (((dcs) & 0xc) == 0) ) +#define is8bit(dcs) ( ((dcs) & 0xC0) ? ( ((dcs) & 4) ) : (((dcs) & 0xc) == 4) ) +#define is16bit(dcs) ( ((dcs) & 0xC0) ? 0 : (((dcs) & 0xc) == 8) ) static void sms_messagetx(sms_t *h); /*! \brief copy number, skipping non digits apart from leading + */ static void numcpy(char *d, char *s) { - if (*s == '+') + if (*s == '+') { *d++ = *s++; + } while (*s) { if (isdigit(*s)) { *d++ = *s; @@ -284,44 +285,51 @@ static char *isodate(time_t t, char *buf, int len) static long utf8decode(unsigned char **pp) { unsigned char *p = *pp; - if (!*p) - return 0; /* null termination of string */ + if (!*p) { + return 0; /* null termination of string */ + } (*pp)++; - if (*p < 0xC0) - return *p; /* ascii or continuation character */ + if (*p < 0xC0) { + return *p; /* ascii or continuation character */ + } if (*p < 0xE0) { - if (*p < 0xC2 || (p[1] & 0xC0) != 0x80) - return *p; /* not valid UTF-8 */ + if (*p < 0xC2 || (p[1] & 0xC0) != 0x80) { + return *p; /* not valid UTF-8 */ + } (*pp)++; return ((*p & 0x1F) << 6) + (p[1] & 0x3F); } if (*p < 0xF0) { - if ((*p == 0xE0 && p[1] < 0xA0) || (p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80) - return *p; /* not valid UTF-8 */ + if ((*p == 0xE0 && p[1] < 0xA0) || (p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80) { + return *p; /* not valid UTF-8 */ + } (*pp) += 2; return ((*p & 0x0F) << 12) + ((p[1] & 0x3F) << 6) + (p[2] & 0x3F); } if (*p < 0xF8) { - if ((*p == 0xF0 && p[1] < 0x90) || (p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80 || (p[3] & 0xC0) != 0x80) - return *p; /* not valid UTF-8 */ + if ((*p == 0xF0 && p[1] < 0x90) || (p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80 || (p[3] & 0xC0) != 0x80) { + return *p; /* not valid UTF-8 */ + } (*pp) += 3; return ((*p & 0x07) << 18) + ((p[1] & 0x3F) << 12) + ((p[2] & 0x3F) << 6) + (p[3] & 0x3F); } if (*p < 0xFC) { if ((*p == 0xF8 && p[1] < 0x88) || (p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80 || (p[3] & 0xC0) != 0x80 - || (p[4] & 0xC0) != 0x80) - return *p; /* not valid UTF-8 */ + || (p[4] & 0xC0) != 0x80) { + return *p; /* not valid UTF-8 */ + } (*pp) += 4; return ((*p & 0x03) << 24) + ((p[1] & 0x3F) << 18) + ((p[2] & 0x3F) << 12) + ((p[3] & 0x3F) << 6) + (p[4] & 0x3F); } if (*p < 0xFE) { if ((*p == 0xFC && p[1] < 0x84) || (p[1] & 0xC0) != 0x80 || (p[2] & 0xC0) != 0x80 || (p[3] & 0xC0) != 0x80 - || (p[4] & 0xC0) != 0x80 || (p[5] & 0xC0) != 0x80) - return *p; /* not valid UTF-8 */ + || (p[4] & 0xC0) != 0x80 || (p[5] & 0xC0) != 0x80) { + return *p; /* not valid UTF-8 */ + } (*pp) += 5; return ((*p & 0x01) << 30) + ((p[1] & 0x3F) << 24) + ((p[2] & 0x3F) << 18) + ((p[3] & 0x3F) << 12) + ((p[4] & 0x3F) << 6) + (p[5] & 0x3F); } - return *p; /* not sensible */ + return *p; /* not sensible */ } /*! \brief takes a binary header (udhl bytes at udh) and UCS-2 message (udl characters at ud) and packs in to o using SMS 7 bit character codes */ @@ -330,15 +338,16 @@ static long utf8decode(unsigned char **pp) /* if the input contains invalid characters then the return value is -1 */ static int packsms7(unsigned char *o, int udhl, unsigned char *udh, int udl, unsigned short *ud) { - unsigned char p = 0; /* output pointer (bytes) */ - unsigned char b = 0; /* bit position */ - unsigned char n = 0; /* output character count */ + unsigned char p = 0; /* output pointer (bytes) */ + unsigned char b = 0; /* bit position */ + unsigned char n = 0; /* output character count */ unsigned char dummy[SMSLEN]; - if (o == NULL) /* output to a dummy buffer if o not set */ + if (o == NULL) { /* output to a dummy buffer if o not set */ o = dummy; + } - if (udhl) { /* header */ + if (udhl) { /* header */ o[p++] = udhl; b = 1; n = 1; @@ -356,7 +365,7 @@ static int packsms7(unsigned char *o, int udhl, unsigned char *udh, int udl, uns b = 7 - b; if (++n >= SMSLEN) return n; - }; /* filling to septet boundary */ + } /* filling to septet boundary */ } o[p] = 0; /* message */ @@ -372,7 +381,7 @@ static int packsms7(unsigned char *o, int udhl, unsigned char *udh, int udl, uns for (v = 0; v < 128 && escapes[v] != u; v++); if (v < 128) { /* escaped sequence, esc + v */ /* store the low (8-b) bits in o[p], the remaining bits in o[p+1] */ - o[p] |= (27 << b); /* the low bits go into o[p] */ + o[p] |= (27 << b); /* the low bits go into o[p] */ b += 7; if (b >= 8) { b -= 8; @@ -383,7 +392,7 @@ static int packsms7(unsigned char *o, int udhl, unsigned char *udh, int udl, uns } } if (v == 128) - return -1; /* invalid character */ + return -1; /* invalid character */ /* store, same as above */ o[p] |= (v << b); b += 7; @@ -416,18 +425,21 @@ static int packsms8(unsigned char *o, int udhl, unsigned char *udh, int udl, uns o[p++] = udhl; while (udhl--) { o[p++] = *udh++; - if (p >= SMSLEN_8) + if (p >= SMSLEN_8) { return p; + } } } while (udl--) { long u; u = *ud++; - if (u < 0 || u > 0xFF) - return -1; /* not valid */ + if (u < 0 || u > 0xFF) { + return -1; /* not valid */ + } o[p++] = u; - if (p >= SMSLEN_8) + if (p >= SMSLEN_8) { return p; + } } return p; } @@ -445,26 +457,30 @@ static int packsms16(unsigned char *o, int udhl, unsigned char *udh, int udl, un unsigned char p = 0; unsigned char dummy[SMSLEN_8]; - if (o == NULL) + if (o == NULL) { o = dummy; + } /* header - no encoding */ if (udhl) { o[p++] = udhl; while (udhl--) { o[p++] = *udh++; - if (p >= SMSLEN_8) + if (p >= SMSLEN_8) { return p; + } } } while (udl--) { long u; u = *ud++; o[p++] = (u >> 8); - if (p >= SMSLEN_8) - return p - 1; /* could not fit last character */ + if (p >= SMSLEN_8) { + return p - 1; /* could not fit last character */ + } o[p++] = u; - if (p >= SMSLEN_8) + if (p >= SMSLEN_8) { return p; + } } return p; } @@ -474,27 +490,27 @@ static int packsms16(unsigned char *o, int udhl, unsigned char *udh, int udl, un static int packsms(unsigned char dcs, unsigned char *base, unsigned int udhl, unsigned char *udh, int udl, unsigned short *ud) { unsigned char *p = base; - if (udl == 0) - *p++ = 0; /* no user data */ - else { + if (udl == 0) { + *p++ = 0; /* no user data */ + } else { int l = 0; - if (is7bit(dcs)) { /* 7 bit */ - l = packsms7(p + 1, udhl, udh, udl, ud); - if (l < 0) + if (is7bit(dcs)) { /* 7 bit */ + if ((l = packsms7(p + 1, udhl, udh, udl, ud)) < 0) { l = 0; + } *p++ = l; p += (l * 7 + 7) / 8; - } else if (is8bit(dcs)) { /* 8 bit */ - l = packsms8(p + 1, udhl, udh, udl, ud); - if (l < 0) + } else if (is8bit(dcs)) { /* 8 bit */ + if ((l = packsms8(p + 1, udhl, udh, udl, ud)) < 0) { l = 0; + } *p++ = l; p += l; - } else { /* UCS-2 */ - l = packsms16(p + 1, udhl, udh, udl, ud); - if (l < 0) + } else { /* UCS-2 */ + if ((l = packsms16(p + 1, udhl, udh, udl, ud)) < 0) { l = 0; + } *p++ = l; p += l; } @@ -522,10 +538,11 @@ static void packdate(unsigned char *o, time_t w) *o++ = ((t.tm_hour % 10) << 4) + t.tm_hour / 10; *o++ = ((t.tm_min % 10) << 4) + t.tm_min / 10; *o++ = ((t.tm_sec % 10) << 4) + t.tm_sec / 10; - if (z < 0) + if (z < 0) { *o++ = (((-z) % 10) << 4) + (-z) / 10 + 0x08; - else + } else { *o++ = ((z % 10) << 4) + z / 10; + } } /*! \brief unpack a date and return */ @@ -540,10 +557,11 @@ static struct timeval unpackdate(unsigned char *i) t.tm_min = (i[4] & 0xF) * 10 + (i[4] >> 4); t.tm_sec = (i[5] & 0xF) * 10 + (i[5] >> 4); t.tm_isdst = 0; - if (i[6] & 0x08) + if (i[6] & 0x08) { t.tm_min += 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4)); - else + } else { t.tm_min -= 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4)); + } return ast_mktime(&t, NULL); } @@ -556,7 +574,7 @@ static void unpacksms7(unsigned char *i, unsigned char l, unsigned char *udh, in unsigned char b = 0, p = 0; unsigned short *o = ud; *udhl = 0; - if (udhi && l) { /* header */ + if (udhi && l) { /* header */ int h = i[p]; *udhl = h; if (h) { @@ -569,8 +587,9 @@ static void unpacksms7(unsigned char *i, unsigned char l, unsigned char *udh, in while (b >= 7) { b -= 7; l--; - if (!l) + if (!l) { break; + } } } /* adjust for fill, septets */ @@ -582,20 +601,22 @@ static void unpacksms7(unsigned char *i, unsigned char l, unsigned char *udh, in } while (l--) { unsigned char v; - if (b < 2) - v = ((i[p] >> b) & 0x7F); /* everything in one byte */ - else + if (b < 2) { + v = ((i[p] >> b) & 0x7F); /* everything in one byte */ + } else { v = ((((i[p] >> b) + (i[p + 1] << (8 - b)))) & 0x7F); + } b += 7; if (b >= 8) { b -= 8; p++; } /* 0x00A0 is the encoding of ESC (27) in defaultalphabet */ - if (o > ud && o[-1] == 0x00A0 && escapes[v]) + if (o > ud && o[-1] == 0x00A0 && escapes[v]) { o[-1] = escapes[v]; - else + } else { *o++ = defaultalphabet[v]; + } } *udl = (o - ud); } @@ -621,8 +642,9 @@ static void unpacksms8(unsigned char *i, unsigned char l, unsigned char *udh, in } } } - while (l--) - *o++ = *i++; /* not to UTF-8 as explicitly 8 bit coding in DCS */ + while (l--) { + *o++ = *i++; /* not to UTF-8 as explicitly 8 bit coding in DCS */ + } *udl = (o - ud); } @@ -648,8 +670,9 @@ static void unpacksms16(unsigned char *i, unsigned char l, unsigned char *udh, i } while (l--) { int v = *i++; - if (l--) + if (l--) { v = (v << 8) + *i++; + } *o++ = v; } *udl = (o - ud); @@ -661,26 +684,28 @@ static int unpacksms(unsigned char dcs, unsigned char *i, unsigned char *udh, in int l = *i++; if (is7bit(dcs)) { unpacksms7(i, l, udh, udhl, ud, udl, udhi); - l = (l * 7 + 7) / 8; /* adjust length to return */ - } else if (is8bit(dcs)) + l = (l * 7 + 7) / 8; /* adjust length to return */ + } else if (is8bit(dcs)) { unpacksms8(i, l, udh, udhl, ud, udl, udhi); - else + } else { unpacksms16(i, l, udh, udhl, ud, udl, udhi); + } return l + 1; } /*! \brief unpack an address from i, return byte length, unpack to o */ static unsigned char unpackaddress(char *o, unsigned char *i) { - unsigned char l = i[0], - p; - if (i[1] == 0x91) + unsigned char l = i[0], p; + if (i[1] == 0x91) { *o++ = '+'; + } for (p = 0; p < l; p++) { - if (p & 1) + if (p & 1) { *o++ = (i[2 + p / 2] >> 4) + '0'; - else + } else { *o++ = (i[2 + p / 2] & 0xF) + '0'; + } } *o = 0; return (l + 5) / 2; @@ -690,23 +715,27 @@ static unsigned char unpackaddress(char *o, unsigned char *i) static unsigned char packaddress(unsigned char *o, char *i) { unsigned char p = 2; - o[0] = 0; /* number of bytes */ - if (*i == '+') { /* record as bit 0 in byte 1 */ + o[0] = 0; /* number of bytes */ + if (*i == '+') { /* record as bit 0 in byte 1 */ i++; o[1] = 0x91; - } else + } else { o[1] = 0x81; + } for ( ; *i ; i++) { - if (!isdigit(*i)) /* ignore non-digits */ + if (!isdigit(*i)) { /* ignore non-digits */ continue; - if (o[0] & 1) + } + if (o[0] & 1) { o[p++] |= ((*i & 0xF) << 4); - else + } else { o[p] = (*i & 0xF); + } o[0]++; } - if (o[0] & 1) - o[p++] |= 0xF0; /* pad */ + if (o[0] & 1) { + o[p++] |= 0xF0; /* pad */ + } return p; } @@ -715,16 +744,18 @@ static void sms_log(sms_t * h, char status) { int o; - if (*h->oa == '\0' && *h->da == '\0') + if (*h->oa == '\0' && *h->da == '\0') { return; + } o = open(log_file, O_CREAT | O_APPEND | O_WRONLY, AST_FILE_MODE); if (o >= 0) { char line[1000], mrs[3] = "", *p; char buf[30]; unsigned char n; - if (h->mr >= 0) + if (h->mr >= 0) { snprintf(mrs, sizeof(mrs), "%02X", h->mr); + } snprintf(line, sizeof(line), "%s %c%c%c%s %s %s %s ", isodate(time(NULL), buf, sizeof(buf)), status, h->rx ? 'I' : 'O', h->smsc ? 'S' : 'M', mrs, h->queue, @@ -740,10 +771,11 @@ static void sms_log(sms_t * h, char status) } else if (h->ud[n] == '\r') { *p++ = '\\'; *p++ = 'r'; - } else if (h->ud[n] < 32 || h->ud[n] == 127) + } else if (h->ud[n] < 32 || h->ud[n] == 127) { *p++ = 191; - else + } else { *p++ = h->ud[n]; + } } *p++ = '\n'; *p = 0; @@ -758,15 +790,15 @@ static void sms_readfile(sms_t * h, char *fn) { char line[1000]; FILE *s; - char dcsset = 0; /* if DSC set */ + char dcsset = 0; /* if DSC set */ ast_log(LOG_EVENT, "Sending %s\n", fn); h->rx = h->udl = *h->oa = *h->da = h->pid = h->srr = h->udhi = h->rp = h->vp = h->udhl = 0; h->mr = -1; - h->dcs = 0xF1; /* normal messages class 1 */ + h->dcs = 0xF1; /* normal messages class 1 */ h->scts = ast_tvnow(); s = fopen(fn, "r"); if (s) { - if (unlink(fn)) { /* concurrent access, we lost */ + if (unlink(fn)) { /* concurrent access, we lost */ fclose(s); return; } @@ -774,54 +806,55 @@ static void sms_readfile(sms_t * h, char *fn) char *p; void *pp = &p; for (p = line; *p && *p != '\n' && *p != '\r'; p++); - *p = 0; /* strip eoln */ + *p = 0; /* strip eoln */ p = line; - if (!*p || *p == ';') - continue; /* blank line or comment, ignore */ + if (!*p || *p == ';') { + continue; /* blank line or comment, ignore */ + } while (isalnum(*p)) { *p = tolower (*p); p++; } - while (isspace (*p)) + while (isspace (*p)) { *p++ = 0; + } if (*p == '=') { *p++ = 0; - if (!strcmp(line, "ud")) { /* parse message (UTF-8) */ + if (!strcmp(line, "ud")) { /* parse message (UTF-8) */ unsigned char o = 0; - memcpy(h->udtxt, p, SMSLEN); /* for protocol 2 */ - while (*p && o < SMSLEN) + memcpy(h->udtxt, p, SMSLEN); /* for protocol 2 */ + while (*p && o < SMSLEN) { h->ud[o++] = utf8decode(pp); + } h->udl = o; - if (*p) + if (*p) { ast_log(LOG_WARNING, "UD too long in %s\n", fn); + } } else { - while (isspace (*p)) + while (isspace (*p)) { p++; - if (!strcmp(line, "oa") && strlen(p) < sizeof(h->oa)) + } + if (!strcmp(line, "oa") && strlen(p) < sizeof(h->oa)) { numcpy (h->oa, p); - else if (!strcmp(line, "da") && strlen(p) < sizeof(h->oa)) + } else if (!strcmp(line, "da") && strlen(p) < sizeof(h->oa)) { numcpy (h->da, p); - else if (!strcmp(line, "pid")) + } else if (!strcmp(line, "pid")) { h->pid = atoi(p); - else if (!strcmp(line, "dcs")) { + } else if (!strcmp(line, "dcs")) { h->dcs = atoi(p); dcsset = 1; - } else if (!strcmp(line, "mr")) + } else if (!strcmp(line, "mr")) { h->mr = atoi(p); - else if (!strcmp(line, "srr")) + } else if (!strcmp(line, "srr")) { h->srr = (atoi(p) ? 1 : 0); - else if (!strcmp(line, "vp")) + } else if (!strcmp(line, "vp")) { h->vp = atoi(p); - else if (!strcmp(line, "rp")) + } else if (!strcmp(line, "rp")) { h->rp = (atoi(p) ? 1 : 0); - else if (!strcmp(line, "scts")) { /* get date/time */ - int Y, - m, - d, - H, - M, - S; - if (sscanf (p, "%d-%d-%dT%d:%d:%d", &Y, &m, &d, &H, &M, &S) == 6) { + } else if (!strcmp(line, "scts")) { /* get date/time */ + int Y, m, d, H, M, S; + /* XXX Why aren't we using ast_strptime here? */ + if (sscanf(p, "%d-%d-%dT%d:%d:%d", &Y, &m, &d, &H, &M, &S) == 6) { struct ast_tm t = { 0, }; t.tm_year = Y - 1900; t.tm_mon = m - 1; @@ -831,17 +864,19 @@ static void sms_readfile(sms_t * h, char *fn) t.tm_sec = S; t.tm_isdst = -1; h->scts = ast_mktime(&t, NULL); - if (h->scts.tv_sec == 0) + if (h->scts.tv_sec == 0) { ast_log(LOG_WARNING, "Bad date/timein %s: %s", fn, p); + } } - } else + } else { ast_log(LOG_WARNING, "Cannot parse in %s: %s=%si\n", fn, line, p); + } } - } else if (*p == '#') { /* raw hex format */ + } else if (*p == '#') { /* raw hex format */ *p++ = 0; if (*p == '#') { p++; - if (!strcmp(line, "ud")) { /* user data */ + if (!strcmp(line, "ud")) { /* user data */ int o = 0; while (*p && o < SMSLEN) { if (isxdigit(*p) && isxdigit(p[1]) && isxdigit(p[2]) && isxdigit(p[3])) { @@ -858,19 +893,21 @@ static void sms_readfile(sms_t * h, char *fn) ast_log(LOG_WARNING, "UD too long / invalid UCS-2 hex in %s\n", fn); } else ast_log(LOG_WARNING, "Only ud can use ## format, %s\n", fn); - } else if (!strcmp(line, "ud")) { /* user data */ + } else if (!strcmp(line, "ud")) { /* user data */ int o = 0; while (*p && o < SMSLEN) { if (isxdigit(*p) && isxdigit(p[1])) { h->ud[o++] = (((isalpha(*p) ? 9 : 0) + (*p & 0xF)) << 4) + ((isalpha(p[1]) ? 9 : 0) + (p[1] & 0xF)); p += 2; - } else + } else { break; + } } h->udl = o; - if (*p) + if (*p) { ast_log(LOG_WARNING, "UD too long / invalid UCS-1 hex in %s\n", fn); - } else if (!strcmp(line, "udh")) { /* user data header */ + } + } else if (!strcmp(line, "udh")) { /* user data header */ unsigned char o = 0; h->udhi = 1; while (*p && o < SMSLEN) { @@ -878,37 +915,44 @@ static void sms_readfile(sms_t * h, char *fn) h->udh[o] = (((isalpha(*p) ? 9 : 0) + (*p & 0xF)) << 4) + ((isalpha(p[1]) ? 9 : 0) + (p[1] & 0xF)); o++; p += 2; - } else + } else { break; + } } h->udhl = o; - if (*p) + if (*p) { ast_log(LOG_WARNING, "UDH too long / invalid hex in %s\n", fn); - } else + } + } else { ast_log(LOG_WARNING, "Only ud and udh can use # format, %s\n", fn); - } else + } + } else { ast_log(LOG_WARNING, "Cannot parse in %s: %s\n", fn, line); + } } fclose(s); if (!dcsset && packsms7(0, h->udhl, h->udh, h->udl, h->ud) < 0) { if (packsms8(0, h->udhl, h->udh, h->udl, h->ud) < 0) { - if (packsms16(0, h->udhl, h->udh, h->udl, h->ud) < 0) + if (packsms16(0, h->udhl, h->udh, h->udl, h->ud) < 0) { ast_log(LOG_WARNING, "Invalid UTF-8 message even for UCS-2 (%s)\n", fn); - else { - h->dcs = 0x08; /* default to 16 bit */ + } else { + h->dcs = 0x08; /* default to 16 bit */ ast_log(LOG_WARNING, "Sending in 16 bit format(%s)\n", fn); } } else { - h->dcs = 0xF5; /* default to 8 bit */ + h->dcs = 0xF5; /* default to 8 bit */ ast_log(LOG_WARNING, "Sending in 8 bit format(%s)\n", fn); } } - if (is7bit(h->dcs) && packsms7(0, h->udhl, h->udh, h->udl, h->ud) < 0) + if (is7bit(h->dcs) && packsms7(0, h->udhl, h->udh, h->udl, h->ud) < 0) { ast_log(LOG_WARNING, "Invalid 7 bit GSM data %s\n", fn); - if (is8bit(h->dcs) && packsms8(0, h->udhl, h->udh, h->udl, h->ud) < 0) + } + if (is8bit(h->dcs) && packsms8(0, h->udhl, h->udh, h->udl, h->ud) < 0) { ast_log(LOG_WARNING, "Invalid 8 bit data %s\n", fn); - if (is16bit(h->dcs) && packsms16(0, h->udhl, h->udh, h->udl, h->ud) < 0) + } + if (is16bit(h->dcs) && packsms16(0, h->udhl, h->udh, h->udl, h->ud) < 0) { ast_log(LOG_WARNING, "Invalid 16 bit data %s\n", fn); + } } } @@ -923,43 +967,45 @@ static void sms_writefile(sms_t * h) h->scts = ast_tvnow(); } snprintf(fn, sizeof(fn), "%s/sms/%s", ast_config_AST_SPOOL_DIR, h->smsc ? h->rx ? "morx" : "mttx" : h->rx ? "mtrx" : "motx"); - ast_mkdir(fn, 0777); /* ensure it exists */ + ast_mkdir(fn, 0777); /* ensure it exists */ ast_copy_string(fn2, fn, sizeof(fn2)); snprintf(fn2 + strlen(fn2), sizeof(fn2) - strlen(fn2), "/%s.%s-%d", h->queue, isodate(h->scts.tv_sec, buf, sizeof(buf)), seq++); snprintf(fn + strlen(fn), sizeof(fn) - strlen(fn), "/.%s", fn2 + strlen(fn) + 1); - o = fopen(fn, "w"); - if (o == NULL) + if ((o = fopen(fn, "w")) == NULL) { return; + } - if (*h->oa) + if (*h->oa) { fprintf(o, "oa=%s\n", h->oa); - if (*h->da) + } + if (*h->da) { fprintf(o, "da=%s\n", h->da); + } if (h->udhi) { unsigned int p; fprintf(o, "udh#"); - for (p = 0; p < h->udhl; p++) + for (p = 0; p < h->udhl; p++) { fprintf(o, "%02X", h->udh[p]); + } fprintf(o, "\n"); } if (h->udl) { unsigned int p; for (p = 0; p < h->udl && h->ud[p] >= ' '; p++); - if (p < h->udl) - fputc(';', o); /* cannot use ud=, but include as a comment for human readable */ + if (p < h->udl) { + fputc(';', o); /* cannot use ud=, but include as a comment for human readable */ + } fprintf(o, "ud="); for (p = 0; p < h->udl; p++) { unsigned short v = h->ud[p]; - if (v < 32) + if (v < 32) { fputc(191, o); - else if (v < 0x80) + } else if (v < 0x80) { fputc(v, o); - else if (v < 0x800) - { + } else if (v < 0x800) { fputc(0xC0 + (v >> 6), o); fputc(0x80 + (v & 0x3F), o); - } else - { + } else { fputc(0xE0 + (v >> 12), o); fputc(0x80 + ((v >> 6) & 0x3F), o); fputc(0x80 + (v & 0x3F), o); @@ -969,15 +1015,17 @@ static void sms_writefile(sms_t * h) for (p = 0; p < h->udl && h->ud[p] >= ' '; p++); if (p < h->udl) { for (p = 0; p < h->udl && h->ud[p] < 0x100; p++); - if (p == h->udl) { /* can write in ucs-1 hex */ + if (p == h->udl) { /* can write in ucs-1 hex */ fprintf(o, "ud#"); - for (p = 0; p < h->udl; p++) + for (p = 0; p < h->udl; p++) { fprintf(o, "%02X", h->ud[p]); + } fprintf(o, "\n"); - } else { /* write in UCS-2 */ + } else { /* write in UCS-2 */ fprintf(o, "ud##"); - for (p = 0; p < h->udl; p++) + for (p = 0; p < h->udl; p++) { fprintf(o, "%04X", h->ud[p]); + } fprintf(o, "\n"); } } @@ -986,23 +1034,30 @@ static void sms_writefile(sms_t * h) char datebuf[30]; fprintf(o, "scts=%s\n", isodate(h->scts.tv_sec, datebuf, sizeof(datebuf))); } - if (h->pid) + if (h->pid) { fprintf(o, "pid=%d\n", h->pid); - if (h->dcs != 0xF1) + } + if (h->dcs != 0xF1) { fprintf(o, "dcs=%d\n", h->dcs); - if (h->vp) + } + if (h->vp) { fprintf(o, "vp=%d\n", h->vp); - if (h->srr) + } + if (h->srr) { fprintf(o, "srr=1\n"); - if (h->mr >= 0) + } + if (h->mr >= 0) { fprintf(o, "mr=%d\n", h->mr); - if (h->rp) + } + if (h->rp) { fprintf(o, "rp=1\n"); + } fclose(o); - if (rename(fn, fn2)) + if (rename(fn, fn2)) { unlink(fn); - else + } else { ast_log(LOG_EVENT, "Received to %s\n", fn2); + } } /*! \brief read dir skipping dot files... */ @@ -1019,8 +1074,8 @@ static struct dirent *readdirqueue(DIR *d, char *queue) static unsigned char sms_handleincoming (sms_t * h) { unsigned char p = 3; - if (h->smsc) { /* SMSC */ - if ((h->imsg[2] & 3) == 1) { /* SMS-SUBMIT */ + if (h->smsc) { /* SMSC */ + if ((h->imsg[2] & 3) == 1) { /* SMS-SUBMIT */ h->udhl = h->udl = 0; h->vp = 0; h->srr = ((h->imsg[2] & 0x20) ? 1 : 0); @@ -1032,21 +1087,23 @@ static unsigned char sms_handleincoming (sms_t * h) p += unpackaddress(h->da, h->imsg + p); h->pid = h->imsg[p++]; h->dcs = h->imsg[p++]; - if ((h->imsg[2] & 0x18) == 0x10) { /* relative VP */ - if (h->imsg[p] < 144) + if ((h->imsg[2] & 0x18) == 0x10) { /* relative VP */ + if (h->imsg[p] < 144) { h->vp = (h->imsg[p] + 1) * 5; - else if (h->imsg[p] < 168) + } else if (h->imsg[p] < 168) { h->vp = 720 + (h->imsg[p] - 143) * 30; - else if (h->imsg[p] < 197) + } else if (h->imsg[p] < 197) { h->vp = (h->imsg[p] - 166) * 1440; - else + } else { h->vp = (h->imsg[p] - 192) * 10080; + } p++; - } else if (h->imsg[2] & 0x18) - p += 7; /* ignore enhanced / absolute VP */ + } else if (h->imsg[2] & 0x18) { + p += 7; /* ignore enhanced / absolute VP */ + } p += unpacksms(h->dcs, h->imsg + p, h->udh, &h->udhl, h->ud, &h->udl, h->udhi); - h->rx = 1; /* received message */ - sms_writefile(h); /* write the file */ + h->rx = 1; /* received message */ + sms_writefile(h); /* write the file */ if (p != h->imsg[1] + 2) { ast_log(LOG_WARNING, "Mismatch receive unpacking %d/%d\n", p, h->imsg[1] + 2); return 0xFF; /* duh! */ @@ -1055,8 +1112,8 @@ static unsigned char sms_handleincoming (sms_t * h) ast_log(LOG_WARNING, "Unknown message type %02X\n", h->imsg[2]); return 0xFF; } - } else { /* client */ - if (!(h->imsg[2] & 3)) { /* SMS-DELIVER */ + } else { /* client */ + if (!(h->imsg[2] & 3)) { /* SMS-DELIVER */ *h->da = h->srr = h->rp = h->vp = h->udhi = h->udhl = h->udl = 0; h->srr = ((h->imsg[2] & 0x20) ? 1 : 0); h->udhi = ((h->imsg[2] & 0x40) ? 1 : 0); @@ -1068,18 +1125,18 @@ static unsigned char sms_handleincoming (sms_t * h) h->scts = unpackdate(h->imsg + p); p += 7; p += unpacksms(h->dcs, h->imsg + p, h->udh, &h->udhl, h->ud, &h->udl, h->udhi); - h->rx = 1; /* received message */ - sms_writefile(h); /* write the file */ + h->rx = 1; /* received message */ + sms_writefile(h); /* write the file */ if (p != h->imsg[1] + 2) { ast_log(LOG_WARNING, "Mismatch receive unpacking %d/%d\n", p, h->imsg[1] + 2); - return 0xFF; /* duh! */ + return 0xFF; /* duh! */ } } else { ast_log(LOG_WARNING, "Unknown message type %02X\n", h->imsg[2]); return 0xFF; } } - return 0; /* no error */ + return 0; /* no error */ } #ifdef SOLARIS @@ -1092,25 +1149,27 @@ static unsigned char sms_handleincoming (sms_t * h) */ static void adddata_proto2(sms_t *h, unsigned char msg, char *data, int size) { - int x = h->omsg[1]+2; /* Get current position */ - if (x == 2) - x += 2; /* First: skip Payload length (set later) */ - h->omsg[x++] = msg; /* Message code */ - h->omsg[x++] = (unsigned char)size; /* Data size Low */ - h->omsg[x++] = 0; /* Data size Hi */ - for (; size > 0 ; size--) + int x = h->omsg[1] + 2; /* Get current position */ + if (x == 2) { + x += 2; /* First: skip Payload length (set later) */ + } + h->omsg[x++] = msg; /* Message code */ + h->omsg[x++] = (unsigned char)size; /* Data size Low */ + h->omsg[x++] = 0; /* Data size Hi */ + for (; size > 0 ; size--) { h->omsg[x++] = *data++; - h->omsg[1] = x - 2; /* Frame size */ - h->omsg[2] = x - 4; /* Payload length (Lo) */ - h->omsg[3] = 0; /* Payload length (Hi) */ + } + h->omsg[1] = x - 2; /* Frame size */ + h->omsg[2] = x - 4; /* Payload length (Lo) */ + h->omsg[3] = 0; /* Payload length (Hi) */ } static void putdummydata_proto2(sms_t *h) { - adddata_proto2(h, 0x10, "\0", 1); /* Media Identifier > SMS */ - adddata_proto2(h, 0x11, "\0\0\0\0\0\0", 6); /* Firmware version */ - adddata_proto2(h, 0x12, "\2\0\4", 3); /* SMS provider ID */ - adddata_proto2(h, 0x13, h->udtxt, h->udl); /* Body */ + adddata_proto2(h, 0x10, "\0", 1); /* Media Identifier > SMS */ + adddata_proto2(h, 0x11, "\0\0\0\0\0\0", 6); /* Firmware version */ + adddata_proto2(h, 0x12, "\2\0\4", 3); /* SMS provider ID */ + adddata_proto2(h, 0x13, h->udtxt, h->udl); /* Body */ } static void sms_compose2(sms_t *h, int more) @@ -1119,25 +1178,27 @@ static void sms_compose2(sms_t *h, int more) struct timeval now = h->scts; char stm[9]; - h->omsg[0] = 0x00; /* set later... */ + h->omsg[0] = 0x00; /* set later... */ h->omsg[1] = 0; putdummydata_proto2(h); - if (h->smsc) { /* deliver */ - h->omsg[0] = 0x11; /* SMS_DELIVERY */ + if (h->smsc) { /* deliver */ + h->omsg[0] = 0x11; /* SMS_DELIVERY */ /* Required: 10 11 12 13 14 15 17 (seems they must be ordered!) */ ast_localtime(&now, &tm, NULL); - sprintf(stm, "%02d%02d%02d%02d", tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min); /* Date mmddHHMM */ - adddata_proto2(h, 0x14, stm, 8); /* Date */ - if (*h->oa == 0) + sprintf(stm, "%02d%02d%02d%02d", tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min); /* Date mmddHHMM */ + adddata_proto2(h, 0x14, stm, 8); /* Date */ + if (*h->oa == 0) { strcpy(h->oa, "00000000"); + } adddata_proto2(h, 0x15, h->oa, strlen(h->oa)); /* Originator */ - adddata_proto2(h, 0x17, "\1", 1); /* Calling Terminal ID */ - } else { /* submit */ - h->omsg[0] = 0x10; /* SMS_SUBMIT */ + adddata_proto2(h, 0x17, "\1", 1); /* Calling Terminal ID */ + } else { /* submit */ + h->omsg[0] = 0x10; /* SMS_SUBMIT */ /* Required: 10 11 12 13 17 18 1B 1C (seems they must be ordered!) */ - adddata_proto2(h, 0x17, "\1", 1); /* Calling Terminal ID */ - if (*h->da == 0) + adddata_proto2(h, 0x17, "\1", 1); /* Calling Terminal ID */ + if (*h->da == 0) { strcpy(h->da, "00000000"); + } adddata_proto2(h, 0x18, h->da, strlen(h->da)); /* Originator */ adddata_proto2(h, 0x1B, "\1", 1); /* Called Terminal ID */ adddata_proto2(h, 0x1C, "\0\0\0", 3); /* Notification */ @@ -1152,8 +1213,9 @@ static char *sms_hexdump(unsigned char buf[], int size, char *s /* destination * char *p; int f; - for (p = s, f = 0; f < size && f < MAX_DEBUG_LEN; f++, p += 3) + for (p = s, f = 0; f < size && f < MAX_DEBUG_LEN; f++, p += 3) { sprintf(p, "%02X ", (unsigned char)buf[f]); + } return(s); } @@ -1177,15 +1239,17 @@ static int sms_handleincoming_proto2(sms_t *h) msgsz = h->imsg[f++]; msgsz += (h->imsg[f++] * 256); switch (msg) { - case 0x13: /* Body */ + case 0x13: /* Body */ ast_verb(3, "SMS-P2 Body#%02X=[%.*s]\n", msg, msgsz, &h->imsg[f]); - if (msgsz >= sizeof(h->imsg)) + if (msgsz >= sizeof(h->imsg)) { msgsz = sizeof(h->imsg) - 1; - for (i = 0; i < msgsz; i++) + } + for (i = 0; i < msgsz; i++) { h->ud[i] = h->imsg[f + i]; + } h->udl = msgsz; break; - case 0x14: /* Date SCTS */ + case 0x14: /* Date SCTS */ now = h->scts = ast_tvnow(); ast_localtime(&now, &tm, NULL); tm.tm_mon = ( (h->imsg[f] * 10) + h->imsg[f + 1] ) - 1; @@ -1196,30 +1260,32 @@ static int sms_handleincoming_proto2(sms_t *h) h->scts = ast_mktime(&tm, NULL); ast_verb(3, "SMS-P2 Date#%02X=%02d/%02d %02d:%02d\n", msg, tm.tm_mday, tm.tm_mon + 1, tm.tm_hour, tm.tm_min); break; - case 0x15: /* Calling line (from SMSC) */ - if (msgsz >= 20) + case 0x15: /* Calling line (from SMSC) */ + if (msgsz >= 20) { msgsz = 20 - 1; + } ast_verb(3, "SMS-P2 Origin#%02X=[%.*s]\n", msg, msgsz, &h->imsg[f]); ast_copy_string(h->oa, (char *)(&h->imsg[f]), msgsz + 1); break; - case 0x18: /* Destination(from TE/phone) */ - if (msgsz >= 20) + case 0x18: /* Destination(from TE/phone) */ + if (msgsz >= 20) { msgsz = 20 - 1; + } ast_verb(3, "SMS-P2 Destination#%02X=[%.*s]\n", msg, msgsz, &h->imsg[f]); ast_copy_string(h->da, (char *)(&h->imsg[f]), msgsz + 1); break; - case 0x1C: /* Notify */ + case 0x1C: /* Notify */ ast_verb(3, "SMS-P2 Notify#%02X=%s\n", msg, sms_hexdump(&h->imsg[f], 3, debug_buf)); break; default: ast_verb(3, "SMS-P2 Par#%02X [%d]: %s\n", msg, msgsz, sms_hexdump(&h->imsg[f], msgsz, debug_buf)); break; } - f+=msgsz; /* Skip to next */ + f+=msgsz; /* Skip to next */ } - h->rx = 1; /* received message */ - sms_writefile(h); /* write the file */ - return 0; /* no error */ + h->rx = 1; /* received message */ + sms_writefile(h); /* write the file */ + return 0; /* no error */ } #if 0 @@ -1243,30 +1309,31 @@ static void sms_messagerx2(sms_t * h) #define DLL2_ACK(h) ((h->framenumber & 1) ? DLL2_SMS_ACK1: DLL2_SMS_ACK1) switch (p) { - case DLL2_SMS_EST: /* Protocol 2: Connection ready (fake): send message */ + case DLL2_SMS_EST: /* Protocol 2: Connection ready (fake): send message */ sms_nextoutgoing (h); /* smssend(h,"11 29 27 00 10 01 00 00 11 06 00 00 00 00 00 00 00 12 03 00 02 00 04 13 01 00 41 14 08 00 30 39 31 35 30 02 30 02 15 02 00 39 30 "); */ break; - case DLL2_SMS_INFO_MO: /* transport SMS_SUBMIT */ - case DLL2_SMS_INFO_MT: /* transport SMS_DELIVERY */ + case DLL2_SMS_INFO_MO: /* transport SMS_SUBMIT */ + case DLL2_SMS_INFO_MT: /* transport SMS_DELIVERY */ cause = sms_handleincoming_proto2(h); - if (!cause) /* ACK */ + if (!cause) { /* ACK */ sms_log(h, 'Y'); + } h->omsg[0] = DLL2_ACK(h); - h->omsg[1] = 0x06; /* msg len */ - h->omsg[2] = 0x04; /* payload len */ - h->omsg[3] = 0x00; /* payload len */ - h->omsg[4] = 0x1f; /* Response type */ - h->omsg[5] = 0x01; /* parameter len */ - h->omsg[6] = 0x00; /* parameter len */ - h->omsg[7] = cause; /* CONFIRM or error */ + h->omsg[1] = 0x06; /* msg len */ + h->omsg[2] = 0x04; /* payload len */ + h->omsg[3] = 0x00; /* payload len */ + h->omsg[4] = 0x1f; /* Response type */ + h->omsg[5] = 0x01; /* parameter len */ + h->omsg[6] = 0x00; /* parameter len */ + h->omsg[7] = cause; /* CONFIRM or error */ sms_messagetx(h); break; - case DLL2_SMS_NACK: /* Protocol 2: SMS_NAK */ - h->omsg[0] = DLL2_SMS_REL; /* SMS_REL */ - h->omsg[1] = 0x00; /* msg len */ + case DLL2_SMS_NACK: /* Protocol 2: SMS_NAK */ + h->omsg[0] = DLL2_SMS_REL; /* SMS_REL */ + h->omsg[1] = 0x00; /* msg len */ sms_messagetx(h); break; @@ -1275,7 +1342,7 @@ static void sms_messagerx2(sms_t * h) /* SMS_ACK also transport SMS_SUBMIT or SMS_DELIVERY */ if ( (h->omsg[0] & DLL_SMS_MASK) == DLL2_SMS_REL) { /* a response to our Release, just hangup */ - h->hangup = 1; /* hangup */ + h->hangup = 1; /* hangup */ } else { /* XXX depending on what we are.. */ ast_log(LOG_NOTICE, "SMS_SUBMIT or SMS_DELIVERY"); @@ -1283,7 +1350,7 @@ static void sms_messagerx2(sms_t * h) } break; - case DLL2_SMS_REL: /* Protocol 2: SMS_REL (hangup req) */ + case DLL2_SMS_REL: /* Protocol 2: SMS_REL (hangup req) */ h->omsg[0] = DLL2_ACK(h); h->omsg[1] = 0; sms_messagetx(h); @@ -1294,10 +1361,10 @@ static void sms_messagerx2(sms_t * h) /*! \brief compose a message for protocol 1 */ static void sms_compose1(sms_t *h, int more) { - unsigned int p = 2; /* next byte to write. Skip type and len */ + unsigned int p = 2; /* next byte to write. Skip type and len */ - h->omsg[0] = 0x91; /* SMS_DATA */ - if (h->smsc) { /* deliver */ + h->omsg[0] = 0x91; /* SMS_DATA */ + if (h->smsc) { /* deliver */ h->omsg[p++] = (more ? 4 : 0) + ((h->udhl > 0) ? 0x40 : 0); p += packaddress(h->omsg + p, h->oa); h->omsg[p++] = h->pid; @@ -1305,26 +1372,28 @@ static void sms_compose1(sms_t *h, int more) packdate(h->omsg + p, h->scts.tv_sec); p += 7; p += packsms(h->dcs, h->omsg + p, h->udhl, h->udh, h->udl, h->ud); - } else { /* submit */ + } else { /* submit */ h->omsg[p++] = 0x01 + (more ? 4 : 0) + (h->srr ? 0x20 : 0) + (h->rp ? 0x80 : 0) + (h->vp ? 0x10 : 0) + (h->udhi ? 0x40 : 0); - if (h->mr < 0) + if (h->mr < 0) { h->mr = message_ref++; + } h->omsg[p++] = h->mr; p += packaddress(h->omsg + p, h->da); h->omsg[p++] = h->pid; h->omsg[p++] = h->dcs; - if (h->vp) { /* relative VP */ - if (h->vp < 720) + if (h->vp) { /* relative VP */ + if (h->vp < 720) { h->omsg[p++] = (h->vp + 4) / 5 - 1; - else if (h->vp < 1440) + } else if (h->vp < 1440) { h->omsg[p++] = (h->vp - 720 + 29) / 30 + 143; - else if (h->vp < 43200) + } else if (h->vp < 43200) { h->omsg[p++] = (h->vp + 1439) / 1440 + 166; - else if (h->vp < 635040) + } else if (h->vp < 635040) { h->omsg[p++] = (h->vp + 10079) / 10080 + 192; - else - h->omsg[p++] = 255; /* max */ + } else { + h->omsg[p++] = 255; /* max */ + } } p += packsms(h->dcs, h->omsg + p, h->udhl, h->udh, h->udl, h->ud); } @@ -1338,32 +1407,34 @@ static void sms_nextoutgoing (sms_t * h) DIR *d; char more = 0; - *h->da = *h->oa = '\0'; /* clear destinations */ - h->rx = 0; /* outgoing message */ + *h->da = *h->oa = '\0'; /* clear destinations */ + h->rx = 0; /* outgoing message */ snprintf(fn, sizeof(fn), "%s/sms/%s", ast_config_AST_SPOOL_DIR, h->smsc ? "mttx" : "motx"); - ast_mkdir(fn, 0777); /* ensure it exists */ + ast_mkdir(fn, 0777); /* ensure it exists */ d = opendir(fn); if (d) { struct dirent *f = readdirqueue(d, h->queue); if (f) { snprintf(fn + strlen(fn), sizeof(fn) - strlen(fn), "/%s", f->d_name); sms_readfile(h, fn); - if (readdirqueue(d, h->queue)) - more = 1; /* more to send */ + if (readdirqueue(d, h->queue)) { + more = 1; /* more to send */ + } } closedir(d); } - if (*h->da || *h->oa) { /* message to send */ - if (h->protocol == 2) + if (*h->da || *h->oa) { /* message to send */ + if (h->protocol == 2) { sms_compose2(h, more); - else + } else { sms_compose1(h, more); - } else { /* no message */ + } + } else { /* no message */ if (h->protocol == 2) { - h->omsg[0] = 0x17; /* SMS_REL */ + h->omsg[0] = 0x17; /* SMS_REL */ h->omsg[1] = 0; } else { - h->omsg[0] = 0x94; /* SMS_REL */ + h->omsg[0] = 0x94; /* SMS_REL */ h->omsg[1] = 0; } } @@ -1375,7 +1446,7 @@ static void sms_nextoutgoing (sms_t * h) static void sms_debug (int dir, sms_t *h) { char txt[259 * 3 + 1]; - char *p = txt; /* always long enough */ + char *p = txt; /* always long enough */ unsigned char *msg = (dir == DIR_RX) ? h->imsg : h->omsg; int n = (dir == DIR_RX) ? h->ibytep : msg[1] + 2; int q = 0; @@ -1383,8 +1454,9 @@ static void sms_debug (int dir, sms_t *h) sprintf(p, " %02X", msg[q++]); p += 3; } - if (q < n) + if (q < n) { sprintf(p, "..."); + } ast_verb(3, "SMS %s%s\n", dir == DIR_RX ? "RX" : "TX", txt); } @@ -1400,48 +1472,48 @@ static void sms_messagerx(sms_t * h) } /* parse incoming message for Protocol 1 */ switch (h->imsg[0]) { - case 0x91: /* SMS_DATA */ + case 0x91: /* SMS_DATA */ cause = sms_handleincoming (h); if (!cause) { sms_log(h, 'Y'); - h->omsg[0] = 0x95; /* SMS_ACK */ + h->omsg[0] = 0x95; /* SMS_ACK */ h->omsg[1] = 0x02; - h->omsg[2] = 0x00; /* deliver report */ - h->omsg[3] = 0x00; /* no parameters */ - } else { /* NACK */ + h->omsg[2] = 0x00; /* deliver report */ + h->omsg[3] = 0x00; /* no parameters */ + } else { /* NACK */ sms_log(h, 'N'); - h->omsg[0] = 0x96; /* SMS_NACK */ + h->omsg[0] = 0x96; /* SMS_NACK */ h->omsg[1] = 3; - h->omsg[2] = 0; /* delivery report */ - h->omsg[3] = cause; /* cause */ - h->omsg[4] = 0; /* no parameters */ + h->omsg[2] = 0; /* delivery report */ + h->omsg[3] = cause; /* cause */ + h->omsg[4] = 0; /* no parameters */ } sms_messagetx(h); break; - case 0x92: /* SMS_ERROR */ + case 0x92: /* SMS_ERROR */ h->err = 1; - sms_messagetx(h); /* send whatever we sent again */ + sms_messagetx(h); /* send whatever we sent again */ break; - case 0x93: /* SMS_EST */ + case 0x93: /* SMS_EST */ sms_nextoutgoing (h); break; - case 0x94: /* SMS_REL */ - h->hangup = 1; /* hangup */ + case 0x94: /* SMS_REL */ + h->hangup = 1; /* hangup */ break; - case 0x95: /* SMS_ACK */ + case 0x95: /* SMS_ACK */ sms_log(h, 'Y'); sms_nextoutgoing (h); break; - case 0x96: /* SMS_NACK */ + case 0x96: /* SMS_NACK */ h->err = 1; sms_log(h, 'N'); sms_nextoutgoing (h); break; - default: /* Unknown */ - h->omsg[0] = 0x92; /* SMS_ERROR */ + default: /* Unknown */ + h->omsg[0] = 0x92; /* SMS_ERROR */ h->omsg[1] = 1; - h->omsg[2] = 3; /* unknown message type; */ + h->omsg[2] = 3; /* unknown message type */ sms_messagetx(h); break; } @@ -1450,33 +1522,40 @@ static void sms_messagerx(sms_t * h) static void sms_messagetx(sms_t * h) { unsigned char c = 0, p; - int len = h->omsg[1] + 2; /* total message length excluding checksum */ + int len = h->omsg[1] + 2; /* total message length excluding checksum */ - for (p = 0; p < len; p++) /* compute checksum */ + for (p = 0; p < len; p++) { /* compute checksum */ c += h->omsg[p]; - h->omsg[len] = 0 - c; /* actually, (256 - (c & 0fxx)) & 0xff) */ + } + h->omsg[len] = 0 - c; /* actually, (256 - (c & 0fxx)) & 0xff) */ sms_debug(DIR_TX, h); - h->framenumber++; /* Proto 2 */ - h->obyte = 1; /* send mark ('1') at the beginning */ - h->opause = 200; - /* Change the initial message delay. BT requires 300ms, - * but for others this might be way too much and the phone - * could time out. XXX make it configurable. - */ - if (h->omsg[0] == 0x93) - h->opause = 8 * h->opause_0; /* initial message delay */ + h->framenumber++; /* Proto 2 */ h->obytep = 0; h->obitp = 0; - if (h->protocol == 2) { - h->oseizure = 300; /* Proto 2: 300bits (or more ?) */ - h->obyte = 0; /* Seizure starts with space (0) */ - h->opause = 400; - } else { - h->oseizure = 0; /* Proto 1: No seizure */ + if (h->protocol == 2) { /* Proto 2: */ + h->oseizure = 300; /* 300bits (or more ?) */ + h->obyte = 0; /* Seizure starts with space (0) */ + if (h->omsg[0] == 0x7F) { + h->opause = 8 * h->opause_0; /* initial message delay */ + } else { + h->opause = 400; + } + } else { /* Proto 1: */ + h->oseizure = 0; /* No seizure */ + h->obyte = 1; /* send mark ('1') at the beginning */ + /* Change the initial message delay. BT requires 300ms, + * but for others this might be way too much and the phone + * could time out. XXX make it configurable. + */ + if (h->omsg[0] == 0x93) { + h->opause = 8 * h->opause_0; /* initial message delay */ + } else { + h->opause = 200; + } } /* Note - setting osync triggers the generator */ - h->osync = OSYNC_BITS; /* 80 sync bits */ - h->obyten = len + 1; /* bytes to send (including checksum) */ + h->osync = OSYNC_BITS; /* 80 sync bits */ + h->obyten = len + 1; /* bytes to send (including checksum) */ } /*! @@ -1509,33 +1588,33 @@ static int sms_generate(struct ast_channel *chan, void *data, int len, int sampl f.src = "app_sms"; /* create a buffer containing the digital sms pattern */ for (i = 0; i < samples; i++) { - buf[i] = wave_out[0]; /* default is silence */ + buf[i] = wave_out[0]; /* default is silence */ - if (h->opause) + if (h->opause) { h->opause--; - else if (h->obyten || h->osync) { /* sending data */ + } else if (h->obyten || h->osync) { /* sending data */ buf[i] = wave_out[h->ophase]; - h->ophase += (h->obyte & 1) ? 13 : 21; /* compute next phase */ + h->ophase += (h->obyte & 1) ? 13 : 21; /* compute next phase */ if (h->ophase >= 80) h->ophase -= 80; - if ((h->ophasep += 12) >= 80) { /* time to send the next bit */ + if ((h->ophasep += 12) >= 80) { /* time to send the next bit */ h->ophasep -= 80; - if (h->oseizure > 0) { /* sending channel seizure (proto 2) */ + if (h->oseizure > 0) { /* sending channel seizure (proto 2) */ h->oseizure--; - h->obyte ^= 1; /* toggle low bit */ + h->obyte ^= 1; /* toggle low bit */ } else if (h->osync) { - h->obyte = 1; /* send mark as sync bit */ - h->osync--; /* sending sync bits */ + h->obyte = 1; /* send mark as sync bit */ + h->osync--; /* sending sync bits */ if (h->osync == 0 && h->protocol == 2 && h->omsg[0] == DLL2_SMS_EST) { - h->obytep = h->obyten = 0; /* we are done */ + h->obytep = h->obyten = 0; /* we are done */ } } else { h->obitp++; - if (h->obitp == 1) - h->obyte = 0; /* start bit; */ - else if (h->obitp == 2) + if (h->obitp == 1) { + h->obyte = 0; /* start bit; */ + } else if (h->obitp == 2) { h->obyte = h->omsg[h->obytep]; - else if (h->obitp == 10) { + } else if (h->obitp == 10) { h->obyte = 1; /* stop bit */ h->obitp = 0; h->obytep++; @@ -1543,8 +1622,9 @@ static int sms_generate(struct ast_channel *chan, void *data, int len, int sampl h->obytep = h->obyten = 0; /* sent */ h->osync = 10; /* trailing marks */ } - } else + } else { h->obyte >>= 1; + } } } } @@ -1599,28 +1679,30 @@ static void sms_process(sms_t * h, int samples, signed short *data) * transmission overlap (which is an error condition anyways), * we may miss some data and this makes debugging harder. */ - if (h->obyten || h->osync) + if (h->obyten || h->osync) { return; + } for ( ; samples-- ; data++) { unsigned long long m0, m1; - if (abs(*data) > h->imag) + if (abs(*data) > h->imag) { h->imag = abs(*data); - else + } else { h->imag = h->imag * 7 / 8; - if (h->imag <= 500) { /* below [arbitrary] threahold: lost carrier */ - if (h->idle++ == 80000) { /* nothing happening */ + } + if (h->imag <= 500) { /* below [arbitrary] threahold: lost carrier */ + if (h->idle++ == 80000) { /* nothing happening */ ast_log(LOG_NOTICE, "No data, hanging up\n"); h->hangup = 1; h->err = 1; } - if (h->ierr) { /* error */ + if (h->ierr) { /* error */ ast_log(LOG_NOTICE, "Error %d, hanging up\n", h->ierr); /* Protocol 1 */ h->err = 1; - h->omsg[0] = 0x92; /* error */ + h->omsg[0] = 0x92; /* error */ h->omsg[1] = 1; h->omsg[2] = h->ierr; - sms_messagetx(h); /* send error */ + sms_messagetx(h); /* send error */ } h->ierr = h->ibitn = h->ibytep = h->ibytec = 0; continue; @@ -1637,40 +1719,48 @@ static void sms_process(sms_t * h, int samples, signed short *data) m1 = h->ims1 * h->ims1 + h->imc1 * h->imc1; /* advance the sin/cos pointers */ - if ((h->ips0 += 21) >= 80) + if ((h->ips0 += 21) >= 80) { h->ips0 -= 80; - if ((h->ipc0 += 21) >= 80) + } + if ((h->ipc0 += 21) >= 80) { h->ipc0 -= 80; - if ((h->ips1 += 13) >= 80) + } + if ((h->ips1 += 13) >= 80) { h->ips1 -= 80; - if ((h->ipc1 += 13) >= 80) + } + if ((h->ipc1 += 13) >= 80) { h->ipc1 -= 80; + } /* set new bit to 1 or 0 depending on which value is stronger */ h->ibith <<= 1; - if (m1 > m0) + if (m1 > m0) { h->ibith |= 1; - if (h->ibith & 8) + } + if (h->ibith & 8) { h->ibitt--; - if (h->ibith & 1) + } + if (h->ibith & 1) { h->ibitt++; + } bit = ((h->ibitt > 1) ? 1 : 0); - if (bit != h->ibitl) + if (bit != h->ibitl) { h->ibitc = 1; - else + } else { h->ibitc++; + } h->ibitl = bit; if (!h->ibitn && h->ibitc == 4 && !bit) { h->ibitn = 1; h->iphasep = 0; } - if (bit && h->ibitc == 200) { /* sync, restart message */ + if (bit && h->ibitc == 200) { /* sync, restart message */ /* Protocol 2: empty connnection ready (I am master) */ if (h->framenumber < 0 && h->ibytec >= 160 && !memcmp(h->imsg, "UUUUUUUUUUUUUUUUUUUU", 20)) { h->framenumber = 1; ast_verb(3, "SMS protocol 2 detected\n"); h->protocol = 2; - h->imsg[0] = 0xff; /* special message (fake) */ + h->imsg[0] = 0xff; /* special message (fake) */ h->imsg[1] = h->imsg[2] = 0x00; h->ierr = h->ibitn = h->ibytep = h->ibytec = 0; sms_messagerx(h); @@ -1679,12 +1769,12 @@ static void sms_process(sms_t * h, int samples, signed short *data) } if (h->ibitn) { h->iphasep += 12; - if (h->iphasep >= 80) { /* next bit */ + if (h->iphasep >= 80) { /* next bit */ h->iphasep -= 80; - if (h->ibitn++ == 9) { /* end of byte */ - if (!bit) { /* bad stop bit */ + if (h->ibitn++ == 9) { /* end of byte */ + if (!bit) { /* bad stop bit */ ast_log(LOG_NOTICE, "bad stop bit"); - h->ierr = 0xFF; /* unknown error */ + h->ierr = 0xFF; /* unknown error */ } else { if (h->ibytep < sizeof(h->imsg)) { h->imsg[h->ibytep] = h->ibytev; @@ -1692,14 +1782,14 @@ static void sms_process(sms_t * h, int samples, signed short *data) h->ibytep++; } else if (h->ibytep == sizeof(h->imsg)) { ast_log(LOG_NOTICE, "msg too large"); - h->ierr = 2; /* bad message length */ + h->ierr = 2; /* bad message length */ } if (h->ibytep > 1 && h->ibytep == 3 + h->imsg[1] && !h->ierr) { - if (!h->ibytec) + if (!h->ibytec) { sms_messagerx(h); - else { + } else { ast_log(LOG_NOTICE, "bad checksum"); - h->ierr = 1; /* bad checksum */ + h->ierr = 1; /* bad checksum */ } } } @@ -1719,12 +1809,12 @@ static void sms_process(sms_t * h, int samples, signed short *data) * - in the function, AST_DECLARE_APP_ARGS(...) for the arguments. */ enum { - OPTION_BE_SMSC = (1 << 0), /* act as sms center */ - OPTION_ANSWER = (1 << 1), /* answer on incoming calls */ - OPTION_TWO = (1 << 2), /* Use Protocol Two */ - OPTION_PAUSE = (1 << 3), /* pause before sending data, in ms */ - OPTION_SRR = (1 << 4), /* set srr */ - OPTION_DCS = (1 << 5), /* set dcs */ + OPTION_BE_SMSC = (1 << 0), /* act as sms center */ + OPTION_ANSWER = (1 << 1), /* answer on incoming calls */ + OPTION_TWO = (1 << 2), /* Use Protocol Two */ + OPTION_PAUSE = (1 << 3), /* pause before sending data, in ms */ + OPTION_SRR = (1 << 4), /* set srr */ + OPTION_DCS = (1 << 5), /* set dcs */ } sms_flags; enum { @@ -1761,10 +1851,11 @@ static int sms_exec(struct ast_channel *chan, void *data) return -1; } - parse = ast_strdupa(data); /* create a local copy */ + parse = ast_strdupa(data); /* create a local copy */ AST_STANDARD_APP_ARGS(sms_args, parse); - if (sms_args.argc > 1) + if (sms_args.argc > 1) { ast_app_parse_options(sms_options, &flags, sms_opts, sms_args.options); + } ast_verb(1, "sms argc %d queue <%s> opts <%s> addr <%s> body <%s>\n", sms_args.argc, S_OR(sms_args.queue, ""), @@ -1772,8 +1863,8 @@ static int sms_exec(struct ast_channel *chan, void *data) S_OR(sms_args.addr, ""), S_OR(sms_args.body, "") ); - h.ipc0 = h.ipc1 = 20; /* phase for cosine */ - h.dcs = 0xF1; /* default */ + h.ipc0 = h.ipc1 = 20; /* phase for cosine */ + h.dcs = 0xF1; /* default */ if (chan->cid.cid_num) ast_copy_string(h.cli, chan->cid.cid_num, sizeof(h.cli)); @@ -1788,24 +1879,30 @@ static int sms_exec(struct ast_channel *chan, void *data) } ast_copy_string(h.queue, sms_args.queue, sizeof(h.queue)); - for (p = h.queue; *p; p++) - if (!isalnum(*p)) - *p = '-'; /* make very safe for filenames */ + for (p = h.queue; *p; p++) { + if (!isalnum(*p)) { + *p = '-'; /* make very safe for filenames */ + } + } h.smsc = ast_test_flag(&flags, OPTION_BE_SMSC); h.protocol = ast_test_flag(&flags, OPTION_TWO) ? 2 : 1; - if (!ast_strlen_zero(sms_opts[OPTION_ARG_PAUSE])) + if (!ast_strlen_zero(sms_opts[OPTION_ARG_PAUSE])) { h.opause_0 = atoi(sms_opts[OPTION_ARG_PAUSE]); - if (h.opause_0 < 25 || h.opause_0 > 2000) - h.opause_0 = 300; /* default 300ms */ + } + if (h.opause_0 < 25 || h.opause_0 > 2000) { + h.opause_0 = 300; /* default 300ms */ + } ast_verb(1, "initial delay %dms\n", h.opause_0); /* the following apply if there is an arg3/4 and apply to the created message file */ - if (ast_test_flag(&flags, OPTION_SRR)) + if (ast_test_flag(&flags, OPTION_SRR)) { h.srr = 1; - if (ast_test_flag(&flags, OPTION_DCS)) + } + if (ast_test_flag(&flags, OPTION_DCS)) { h.dcs = 1; + } #if 0 case '1': case '2': @@ -1813,7 +1910,7 @@ static int sms_exec(struct ast_channel *chan, void *data) case '4': case '5': case '6': - case '7': /* set the pid for saved local message */ + case '7': /* set the pid for saved local message */ h.pid = 0x40 + (*d & 0xF); break; } @@ -1828,9 +1925,9 @@ static int sms_exec(struct ast_channel *chan, void *data) ast_log(LOG_ERROR, "Address too long %s\n", sms_args.addr); goto done; } - if (h.smsc) + if (h.smsc) { ast_copy_string(h.oa, sms_args.addr, sizeof(h.oa)); - else { + } else { ast_copy_string(h.da, sms_args.addr, sizeof(h.da)); ast_copy_string(h.oa, h.cli, sizeof(h.oa)); } @@ -1840,8 +1937,9 @@ static int sms_exec(struct ast_channel *chan, void *data) goto done; } up = (unsigned char *)sms_args.body; - while (*up && h.udl < SMSLEN) + while (*up && h.udl < SMSLEN) { h.ud[h.udl++] = utf8decode(&up); + } if (is7bit(h.dcs) && packsms7(0, h.udhl, h.udh, h.udl, h.ud) < 0) { ast_log(LOG_WARNING, "Invalid 7 bit GSM data\n"); goto done; @@ -1854,7 +1952,7 @@ static int sms_exec(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "Invalid 16 bit data\n"); goto done; } - h.rx = 0; /* sent message */ + h.rx = 0; /* sent message */ h.mr = -1; sms_writefile(&h); res = h.err; @@ -1862,7 +1960,7 @@ static int sms_exec(struct ast_channel *chan, void *data) } if (ast_test_flag(&flags, OPTION_ANSWER)) { - h.framenumber = 1; /* Proto 2 */ + h.framenumber = 1; /* Proto 2 */ /* set up SMS_EST initial message */ if (h.protocol == 2) { h.omsg[0] = DLL2_SMS_EST; @@ -1874,12 +1972,14 @@ static int sms_exec(struct ast_channel *chan, void *data) sms_messagetx(&h); } - if (chan->_state != AST_STATE_UP) + if (chan->_state != AST_STATE_UP) { ast_answer(chan); + } res = ast_set_write_format(chan, __OUT_FMT); - if (res >= 0) + if (res >= 0) { res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); + } if (res < 0) { ast_log(LOG_ERROR, "Unable to set to linear mode, giving up\n"); goto done; @@ -1913,9 +2013,9 @@ static int sms_exec(struct ast_channel *chan, void *data) ast_frfree(f); } - res = h.err; /* XXX */ + res = h.err; /* XXX */ - sms_log(&h, '?'); /* log incomplete message */ + sms_log(&h, '?'); /* log incomplete message */ done: return (res); } @@ -1929,8 +2029,9 @@ static int load_module(void) { #ifdef OUTALAW int p; - for (p = 0; p < 80; p++) - wavea[p] = AST_LIN2A (wave[p]); + for (p = 0; p < 80; p++) { + wavea[p] = AST_LIN2A(wave[p]); + } #endif snprintf(log_file, sizeof(log_file), "%s/sms", ast_config_AST_LOG_DIR); return ast_register_application(app, sms_exec, synopsis, descrip); |