/pfPorts/check_reload_status/files/check_reload_status.c - Diff - UnivNautes - Redmine Entr’ouvert

« Précédent | Suivant »

Révision 455d784c

Ajouté par Ermal il y a presque 10 ans

ID 455d784c30903004978af78ed4a33fce81f64eda
Parent 385877a8
Enfant dbbbd083

Actually use a separate socket for each fcgi request since its required on STREAM sockets. Facepalm for before

     #include "fastcgi.h"
     /* function definitions */
     static void			handle_signal(int);
     static void			handle_signal_act(int, siginfo_t *, void *);
     static void			run_command(struct command *, char *);
     static void			set_blockmode(int socket, int cmd);
     struct command *	match_command(struct command *target, char *wordpassed);
     struct command *	parse_command(int fd, int argc, char **argv);
     static void			socket_read_command(int socket, short event, void *arg);
     static void			show_command_list(int fd, const struct command *list);
     static void			socket_accept_command(int socket, short event, void *arg);
     static void			socket_close_command(int fd, struct event *ev);
     static void			socket_read_fcgi(int, short, void *);
     static void			fcgi_send_command(int, short, void *);
     static int			fcgi_open_socket(void);
     /*
      * Internal representation of a packet.
      */
-...
     	int requestId;
     	int aggregate;
     	int dontexec;
     	int socket;
     	struct event socket_ev;
     };
     TAILQ_HEAD(runqueue, runq) cmds = TAILQ_HEAD_INITIALIZER(cmds);;
     /* function definitions */
     static void			handle_signal(int);
     static void			handle_signal_act(int, siginfo_t *, void *);
     static void			run_command(struct command *, char *);
     static void			set_blockmode(int socket, int cmd);
     struct command *	match_command(struct command *target, char *wordpassed);
     struct command *	parse_command(int fd, int argc, char **argv);
     static void			socket_read_command(int socket, short event, void *arg);
     static void			show_command_list(int fd, const struct command *list);
     static void			socket_accept_command(int socket, short event, void *arg);
     static void			socket_close_command(int fd, struct event *ev);
     static void			socket_read_fcgi(int, short, void *);
     static void			fcgi_send_command(int, short, void *);
     static int			fcgi_open_socket(struct runq *);
     static pid_t ppid = -1;
     static struct utsname uts;
     static int fcgifd = -1;
     static int keepalive = 1;
     static char *fcgipath = (char *)FCGI_SOCK_PATH;
     struct event fcgiev;
     static int
     prepare_packet(FCGI_Header *header, int type, int lcontent, int requestId)
-...
+    }
     static int
     fcgi_open_socket()
     fcgi_open_socket(struct runq *cmd)
+    {
             struct sockaddr_un sun;
     	int fcgifd;
     	fcgifd = socket(PF_UNIX, SOCK_STREAM, 0);
     	if (fcgifd < 0) {
     		printf("Could not socket\n");
     		syslog(LOG_ERR, "Could not socket\n");
     		return (-1);
+    	}
-...
     	sun.sun_family = PF_UNIX;
             strlcpy(sun.sun_path, fcgipath, sizeof(sun.sun_path));
             if (connect(fcgifd, (struct sockaddr *)&sun, sizeof(sun)) < 0) {
                     printf("Could not bind\n");
                     syslog(LOG_ERR, "Could not connect to %s\n", fcgipath);
                     close(fcgifd);
                     return (-1);
+            }
             set_blockmode(fcgifd, O_NONBLOCK | FD_CLOEXEC);
     	event_set(&fcgiev, fcgifd, EV_READ | EV_PERSIST, socket_read_fcgi, &fcgiev);
     	event_add(&fcgiev, NULL);
     	event_set(&cmd->socket_ev, fcgifd, EV_READ | EV_PERSIST, socket_read_fcgi, cmd);
     	event_add(&cmd->socket_ev, NULL);
     	return (fcgifd);
+    }
-...
     	struct timeval tv = { 8, 0 };
     	static int requestId = 0;
     	int len, result;
     	char *p, sbuf[4096], buf[4096];
     	char *p, sbuf[4096], buf[4096], *bufptr;
     	cmd = arg;
     	if (cmd == NULL)
