X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-postlicyd.c;h=febc1e294d5d24e7e488291b5056046cfbcb2670;hb=881732b600190bc02b9dde47980b14382851c266;hp=7a5630ebec1d556f86f1821c2e1232d1f19be26a;hpb=8a872b1a9ec12dd44292603137c41f1b29b9f756;p=apps%2Fpfixtools.git diff --git a/main-postlicyd.c b/main-postlicyd.c index 7a5630e..febc1e2 100644 --- a/main-postlicyd.c +++ b/main-postlicyd.c @@ -31,6 +31,7 @@ /* * Copyright © 2006-2007 Pierre Habouzit + * Copyright © 2008 Florent Bruneau */ #include @@ -38,14 +39,16 @@ #include "buffer.h" #include "common.h" #include "epoll.h" -#include "threads.h" #include "tokens.h" +#include "server.h" #define DAEMON_NAME "postlicyd" #define DEFAULT_PORT 10000 #define RUNAS_USER "nobody" #define RUNAS_GROUP "nogroup" +DECLARE_MAIN + enum smtp_state { SMTP_UNKNOWN, SMTP_CONNECT, @@ -92,33 +95,23 @@ typedef struct query_t { const char *eoq; } query_t; -typedef struct plicyd_t { - unsigned listener : 1; - int fd; - buffer_t ibuf; - buffer_t obuf; - query_t q; -} plicyd_t; - - -static plicyd_t *plicyd_new(void) +static query_t *query_new(void) { - plicyd_t *plicyd = p_new(plicyd_t, 1); - plicyd->fd = -1; - return plicyd; + return p_new(query_t, 1); } -static void plicyd_delete(plicyd_t **plicyd) +static void query_delete(query_t **query) { - if (*plicyd) { - if ((*plicyd)->fd >= 0) - close((*plicyd)->fd); - buffer_wipe(&(*plicyd)->ibuf); - buffer_wipe(&(*plicyd)->obuf); - p_delete(plicyd); + if (*query) { + p_delete(query); } } +static void *query_starter(server_t* server) +{ + return query_new(); +} + static int postfix_parsejob(query_t *query, char *p) { #define PARSE_CHECK(expr, error, ...) \ @@ -214,23 +207,23 @@ static int postfix_parsejob(query_t *query, char *p) } __attribute__((format(printf,2,0))) -static void policy_answer(plicyd_t *pcy, const char *fmt, ...) +static void policy_answer(server_t *pcy, const char *fmt, ...) { va_list args; va_start(args, fmt); buffer_addvf(&pcy->obuf, fmt, args); va_end(args); buffer_addstr(&pcy->obuf, "\n\n"); - buffer_consume(&pcy->ibuf, pcy->q.eoq - pcy->ibuf.data); + buffer_consume(&pcy->ibuf, ((query_t*)(pcy->data))->eoq - pcy->ibuf.data); epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy); } -static void policy_process(plicyd_t *pcy) +static void policy_process(server_t *pcy) { policy_answer(pcy, "DUNNO"); } -static int policy_run(plicyd_t *pcy) +static int policy_run(server_t *pcy, void* config) { ssize_t search_offs = MAX(0, pcy->ibuf.len - 1); int nb = buffer_read(&pcy->ibuf, pcy->fd, -1); @@ -251,9 +244,9 @@ static int policy_run(plicyd_t *pcy) if (!(eoq = strstr(pcy->ibuf.data + search_offs, "\n\n"))) return 0; - if (postfix_parsejob(&pcy->q, pcy->ibuf.data) < 0) + if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0) return -1; - pcy->q.eoq = eoq + strlen("\n\n"); + ((query_t*)pcy->data)->eoq = eoq + strlen("\n\n"); epoll_modify(pcy->fd, 0, pcy); policy_process(pcy); return 0; @@ -261,64 +254,11 @@ static int policy_run(plicyd_t *pcy) int start_listener(int port) { - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_addr = { htonl(INADDR_LOOPBACK) }, - }; - plicyd_t *tmp; - int sock; - - addr.sin_port = htons(port); - sock = tcp_listen_nonblock((const struct sockaddr *)&addr, sizeof(addr)); - if (sock < 0) { - return -1; - } - - tmp = plicyd_new(); - tmp->fd = sock; - tmp->listener = true; - epoll_register(sock, EPOLLIN, tmp); - return 0; -} - -void start_client(plicyd_t *d) -{ - plicyd_t *tmp; - int sock; - - sock = accept_nonblock(d->fd); - if (sock < 0) { - UNIXERR("accept"); - return; - } - - tmp = plicyd_new(); - tmp->fd = sock; - epoll_register(sock, EPOLLIN, tmp); + return start_server(port, NULL, NULL); } /* administrivia {{{ */ -static int main_initialize(void) -{ - openlog("postlicyd", LOG_PID, LOG_MAIL); - signal(SIGPIPE, SIG_IGN); - signal(SIGINT, &common_sighandler); - signal(SIGTERM, &common_sighandler); - signal(SIGHUP, &common_sighandler); - signal(SIGSEGV, &common_sighandler); - syslog(LOG_INFO, "Starting..."); - return 0; -} - -static void main_shutdown(void) -{ - closelog(); -} - -module_init(main_initialize); -module_exit(main_shutdown); - void usage(void) { fputs("usage: "DAEMON_NAME" [options] config\n" @@ -360,66 +300,14 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - if (pidfile_open(pidfile) < 0) { - syslog(LOG_CRIT, "unable to write pidfile %s", pidfile); - return EXIT_FAILURE; - } - - if (drop_privileges(RUNAS_USER, RUNAS_GROUP) < 0) { - syslog(LOG_CRIT, "unable to drop privileges"); + if (common_setup(pidfile, false, RUNAS_USER, RUNAS_GROUP, daemonize) + != EXIT_SUCCESS) { return EXIT_FAILURE; } - if (daemonize && daemon_detach() < 0) { - syslog(LOG_CRIT, "unable to fork"); - return EXIT_FAILURE; - } - - pidfile_refresh(); - if (start_listener(port) < 0) return EXIT_FAILURE; - while (!sigint) { - struct epoll_event evts[1024]; - int n; - - n = epoll_select(evts, countof(evts), -1); - if (n < 0) { - if (errno != EAGAIN && errno != EINTR) { - UNIXERR("epoll_wait"); - return EXIT_FAILURE; - } - continue; - } - - while (--n >= 0) { - plicyd_t *d = evts[n].data.ptr; - - if (d->listener) { - start_client(d); - continue; - } - - if (evts[n].events & EPOLLIN) { - if (policy_run(d) < 0) { - plicyd_delete(&d); - continue; - } - } - - if ((evts[n].events & EPOLLOUT) && d->obuf.len) { - if (buffer_write(&d->obuf, d->fd) < 0) { - plicyd_delete(&d); - continue; - } - if (!d->obuf.len) { - epoll_modify(d->fd, EPOLLIN, d); - } - } - } - } - - syslog(LOG_INFO, "Stopping..."); - return EXIT_SUCCESS; + return server_loop(query_starter, (delete_client_t)query_delete, + policy_run, NULL); }