[Asterisk-cvs] asterisk/utils smsq.c,1.2,1.3
markster at lists.digium.com
markster at lists.digium.com
Sun Dec 19 16:17:39 CST 2004
- Previous message: [Asterisk-cvs] asterisk/formats format_g729.c, 1.14,
1.15 format_gsm.c, 1.19, 1.20 format_ilbc.c, 1.7,
1.8 format_sln.c, 1.3, 1.4 format_wav_gsm.c, 1.27, 1.28
- Next message: [Asterisk-cvs] asterisk/channels chan_mgcp.c,1.98,1.99
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/cvsroot/asterisk/utils
In directory mongoose.digium.com:/tmp/cvs-serv6173/utils
Modified Files:
smsq.c
Log Message:
Merge Olle's comment patch (bug #3097)
Index: smsq.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils/smsq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smsq.c 12 Dec 2004 23:29:47 -0000 1.2
+++ smsq.c 19 Dec 2004 21:13:41 -0000 1.3
@@ -10,8 +10,8 @@
#include <unistd.h>
#include <time.h>
-// SMS queuing application for use with asterisk app_sms
-// by Adrian Kennard, 2004
+/* SMS queuing application for use with asterisk app_sms */
+/* by Adrian Kennard, 2004 */
/* reads next USC character from null terminated UTF-8 string and advanced pointer */
/* for non valid UTF-8 sequences, returns character as is */
@@ -65,8 +65,8 @@
return *p; /* not sensible */
}
-// check for any queued messages in specific queue (queue="" means any queue)
-// returns 0 if nothing queued, 1 if queued and outgoing set up OK, 2 of outgoing exists
+/* check for any queued messages in specific queue (queue="" means any queue) */
+/* returns 0 if nothing queued, 1 if queued and outgoing set up OK, 2 of outgoing exists */
static char txqcheck (char *dir, char *queue, char subaddress, char *channel, char *callerid, int wait, int delay, int retries, int concurrent)
{
char ogname[100],
@@ -90,7 +90,7 @@
return 0;
}
if (!ql)
- { // not searching any specific queue, so use whatr we found as the queue
+ { /* not searching any specific queue, so use whatr we found as the queue */
queue = fn->d_name;
ql = p - queue;
}
@@ -150,18 +150,18 @@
try++;
snprintf(ogname, sizeof(ogname), "outgoing/smsq.%s.%s.%d", dir, queue, try);
if (!link (temp, ogname))
- { // queued OK
+ { /* queued OK */
unlink (temp);
return 1;
}
}
}
- // failed to create call queue
+ /* failed to create call queue */
unlink (temp);
return 2;
}
-// Process received queue entries and run through a process, setting environment variables
+/* Process received queue entries and run through a process, setting environment variables */
static void rxqcheck (char *dir, char *queue, char *process)
{
unsigned char *p;
@@ -186,7 +186,7 @@
FILE *f;
snprintf (filename, sizeof(filename), "sms/%s/%s", dir, fn->d_name);
if (rename (filename, temp))
- continue; // cannot access file
+ continue; /* cannot access file */
f = fopen (temp, "r");
unlink (temp);
if (!f)
@@ -229,7 +229,7 @@
while (isspace (*p))
*p++ = 0;
if (*p == '=')
- { // =
+ { /* = */
*p++ = 0;
if (!strcmp (line, "oa") || !strcmp (line, "da") || !strcmp (line, "scts") || !strcmp (line, "pid")
|| !strcmp (line, "dcs") || !strcmp (line, "mr") || !strcmp (line, "vp"))
@@ -237,7 +237,7 @@
else if ((!strcmp (line, "srr") || !strcmp (line, "rp")) && atoi (p))
setenv (line, "", 1);
else if (!strcmp (line, "ud"))
- { // read the user data as UTF-8
+ { /* read the user data as UTF-8 */
long v;
udl = 0;
while ((v = utf8decode (&p)) && udl < 160)
@@ -248,12 +248,12 @@
{
*p++ = 0;
if (*p == '#')
- { // ##
+ { /* ## */
p++;
if (!strcmp (line, "udh"))
setenv (line, p, 1);
else if (!strcmp (line, "ud"))
- { // read user data UCS-2
+ { /* read user data UCS-2 */
udl = 0;
while (*p && udl < 160)
{
@@ -269,9 +269,9 @@
}
}
} else
- { // #
+ { /* # */
if (!strcmp (line, "ud"))
- { // read user data UCS-1
+ { /* read user data UCS-1 */
udl = 0;
while (*p && udl < 160)
{
@@ -287,7 +287,7 @@
}
}
fclose (f);
- // set up user data variables
+ /* set up user data variables */
{
char temp[481];
int n,
@@ -367,13 +367,13 @@
}
setenv ("ud16", temp, 1);
}
- // run the command
+ /* run the command */
system (process);
}
closedir (d);
}
-// Main app
+/* Main app */
int
main (int argc, const char *argv[])
{
@@ -417,7 +417,7 @@
*defaultsubaddress = "9",
subaddress = 0,
*scts = 0;
- poptContext optCon; // context for parsing command-line options
+ poptContext optCon; /* context for parsing command-line options */
const struct poptOption optionsTable[] = {
{"queue", 'q', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &queue, 0, "Queue [inc sub address]", "number[-X]"},
{"da", 'd', POPT_ARG_STRING, &da, 0, "Destination address", "number"},
@@ -485,7 +485,7 @@
fprintf (stderr, "Command line arguments always treated as UTF-8\n");
return 1;
}
- // if (!where && poptPeekArg (optCon)) where = (char *) poptGetArg (optCon);
+ /* if (!where && poptPeekArg (optCon)) where = (char *) poptGetArg (optCon); */
if (!mt && !mo && process)
mt = 1;
if (!mt && !mo && oa)
@@ -585,7 +585,7 @@
return 1;
}
if (udfile)
- { // get message from file
+ { /* get message from file */
unsigned char dat[1204],
*p = dat,
*e;
@@ -642,14 +642,14 @@
}
if (oa || da)
- { // send message
+ { /* send message */
char temp[100],
queuename[100],
*dir = (mo ? rx ? "sms/morx" : "sms/motx" : rx ? "sms/mtrx" : "sms/mttx");
FILE *f;
snprintf (temp, sizeof(temp), "sms/.smsq-%d", getpid ());
- mkdir ("sms", 0777); // ensure directory exists
- mkdir (dir, 0777); // ensure directory exists
+ mkdir ("sms", 0777); /* ensure directory exists */
+ mkdir (dir, 0777); /* ensure directory exists */
snprintf (queuename, sizeof(queuename), "%s/%s.%ld-%d", dir, *queue ? queue : "0", (long)time (0), getpid ());
f = fopen (temp, "w");
if (!f)
@@ -713,7 +713,7 @@
}
if (!nodial && tx && !process)
- { // dial to send messages
+ { /* dial to send messages */
char ret=0,
try = 3;
if (nowait)
@@ -725,7 +725,7 @@
else
ret = txqcheck ("mttx", queue, subaddress, mttxchannel, mttxcallerid, mttxwait, mttxdelay, mttxretries, concurrent);
if (ret < 2)
- break; // sent, or queued OK
+ break; /* sent, or queued OK */
if (try)
sleep (1);
}
- Previous message: [Asterisk-cvs] asterisk/formats format_g729.c, 1.14,
1.15 format_gsm.c, 1.19, 1.20 format_ilbc.c, 1.7,
1.8 format_sln.c, 1.3, 1.4 format_wav_gsm.c, 1.27, 1.28
- Next message: [Asterisk-cvs] asterisk/channels chan_mgcp.c,1.98,1.99
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the svn-commits
mailing list