-...
     	if (cmd->dontexec) {
     		TAILQ_REMOVE(&cmds, cmd, rq_link);
     		timeout_del(&cmd->ev);
     		event_del(&cmd->socket_ev);
     		free(cmd);
     		return;
+    	}
-...
     #endif
     		memset(buf, 0, sizeof(buf));
     	bufptr = buf;
     	bHeader = (FCGI_BeginRequestRecord *)buf;
     	prepare_packet(&bHeader->header, FCGI_BEGIN_REQUEST, sizeof(bHeader->body), requestId);
     	bHeader->body.roleB0 = (unsigned char)FCGI_RESPONDER;
     	bHeader->body.flags = (unsigned char)(keepalive ? FCGI_KEEP_CONN : 0);
     	bHeader++;
     	tmpl = (FCGI_Header *)bHeader;
     	bufptr += sizeof(FCGI_Header);
     	tmpl = (FCGI_Header *)bufptr;
     	prepare_packet(tmpl, FCGI_PARAMS, sbuf_len(&sb), requestId);
     	tmpl++;
     	bufptr += sizeof(FCGI_Header);
     	tmpl = (FCGI_Header *)bufptr;
     	memcpy((char *)tmpl, sbuf_data(&sb), sbuf_len(&sb));
     	tmpl = (FCGI_Header *)(((char *)tmpl) + sbuf_len(&sb));
     	bufptr += sbuf_len(&sb);
     	tmpl = (FCGI_Header *)bufptr;
             prepare_packet(tmpl, FCGI_PARAMS, 0, requestId);
             tmpl++;
     	bufptr += sizeof(FCGI_Header);
     	tmpl = (FCGI_Header *)bufptr;
             prepare_packet(tmpl, FCGI_STDIN, 0, requestId);
     	if (fcgifd < 0) {
     		syslog(LOG_ERR, "Reopening fcgi socket");
     		if (fcgi_open_socket() < 0) {
     	if (cmd->socket < 0) {
     		if ((cmd->socket = fcgi_open_socket(cmd)) < 0) {
     			/* Reschedule */
     			tv.tv_sec = 1;
     			cmd->socket = -1;
     			timeout_add(&cmd->ev, &tv);
     			return;
+    		}
+    	}
     	result = write(fcgifd, buf, len);
     	result = write(cmd->socket, buf, len);
     	if (result < 0) {
     		if (fcgifd) {
     			event_del(&fcgiev);
     			close(fcgifd);
     		if (cmd->socket) {
     			event_del(&cmd->socket_ev);
     			close(cmd->socket);
+    		}
     		fcgifd = -1;
     		cmd->socket = -1;
     		syslog(LOG_ERR, "Something wrong happened while sending request: %m\n");
     		timeout_add(&cmd->ev, &tv);
     	} else if (cmd->aggregate > 0) {
-...
     		break;
+    	}
     	if (cmd->cmd.flags & FCGICMD)
     	if (cmd->cmd.flags & FCGICMD) {
     		command->socket = fcgi_open_socket(command);
     		timeout_set(&command->ev, fcgi_send_command, command);
     	else
     	} else {
     		timeout_set(&command->ev, run_command_detailed, command);
+    	}
     	timeout_add(&command->ev, &tv);
     	return;
-...
+    }
     static void
     socket_read_fcgi(int fd, short event, void *arg __unused)
     socket_read_fcgi(int fd, short event, void *arg)
+    {
     	struct runq *tmpcmd = NULL;
     	struct runq *tmpcmd = arg;
     	FCGI_Header header;
     	char buf[4096];
             int len, terr, success = 0;
     	if (event == EV_TIMEOUT) {
     		close(fd);
     		fcgi_open_socket();
     		fcgi_open_socket(tmpcmd);
     		return;
+    	}
-...
     	memset(&header, 0, sizeof(header));
     	if (recv(fd, &header, sizeof(header), 0) > 0) {
     		len = (header.requestIdB1 << 8) | header.requestIdB0;
     		TAILQ_FOREACH(tmpcmd, &cmds, rq_link) {
     			if (tmpcmd->requestId == len)
     				break;
+    		}
     		len = (header.contentLengthB1 << 8) | header.contentLengthB0;
     		len += header.paddingLength;
-...
     			/* XXX: Should check if len > sizeof(buf)? */
     			terr = recv(fd, buf, len, 0);
     			if (terr < 0) {
     				//syslog(LOG_ERR, "Something happened during recv of data");
     				syslog(LOG_ERR, "Something happened during recv of data: %m");
     				return;
+    			}
+    		}
-...
     				if (success) {
     					TAILQ_REMOVE(&cmds, tmpcmd, rq_link);
     					timeout_del(&tmpcmd->ev);
     					event_del(&tmpcmd->socket_ev);
     					free(tmpcmd);
     				} else {
     				       /* Rexec the command so the event is not lost. */

Formats disponibles : Unified diff

Projet

Général

Profil

UnivNautes

Révision 455d784c

Ajouté par Ermal il y a presque 10 ans