diff --git a/pfPorts/check_reload_status/files/check_reload_status.c b/pfPorts/check_reload_status/files/check_reload_status.c index 9ae8905..442683b 100644 --- a/pfPorts/check_reload_status/files/check_reload_status.c +++ b/pfPorts/check_reload_status/files/check_reload_status.c @@ -78,10 +78,9 @@ 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 socket_read_command(int socket); 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 *); @@ -528,14 +527,6 @@ run_command(struct command *cmd, char *argv) { } static void -socket_close_command(int fd, struct event *ev) -{ - event_del(ev); - free(ev); - close(fd); -} - -static void socket_read_fcgi(int fd, short event, void *arg) { struct runq *tmpcmd = arg; @@ -623,21 +614,15 @@ socket_read_fcgi(int fd, short event, void *arg) } static void -socket_read_command(int fd, short event, void *arg) +socket_read_command(int fd) { struct command *cmd; - struct event *ev = arg; enum { bufsize = 2048 }; char buf[bufsize]; register int n; char **ap, *argv[bufsize], *p; int i, loop = 0; - if (event == EV_TIMEOUT) { - socket_close_command(fd, ev); - return; - } - tryagain: bzero(buf, sizeof(buf)); if ((n = read (fd, buf, bufsize)) == -1) { @@ -663,7 +648,7 @@ tryagain: for (i = 0; i < n - 1; i++) { if (!isalpha(buf[i]) && !isspace(buf[i]) && !isdigit(buf[i]) && !ispunct(buf[i])) { write(fd, "ERROR:\tonly alphanumeric chars allowd", 37); - socket_close_command(fd, ev); + close(fd); return; } } @@ -696,8 +681,6 @@ static void socket_accept_command(int fd, __unused short event, __unused void *arg) { struct sockaddr_un sun; - struct timeval tv = { 10, 0 }; - struct event *ev; socklen_t len; int newfd; @@ -708,14 +691,7 @@ socket_accept_command(int fd, __unused short event, __unused void *arg) } set_blockmode(newfd, O_NONBLOCK | FD_CLOEXEC); - if ((ev = malloc(sizeof(*ev))) == NULL) { - syslog(LOG_ERR, "Cannot allocate new struct event."); - close(newfd); - return; - } - - event_set(ev, newfd, EV_READ | EV_PERSIST, socket_read_command, ev); - event_add(ev, &tv); + socket_read_command(newfd); } static void