* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wcgi.c,v $
- * Revision 1.14 1996/01/12 13:08:06 adam
+ * Revision 1.17 1996/02/26 10:36:15 adam
+ * Better error handling when (re)spawn of the shell fails.
+ *
+ * Revision 1.16 1996/02/12 10:10:29 adam
+ * Resource/config system used by the gateway.
+ *
+ * Revision 1.15 1996/01/26 09:02:20 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.14 1996/01/12 13:08:06 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.
the server, please reload the server's 'front page'."
#include <gw-db.h>
+#include <gw-res.h>
#include "wproto.h"
static char *prog = "cgi";
static int spawn (char *sprog, int id)
{
- int r;
+ int r, fd;
char path[256];
char envstr[80];
sprintf (envstr, "GWID=%d", id);
putenv (envstr);
- sprintf(path, "%s/%s", CGIDIR, sprog);
+ sprintf(path, "%s/%s", EGWDIR, sprog);
switch(r = fork())
{
case -1:
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "fork");
- exit(1);
+ fatal ("Internal error in server");
case 0:
close (0);
close (1);
gw_log (GW_LOG_DEBUG, prog, "execl %s", path);
execl (path, sprog, 0);
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "execl %s", path);
- exit(0);
+ fd = open (serverp, O_WRONLY);
+ if (fd >= 0)
+ {
+ write (fd, "FA", 2);
+ close (fd);
+ }
+ exit(1);
default:
return r;
}
*/
int main()
{
- char clientp[256], tmp[256], *path_info, *p, *operation, *t;
+ char clientp[256], *path_info, *p, *operation, *t;
char combuf[COMBUF];
+ const char *fifoDir;
+ GwRes cgiRes;
int serverf_fd = -1;
int linein = -1, lineout, data, gw_id;
- chdir ("/usr/local/etc/httpd/cgi-bin");
+ if (chdir (EGWDIR))
+ fatal ("Couldn't change directory to " EGWDIR);
gw_log_init ("egw");
- gw_log_file (GW_LOG_ALL, LOGDIR "/egwcgi_log");
+ gw_log_file (GW_LOG_ALL, "egwcgi_log");
+#if 0
gw_log_level (GW_LOG_ALL);
+#endif
gw_log_session (getpid());
gw_log (GW_LOG_STAT, prog, "Europagate www cgi server");
+ cgiRes = gw_res_init ();
+ gw_res_merge (cgiRes, "egw.res");
- sprintf(tmp, "%s/%s", FIFOROOT, FIFODIR);
- if (access(tmp, R_OK|W_OK) < 0 && mkdir(tmp, 0777) < 0)
+#if 1
+ gw_log_level (gw_log_mask_str (
+ gw_res_get (cgiRes, "log.level", "default")));
+#endif
+ fifoDir = gw_res_get (cgiRes, "fifo.dir", "/tmp/egw");
+
+ /* Create fifo directory if it doesn't exist already */
+ if (access(fifoDir, R_OK|W_OK) < 0 && mkdir(fifoDir, 0777) < 0)
{
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "Failed to create %s", tmp);
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "Failed to create %s",
+ fifoDir);
fatal("Internal error in server.");
}
- sprintf(serverp, "%s/srv%d", tmp, getpid());
+ /* Delete server FIFO if it does exist */
+ sprintf(serverp, "%s/srv%d", fifoDir, getpid());
if (access(serverp, R_OK|W_OK) == 0)
{
if (unlink(serverp) < 0)
else
gw_log (GW_LOG_WARN, prog, "Removed stale server fifo.");
}
+ /* Make server FIFO */
if (mkfifo(serverp, 0666 | S_IFIFO) < 0)
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "mkfifo(%s)", serverp);
fatal("Internal error in server.");
}
+ /* The httpd server must pass PATH_INFO */
if (!(path_info = getenv("PATH_INFO")))
{
gw_log (GW_LOG_FATAL, prog, "Must set PATH_INFO.");
fatal("Internal error in server.");
}
- sprintf (serverf, "%s/srf%d", tmp, getpid ());
+ /* Create lock file that ensures the server (shell) doesn't */
+ /* terminate before we have read the whole response */
+ sprintf (serverf, "%s/srf%d", fifoDir, getpid ());
gw_log (GW_LOG_DEBUG, prog, "open w %s", serverf);
serverf_fd = open (serverf, O_WRONLY|O_CREAT|O_TRUNC, 0666);
if (serverf_fd == -1)
area.l_len = 0L;
fcntl (serverf_fd, F_SETLK, &area);
}
+ /* Read first part of path_info. Either it is a numeric session id */
+ /* or it is the name of a backend shell. */
operation = ++path_info;
while (*path_info && *path_info != '/')
path_info++;
exit (1);
}
gw_log (GW_LOG_DEBUG, prog, "www.db ok");
+ /* Is operation a backend shell (new session) ? */
if ((gw_id = atoi(operation)) <= 0)
{
int r;
char gw_id_str[16];
+ /* Get new unique id */
gw_id = gw_db_seq_no (gw_db);
sprintf (gw_id_str, "%d", gw_id);
-
+
+ /* Spawn backend shell (server) */
spawn(operation, gw_id);
r = gw_db_insert (gw_db, gw_id_str, strlen(gw_id_str)+1,
operation, strlen(operation)+1);
fatal("Internal error in server");
}
gw_log (GW_LOG_DEBUG, prog, "Synchronized");
+ sprintf(clientp, "%s/clt%d", fifoDir, gw_id);
+ gw_log (GW_LOG_DEBUG, prog, "open w %s", clientp);
+ lineout = open (clientp, O_WRONLY);
+ }
+ else /* A session is continued */
+ {
+ sprintf(clientp, "%s/clt%d", fifoDir, gw_id);
+ gw_log (GW_LOG_DEBUG, prog, "open w|n %s", clientp);
+ /* Open the FIFO in O_NDELAY-mode: This prevents blocking */
+ /* even though the shell died without unlinking the FIFO */
+ /* On the other hand, if the shell is running, it will never */
+ /* close this FIFO */
+ lineout = open (clientp, O_WRONLY|O_NDELAY);
}
- sprintf(clientp, "%s/clt%d", tmp, gw_id);
- gw_log (GW_LOG_DEBUG, prog, "open w %s", clientp);
- if ((lineout = open(clientp, O_WRONLY)) < 0)
+ /* If open of clientp failed, the shell is not running, so we */
+ /* invoke it again */
+ if (lineout < 0)
{
char gw_id_str[16];
void *sprog;
strcpy (p, serverf);
p += strlen (p) + 1;
strcpy (p, path_info);
- gw_log (GW_LOG_DEBUG, prog, "P:%s", p);
+ gw_log (GW_LOG_STAT, prog, "P:%s", p);
p += strlen(p) + 1;
*(p++) = '\0'; /* no envvars tranferred at present */
if ((t = getenv("CONTENT_LENGTH")) && (data = atoi(t)) > 0)
projects / egate.git / blobdiff