X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fwproto.c;h=0cbeeb197249502aa41b048613d87744d5b1b857;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=49b82b733ef8cc6a7d6c86fec122028ffe7409c9;hpb=150d836eb46d0dde8fedeb77fc7fd4ef6eafba4f;p=egate.git diff --git a/www/wproto.c b/www/wproto.c index 49b82b7..0cbeeb1 100644 --- a/www/wproto.c +++ b/www/wproto.c @@ -41,7 +41,63 @@ * USE OR PERFORMANCE OF THIS SOFTWARE. * * $Log: wproto.c,v $ - * Revision 1.5 1995/11/02 16:35:37 adam + * Revision 1.18 1996/02/12 10:09:23 adam + * New parameter to wproto_init: directory root for the FIFOs (instead + * of using preprocessor defines FIFODIR/FIFOROOT). + * + * Revision 1.17 1996/01/26 09:02:22 adam + * Open of client FIFO called with O_NDELAY when reconnecting to shell + * in order to prevent serious lock if previous shell died without + * unlinking client FIFO. + * + * Revision 1.16 1996/01/24 10:13:56 adam + * Bug fix: in function wo_write realloc is used only when memory is already + * allocated with malloc. + * + * Revision 1.15 1996/01/24 08:25:32 adam + * Buf fix: Uninitialized outbuffer_offset member. + * + * Revision 1.14 1996/01/12 13:08:07 adam + * CGI script passes name of lock file to the shell. The server will not close + * the response FIFO until this file becomes unlocked. This method handles + * cancel operations much better. + * + * Revision 1.13 1996/01/12 10:05:20 adam + * If script name ends with ';' HTTP/GET/Expires will be defined. + * The cgi interface only reads final handshake if response from + * server (shell) was zero-terminated [If it isn't it probably died]. + * + * Revision 1.12 1996/01/05 16:35:02 adam + * Minor changes. + * + * Revision 1.11 1996/01/05 16:21:21 adam + * Bug fix: shell (wproto) sometimes closed server FIFO before cgi + * program opened it - solution: cgi sends OK when response has been read. + * + * Revision 1.10 1995/12/22 14:21:16 adam + * More work on scan. The search.egw script takes care of cached + * query page (doesn't always increment nextSetNo). To make new search set + * either 'New query' must be selected or the query page must be reloaded. + * The msearch script doesn't do this yet, however. + * + * Revision 1.9 1995/11/14 16:31:36 adam + * Temporary remove of ccl entry. + * + * Revision 1.8 1995/11/13 15:41:45 adam + * Arrow gifs. + * Gateway uses record element set names B(rief) and F(ull). + * Bug fix. Didn't save idAuthentication correctly. + * + * Revision 1.7 1995/11/10 14:47:32 adam + * Plus (+) characters automatically converted to space in forms. + * Work on search in multiple targets. Doesn't work well - yet. + * Presentation formats enhanced. + * + * Revision 1.6 1995/11/06 10:51:17 adam + * End of response marker in response from wsh/wproto to wcgi. + * Shells are respawned when necessary. + * + * Revision 1.5 1995/11/02 16:35:37 adam * Bug fixes and select on FIFOs in wcgi - doesn't really work! * * Revision 1.4 1995/10/31 16:56:25 adam @@ -61,6 +117,7 @@ */ #include +#include #include #include #include @@ -79,18 +136,27 @@ static void wproto_uncache(WCLIENT wc, int level); static char *mod = "wproto"; -void wo_puts(WCLIENT wc, char *s) +void wo_write (WCLIENT wc, const char *s, size_t len) { - int len; - - if (wc->outbuffer_offset + (len = strlen(s)) + 1 > wc->outbuffer_size) - wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size += - OUTBUFFER_CHUNK); - memcpy(wc->outbuffer + wc->outbuffer_offset, s, len + 1); + if (wc->outbuffer_offset + len >= wc->outbuffer_size) + { + if (!wc->outbuffer) + wc->outbuffer = malloc (wc->outbuffer_size += + ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK)); + else + wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size += + ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK)); + } + memcpy(wc->outbuffer + wc->outbuffer_offset, s, len); wc->outbuffer_offset += len; } -void wo_printf(WCLIENT wc, const char *fmt, ...) +void wo_puts (WCLIENT wc, const char *s) +{ + wo_write (wc, s, strlen(s)); +} + +void wo_printf (WCLIENT wc, const char *fmt, ...) { va_list ap; char tmpbuf[4048]; @@ -101,15 +167,14 @@ void wo_printf(WCLIENT wc, const char *fmt, ...) va_end(ap); } -void wo_clear(WCLIENT wc, char *type) +void wo_clear (WCLIENT wc, const char *type) { - if (!wc->outbuffer) - wc->outbuffer = malloc(wc->outbuffer_size = OUTBUFFER_CHUNK); wc->outbuffer_offset = 0; - wo_printf(wc, "Content-type: %s\n\n", type); + if (type) + wo_printf(wc, "Content-type: %s\n\n", type); } -int wo_puthtml(WCLIENT wc, char *name) +int wo_puthtml (WCLIENT wc, char *name) { FILE *f; char ch; @@ -142,8 +207,11 @@ int wo_flush(WCLIENT wc) wc->outbuffer_offset = 0; for (;;) { + int w_chunk; + + w_chunk = towrite; wrote = write(wc->lineout, wc->outbuffer + wc->outbuffer_offset, - towrite); + w_chunk); if (wrote <= 0) { gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "write response"); @@ -176,9 +244,24 @@ int wo_overflow(WCLIENT wc, char ch) int wo_finish(WCLIENT wc) { + int fd; gw_log (GW_LOG_DEBUG, mod, "wo_finish"); + + wo_putc (wc, 0); if (wo_flush(wc) < 0) return -1; + + fd = open (wc->wf_serverf, O_RDONLY); + if (fd != -1) + { + struct flock area; + area.l_type = F_RDLCK; + area.l_whence = SEEK_SET; + area.l_start = 0L; + area.l_len = 0L; + fcntl (fd, F_SETLKW, &area); + close (fd); + } close(wc->lineout); wc->lineout = -1; if (wc->cache_fd >= 0) @@ -199,10 +282,21 @@ static void descramble(char *t, const char *o) { sscanf(o + 1, "%2x", &v); o += 3; - *(t++) = (char) v; + if (v == '+') + *t = ' '; + else + *t = (char) v; + t++; } else - *(t++) = *(o++); + { + if (*o == '+') + *t = ' '; + else + *t = *o; + t++; + o++; + } } *t = '\0'; } @@ -273,12 +367,11 @@ int wproto_process(WCLIENT wc, int timeout) if (rs == 0) { gw_log (GW_LOG_STAT, mod, - "wproto_process returning 0 after %d second timeout.", + "select %d second timeout.", timeout); unlink (wc->wf_serverp); return 0; } - /* determine handle (fifo or user) */ if (read(wc->linein, &toread, sizeof(toread)) < sizeof(toread)) { gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "wp_proc:len read failed"); @@ -293,48 +386,62 @@ int wproto_process(WCLIENT wc, int timeout) p = combuf; for (t = wc->wf_serverp; (*t = *p); t++, p++); p++; + for (t = wc->wf_serverf; (*t = *p); t++, p++); + p++; for (t = wc->wf_parms; (*t = *p); t++, p++); p++; p++; /* we don't deal with envvars yet */ decode_form(wc->wf_data, p); - if (wc->lineout < 0 && (wc->lineout = open(wc->wf_serverp, O_WRONLY)) - < 0) - { - gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", wc->wf_serverp); - exit(1); - } + if (wc->lineout < 0) + { + gw_log (GW_LOG_DEBUG, mod, "open %s", wc->wf_serverp); + if ((wc->lineout = open(wc->wf_serverp, O_WRONLY)) < 0) + { + gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", + wc->wf_serverp); + exit(1); + } + } /* look in cache only if request carries no forms data. */ if (!*wc->wf_data[0].name && (level = wproto_findcache(wc, wc->wf_parms)) >= 0) { + gw_log (GW_LOG_DEBUG, mod, "wproto_dumpcache"); wproto_dumpcache(wc, level); wo_finish(wc); + } else { - unlink (wc->wf_serverp); return 1; } } } -WCLIENT wproto_init(void) +WCLIENT wproto_init (const char *fifoDir) { - char path2[256]; + char *val, path2[256]; wclient_data *new; gw_log (GW_LOG_DEBUG, mod, "wproto_init"); close(1); /* release us from the wserver */ - new = malloc(sizeof(*new)); - new->id = getpid(); - sprintf(new->path, "%s/%s/clt%d", FIFOROOT, FIFODIR, new->id); - if (mkfifo(new->path, 0666 | S_IFIFO) < 0) + if (!(new = malloc(sizeof(*new)))) { - gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "mkfifo(%s)", new->path); - exit(1); + gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc"); + exit (1); } + if (!(val = getenv ("GWID"))) + { + gw_log (GW_LOG_FATAL, mod, "GWID not set"); + exit (1); + } + new->fifoDir = fifoDir; + new->id = atoi (val); + sprintf(new->path, "%s/clt%d", new->fifoDir, new->id); + if (mkfifo(new->path, 0666 | S_IFIFO) < 0) + gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "mkfifo(%s)", new->path); gw_log (GW_LOG_DEBUG, mod, "Synchronizing with server."); - sprintf(path2, "%s/%s/srv%d", FIFOROOT, FIFODIR, getppid()); + sprintf(path2, "%s/srv%d", new->fifoDir, getppid()); if ((new->lineout = open(path2, O_WRONLY)) < 0) { gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open out %s", path2); @@ -360,6 +467,8 @@ WCLIENT wproto_init(void) exit(1); } new->outbuffer = 0; + new->outbuffer_size = 0; + new->outbuffer_offset = 0; new->cache_level = -1; new->cache_fd = -1; return new; @@ -390,7 +499,7 @@ int wproto_cache(WCLIENT wc, int level) } wproto_uncache(wc, level); p = &wc->cache[++wc->cache_level]; - sprintf(p->path, "%s/%s/csh%d.%d", FIFOROOT, FIFODIR, wc->id, level); + sprintf(p->path, "%s/csh%d.%d", wc->fifoDir, wc->id, level); if ((wc->cache_fd = open(p->path, O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0) { gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", p->path);