=================================================================== RCS file: /home/cvs/OpenXM/src/asir-port/cgi/webasir2.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- OpenXM/src/asir-port/cgi/webasir2.c 2014/08/31 10:20:33 1.4 +++ OpenXM/src/asir-port/cgi/webasir2.c 2014/09/01 02:41:48 1.5 @@ -1,9 +1,12 @@ -/* $OpenXM: OpenXM/src/asir-port/cgi/webasir2.c,v 1.3 2014/08/31 07:53:57 takayama Exp $ +/* $OpenXM: OpenXM/src/asir-port/cgi/webasir2.c,v 1.4 2014/08/31 10:20:33 takayama Exp $ */ /* - (httpd-asir2.sm1) run webasir2 + -(httpd-asir2.sm1) run webasir2 >log 2>&1 - Todo, timer(limit, command, message) implement in sm1. + - Todo, timer(limit, command, message) implement in sm1. + - Example. webasir2 --asir 'oxMessageBody=1%2B3%3B' + - Example. webasir2 --asir '3-2' + - Error handling is not completed. Run src/kan96xx/Doc/httpd-asir2-kill.sh by cron. */ #include #include @@ -37,8 +40,7 @@ int main(int argc,char *argv[]) { int quit; char workf[SIZE]; quit = 0; - strcpy(asircomm,"3-2;"); - strcpy(asircomm,"oxMessageBody=1%2B3%3B"); + asircomm[0] = 0; for (i=1; i=0; i--) { @@ -79,12 +81,30 @@ int main(int argc,char *argv[]) { } fclose(fp); if (strlen(fname)==0) { - fprintf(stderr,"No webasir2 pid file.\n"); return(-1); + if (Debug) fprintf(stderr,"No webasir2 pid file.\n"); + if (Debug) {fprintf(stderr,"No webasir2 is running. Start server.\n");} + startServer(); + sleep(5); + system(comm); + fp = fopen(workf,"r"); + if (fp == NULL) { + fprintf(stderr,"Failed to start the server.\n"); return(-1); + } + fgets(fname,SIZE-2,fp); + for (i=strlen(fname)-1; i>=0; i--) { + if (fname[i] <= ' ') fname[i]=0; else break; + } + if (strlen(fname) == 0) { + fprintf(stderr,"Failed to start the server. No webasir2 pid file.\n"); return(-1); + } + fclose(fp); } + fp = fopen(fname,"r"); if (fp == NULL) { fprintf(stderr,"Open error of %s\n",fname); return(-1); } + mylock(fname); fgets(key,SIZE-2,fp); sscanf(key,"%d",&dataPort); if (Debug) printf("dataPort=%d\n",dataPort); fgets(key,SIZE-2,fp); @@ -115,6 +135,8 @@ int main(int argc,char *argv[]) { fprintf(stderr,"error: cannot connect\n"); }else{ if (Debug) fprintf(stderr,"Connected\n"); } + if ((strlen(asircomm)==0) && (!quit)) {myunlock(fname); outputTop(); return(0); } + /* If the input is MKEY=..., extract ... */ if (strncmp(asircomm,MKEY,strlen(MKEY))==0) { strcpy(comm,&(asircomm[strlen(MKEY)])); @@ -145,7 +167,13 @@ int main(int argc,char *argv[]) { /* get result */ for (i=0; i0; i--) { + if (comm[i] < ' ') comm[i] = 0; + else break; + } + myunlock(fname); + outputResult(comm); } /* from kan96xx/plugin/oxcgi.c */ @@ -227,6 +255,39 @@ static int cgiHex(int p) { if (Debug) fprintf(stderr,"%s\n","Invalid argument to cgiHex."); } +outputTop() { + printf("Content-Type: text/html\n\n"); + printf("\nInput
asir-command
without semicolon.

\n"); + printf("\n"); + printf("\n"); +} +outputResult(char *s) { + printf("Content-Type: text/plain\n\n"); + printf("%s\n",s); +} +startServer() { + char comm[SIZE]; + char *r; + r = getenv("CGI_ASIR_ALLOW"); + if (r == NULL) { + setenv("CGI_ASIR_ALLOW","[(quit) (fctr)]",1); + } + sprintf(comm,"%s/src/kan96xx/Doc/httpd-asir2.sh >/dev/null 2>&1 &",getenv("OpenXM_HOME")); + /* sprintf(comm,"echo $CGI_ASIR_ALLOW\n"); security check. */ + system(comm); +} +mylock(char *fname) { + char comm[SIZE]; + sprintf(comm,"mv %s /tmp/lock-webasir-%d.txt",fname,getpid()); + system(comm); +} +myunlock(char *fname) { + char comm[SIZE]; + sprintf(comm,"mv /tmp/lock-webasir-%d.txt %s",getpid(),fname); + system(comm); +} usage() { fprintf(stderr,"webasir2 [--quit] [--asir command_string]\n"); fprintf(stderr," [--debug level]\n");