X-Git-Url: http://git.jankratochvil.net/?p=mdsms.git;a=blobdiff_plain;f=mdsms.c;h=68917a50ba728488ccb21827e6a9d03e1b70ca2b;hp=af7fe28ced1116301709a6cdf6c81dc7eedaf38e;hb=3b73c0669dc0a5f327e8bf10971f898f1bca0f9f;hpb=4b0accf3496139854917959b47ad6d71c10370d8 diff --git a/mdsms.c b/mdsms.c index af7fe28..68917a5 100644 --- a/mdsms.c +++ b/mdsms.c @@ -5,6 +5,15 @@ static char rcsid[] ATTR_UNUSED = "$Id$"; /* * $Log$ + * Revision 1.5 1999/07/19 10:02:51 short + * Removed '\xXY' chars for compatibility with Digital UNIX vendor "cc". + * + * Revision 1.4 1999/07/14 01:01:11 short + * Termios made compatible with Digital UNIX 4.0, cfset[io]speed() missing. + * + * Revision 1.3 1999/06/03 11:46:41 short + * Logging (--log) implemented. + * * Revision 1.2 1999/06/03 10:38:52 short * Implemented remaining communication timeouts and maximum retry count. * @@ -31,6 +40,7 @@ static char rcsid[] ATTR_UNUSED = "$Id$"; #include #include #include +#include #ifdef HAVE_GETOPT_LONG #include @@ -72,7 +82,7 @@ static int verbose static char *pname; static int dis_cleanup=0,devfd=-1; -static char *phone,*body,*device,*lockfile,*smsc,*maxretry,*readtime,*chartime,*cmdtime; +static char *phone,*body,*device,*logname,*lockfile,*smsc,*maxretry,*readtime,*chartime,*cmdtime; static int readbody; static long maxretryn=DEF_MAXRETRY,readtimen=DEF_READTIME,chartimen=DEF_CHARTIME,cmdtimen=DEF_CMDTIME; static size_t bodylen; @@ -80,8 +90,49 @@ static size_t bodylen; static char *devicename; /* path stripped */ static char lockreal[512],locked; -static struct termios restios; +static struct termios restios,tios; static char restios_yes; +static FILE *logf; + +static void vlogmsg( +#ifndef PRINTF_WORKS_PM + char outerr, +#endif + const char *fmt,va_list ap) +{ +time_t stamp; +char *ctm,*s; +pid_t mypid=-1; +char host[LINE_MAX]; + + if (!logf) return; + if (mypid==-1) { + mypid=getpid(); + if (gethostname(host,sizeof(host))) strcpy(host,""); + } + time(&stamp); + ctm=ctime(&stamp); + if ((s=strchr(ctm,'\n'))) *s='\0'; + fprintf(logf,"%s %s %s[%d]: ",ctm,host,pname,mypid); + vfprintf(logf,fmt,ap); +#ifndef PRINTF_WORKS_PM + if (outerr) fputs(strerror(errno),logf); +#endif + fputc('\n',logf); + fflush(logf); +} + +static void logmsg(const char *fmt,...) +{ +va_list ap; + va_start(ap,fmt); + vlogmsg( +#ifndef PRINTF_WORKS_PM + 0, +#endif + fmt,ap); + va_end(ap); +} static void error(const char *fmt,...) { @@ -110,6 +161,13 @@ size_t fmtl; nfmt #endif ,ap); + if (fatal=='!') vlogmsg( +#ifdef PRINTF_WORKS_PM + fmt +#else + pm,nfmt +#endif + ,ap); va_end(ap); #ifndef PRINTF_WORKS_PM @@ -156,6 +214,7 @@ static void usage(void) %s\ \n\ Usage: " PACKAGE " [-c|--config ] [-d|--device ]\n\ + [-L|--log ]\n\ [-l|--lockfile ] [-s|--smsc ] [-m|--maxretry <#>]\n\ [-r|--readtime ] [-t|--chartime ] [-T|--cmdtime ]\n\ [-f|--file] [-v|--verbose] [-h|--help] [-V|--version]\n\ @@ -164,6 +223,7 @@ Usage: " PACKAGE " [-c|--config ] [-d|--device ]\n\ -c, --config\tRead this additional config file\n\ \t\t(def. \"" CONFIG_MAIN "\" and \"$HOME" CONFIG_HOME "\")\n\ -d, --device\tMobilDock on this serial device (def. \"" DEF_DEVICE "\")\n\ + -L, --log\tLog all important messages to this file (def. \"" DEF_LOGNAME "\")\n\ -l, --lockfile\tLock serial port by this file, \"%%s\" is basename of device\n\ \t\t(def. \"%s\")\n\ -s, --smsc\tUse this SMS Center number (def. query from Siemens A1)\n\ @@ -182,6 +242,7 @@ Usage: " PACKAGE " [-c|--config ] [-d|--device ]\n\ static const struct option longopts[]={ {"config" ,1,0,'c'}, {"device" ,1,0,'d'}, +{"log" ,1,0,'l'}, {"lockfile",1,0,'l'}, {"smsc" ,1,0,'s'}, {"maxretry",1,0,'m'}, @@ -276,6 +337,7 @@ static struct { unsigned stamp; } optset[]={ { 'd',&device }, + { 'L',&logname }, { 'l',&lockfile }, { 's',&smsc }, { 'm',&maxretry }, @@ -292,7 +354,7 @@ int i; seq++; optarg=NULL; optind=0; /* FIXME: Possible portability problem. */ - while ((optc=getopt_long(argp,args,"c:d:l:s:m:r:t:T:fvhV",longopts,NULL))!=EOF) switch (optc) { + while ((optc=getopt_long(argp,args,"c:d:L:l:s:m:r:t:T:fvhV",longopts,NULL))!=EOF) switch (optc) { case 'c': if (cfgstacki>=NELEM(cfgstack)) { error("Looping (%d) during attempt to read config file \"%s\", break-out",NELEM(cfgstack),optind); @@ -300,7 +362,7 @@ int i; } chk(cfgstack[cfgstacki++]=strdup(optarg)); break; - case 'd': case 'l': case 's': case 'm': case 'r': case 't': case 'T': + case 'd': case 'L': case 'l': case 's': case 'm': case 'r': case 't': case 'T': for (i=0;i=1) error("Timed out"); } @@ -467,12 +531,11 @@ void *p; assert(catchdatal<=catchdatasiz); } +static int retrycnt=0; static void retrying(void) { -static int cnt=0; - - if (++cnt>maxretryn) error("!Maximum command retry count (%d) exceeded",maxretryn); - if (verbose>=2) error(".Retrying phase, %d out of %d..",cnt,maxretryn); + if (++retrycnt>maxretryn) error("!Maximum command retry count (%d) exceeded",maxretryn); + if (verbose>=2) error(".Retrying phase, %d out of %d..",retrycnt,maxretryn); } static char *devcmd(const char *term,const char *catch,const char *send,...) @@ -527,6 +590,7 @@ err: fragl=MAX(fragl,MAX(strlen(ERROR_SUBSTR1),strlen(ERROR_SUBSTR2))); bufl=0; record=NULL; + wasalarm=0; alarm(readtimen); for (;;) { blocking(0); @@ -538,7 +602,8 @@ err: got=read(devfd,buf+bufl,1); } if (got<=0) { - error("Could read device data (ret=%d): %m",got); + if (wasalarm) error("!Maximum response timeout (%ds) exceeded",readtimen); + error("Couldn't read device data (ret=%d): %m",got); goto err; } s=buf+bufl; @@ -728,9 +793,8 @@ char *s,*finame; FILE *fin; int i; unsigned fatal=0; -struct termios tios; - pname=*argv; + if ((s=strrchr((pname=*argv),'/'))) pname=s+1; atexit(cleanup); signal(SIGTERM,(RETSIGTYPE (*)(int))cleanup); signal(SIGQUIT,(RETSIGTYPE (*)(int))cleanup); @@ -759,6 +823,7 @@ char *buf=malloc(l+50); free(*emptycheck[i]); *emptycheck[i]=NULL; } + if (!logname) logname=DEF_LOGNAME; if (!lockfile) lockfile=DEF_LOCKFILE; if (!device) device=DEF_DEVICE; if (body && readbody) { @@ -808,11 +873,22 @@ size_t l=strlen(device); } error("!Invalid format-character '%c' in lockfile format-string, only \"%%s\" allowed",*s); } + + if (*logname) { + if (!(logf=fopen(logname,"a"))) + error("!Error opening log \"%s\" for append: %m",logname); + logmsg("Starting up: " PACKAGE " " VERSION); + } genpdu(); if (lockfile && *lockfile && VARPRINTF(lockreal,lockfile,devicename)>0) { +time_t start,end; if (verbose>=1) error(".Locking device \"%s\" by \"%s\"..",device,lockreal); + time(&start); lockdevice(); + time(&end); + if ((end-=start)>LOCKREPORT) + logmsg("Device lock succeeded after %d seconds",end); } if (verbose>=1) error(".Opening device \"%s\"..",device); if ((devfd=open(device,O_RDWR|O_NDELAY))<0) @@ -831,23 +907,27 @@ size_t l=strlen(device); memset(tios.c_cc,_POSIX_VDISABLE,sizeof(tios.c_cc)); tios.c_cc[VTIME]=0; tios.c_cc[VMIN ]=1; + cfsetispeed(&tios,B19200); + if (cfsetospeed(&tios,B19200)|cfsetispeed(&tios,B19200)) + error("Error setting termios baudrate on device: %m"); if (tcflush(devfd,TCIOFLUSH)) error("Error flushing termios (TCIOFLUSH) on device: %m"); if (tcsetattr(devfd,TCSANOW,&tios)) - error("!Unable to set initial termios device settings"); + error("!Unable to set initial termios device settings: %m"); signal(SIGALRM,(RETSIGTYPE (*)(int))sigalarm); do { - devcmd("",NULL,"\r\nAT\x1A"); + devcmd("",NULL,"\r\nAT\032"); devcmd(NULL,NULL,"\r\nAT"); smscset(); devcmd(NULL,NULL,"\r\nAT+CMGF=0"); devcmd("\n> ",NULL,"\r\nAT+CMGS=%d",(strlen(pdusmsc)+strlen(pdudata))/2); - if (!(s=devcmd(NULL,"\n+CMGS:","!%s%s\x1A",pdusmsc,pdudata))) retrying(); + if (!(s=devcmd(NULL,"\n+CMGS:","!%s%s\032",pdusmsc,pdudata))) retrying(); } while (!s); while (isspace(*s)) s++; if (verbose>=1) error("\nMessage successfuly sent with MR: %s",s); devcmd(NULL,NULL,"\r\nAT"); + logmsg("SMS sent (after %d retries), message reference: %s",retrycnt,s); return(EXIT_SUCCESS); }