* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wproto.c,v $
- * Revision 1.11 1996/01/05 16:21:21 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.
*
void wo_write (WCLIENT wc, const char *s, size_t len)
{
if (wc->outbuffer_offset + len >= wc->outbuffer_size)
- wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
- OUTBUFFER_CHUNK);
+ {
+ 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;
}
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;
-#if 0
- wo_printf(wc, "Expires: 0\nContent-type: %s\n\n", type);
-#else
- wo_printf(wc, "Content-type: %s\n\n", type);
-#endif
+ if (type)
+ wo_printf(wc, "Content-type: %s\n\n", type);
}
int wo_puthtml (WCLIENT wc, char *name)
int wo_finish(WCLIENT wc)
{
- char buf[4];
+ int fd;
gw_log (GW_LOG_DEBUG, mod, "wo_finish");
wo_putc (wc, 0);
if (wo_flush(wc) < 0)
return -1;
-#if 1
- gw_log (GW_LOG_DEBUG, mod, "reading ack");
- if (read(wc->linein, buf, 2) != 2)
+
+ fd = open (wc->wf_serverf, O_RDONLY);
+ if (fd != -1)
{
- gw_log (GW_LOG_DEBUG, mod, "read ack");
+ 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);
}
-#endif
close(wc->lineout);
wc->lineout = -1;
if (wc->cache_fd >= 0)
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");
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 */
gw_log (GW_LOG_DEBUG, mod, "wproto_dumpcache");
wproto_dumpcache(wc, level);
wo_finish(wc);
+
}
else
{
}
}
-WCLIENT wproto_init(void)
+WCLIENT wproto_init (const char *fifoDir)
{
char *val, path2[256];
wclient_data *new;
gw_log (GW_LOG_FATAL, mod, "GWID not set");
exit (1);
}
+ new->fifoDir = fifoDir;
new->id = atoi (val);
- sprintf(new->path, "%s/%s/clt%d", FIFOROOT, FIFODIR, new->id);
+ 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);
exit(1);
}
new->outbuffer = 0;
+ new->outbuffer_size = 0;
+ new->outbuffer_offset = 0;
new->cache_level = -1;
new->cache_fd = -1;
return new;
}
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);
projects / egate.git / blobdiff