X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-postlicyd.c;h=97afe21d1daa54e0fc98391ee1a61ff14f66c935;hb=10b49f7af56977b8c27a26438b3cfb07ca63ae90;hp=f9b96f5b89f255bb417c85a4c5e5dd2bd32e5a10;hpb=a73d0a8f6e71ff1637cacf7dc6cbd622aeddbec4;p=apps%2Fpfixtools.git diff --git a/main-postlicyd.c b/main-postlicyd.c index f9b96f5..97afe21 100644 --- a/main-postlicyd.c +++ b/main-postlicyd.c @@ -37,8 +37,9 @@ #include "buffer.h" #include "common.h" -#include "threads.h" +#include "epoll.h" #include "tokens.h" +#include "server.h" #define DAEMON_NAME "postlicyd" #define DEFAULT_PORT 10000 @@ -70,7 +71,7 @@ typedef struct query_t { const char *recipient_count; const char *client_address; const char *client_name; - const char *rclient_name; + const char *reverse_client_name; const char *instance; /* postfix 2.2+ */ @@ -87,8 +88,23 @@ typedef struct query_t { const char *encryption_cipher; const char *encryption_keysize; const char *etrn_domain; + + const char *eoq; } query_t; +static void* query_new() +{ + return p_new(query_t, 1); +} + +static void query_delete(void *arg) +{ + query_t **query = arg; + if (*query) { + p_delete(query); + } +} + static int postfix_parsejob(query_t *query, char *p) { #define PARSE_CHECK(expr, error, ...) \ @@ -99,8 +115,8 @@ static int postfix_parsejob(query_t *query, char *p) } \ } while (0) - p_clear(&query, 1); - while (p[0] != '\r' || p[1] != '\n') { + p_clear(query, 1); + while (*p != '\n') { char *k, *v; int klen, vlen, vtk; @@ -113,10 +129,10 @@ static int postfix_parsejob(query_t *query, char *p) while (isblank(*p)) p++; - p = strstr(v = p, "\r\n"); - PARSE_CHECK(p, "could not find final \\r\\n in line"); + p = strchr(v = p, '\n'); + PARSE_CHECK(p, "could not find final \\n in line"); for (vlen = p - v; vlen && isblank(v[vlen]); vlen--); - p += 2; /* skip \r\n */ + p += 1; /* skip \n */ vtk = tokenize(v, vlen); switch (tokenize(k, klen)) { @@ -128,7 +144,7 @@ static int postfix_parsejob(query_t *query, char *p) CASE(RECIPIENT_COUNT, recipient_count); CASE(CLIENT_ADDRESS, client_address); CASE(CLIENT_NAME, client_name); - CASE(RCLIENT_NAME, rclient_name); + CASE(REVERSE_CLIENT_NAME, reverse_client_name); CASE(INSTANCE, instance); CASE(SASL_METHOD, sasl_method); CASE(SASL_USERNAME, sasl_username); @@ -183,45 +199,55 @@ static int postfix_parsejob(query_t *query, char *p) #undef PARSE_CHECK } -static void *policy_run(int fd, void *data) +__attribute__((format(printf,2,0))) +static void policy_answer(server_t *pcy, const char *fmt, ...) { - buffer_t buf; - - buffer_init(&buf); - for (;;) { - int nb = buffer_read(&buf, fd, -1); - const char *eoq; - query_t q; - - if (nb < 0) { - if (errno == EAGAIN || errno == EINTR) - continue; - UNIXERR("read"); - break; - } - if (nb == 0) { - if (buf.len) - syslog(LOG_ERR, "unexpected end of data"); - break; - } - - eoq = strstr(buf.data + MAX(0, buf.len - 3), "\r\n\r\n"); - if (!eoq) - continue; + 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, ((query_t*)(pcy->data))->eoq - pcy->ibuf.data); + epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy); +} - if (postfix_parsejob(&q, buf.data) < 0) - break; +static void policy_process(server_t *pcy) +{ + policy_answer(pcy, "DUNNO"); +} - buffer_consume(&buf, eoq + strlen("\r\n\r\n") - buf.data); - if (xwrite(fd, "DUNNO\r\n", strlen("DUNNO\r\n"))) { - UNIXERR("write"); - break; - } +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); + const char *eoq; + + if (nb < 0) { + if (errno == EAGAIN || errno == EINTR) + return 0; + UNIXERR("read"); + return -1; + } + if (nb == 0) { + if (pcy->ibuf.len) + syslog(LOG_ERR, "unexpected end of data"); + return -1; } - buffer_wipe(&buf); - close(fd); - return NULL; + if (!(eoq = strstr(pcy->ibuf.data + search_offs, "\n\n"))) + return 0; + + if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0) + return -1; + ((query_t*)pcy->data)->eoq = eoq + strlen("\n\n"); + epoll_modify(pcy->fd, 0, pcy); + policy_process(pcy); + return 0; +} + +int start_listener(int port) +{ + return start_server(port, NULL, NULL); } /* administrivia {{{ */ @@ -232,6 +258,7 @@ static int main_initialize(void) 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; @@ -252,6 +279,7 @@ void usage(void) "Options:\n" " -l port to listen to\n" " -p file to write our pid to\n" + " -f stay in foreground\n" , stderr); } @@ -259,15 +287,11 @@ void usage(void) int main(int argc, char *argv[]) { - struct sockaddr_in addr = { - .sin_family = AF_INET, - .sin_addr = { htonl(INADDR_LOOPBACK) }, - }; const char *pidfile = NULL; + bool daemonize = true; int port = DEFAULT_PORT; - int sock = -1; - for (int c = 0; (c = getopt(argc, argv, "h" "l:p:")) >= 0; ) { + for (int c = 0; (c = getopt(argc, argv, "hf" "l:p:")) >= 0; ) { switch (c) { case 'p': pidfile = optarg; @@ -275,6 +299,9 @@ int main(int argc, char *argv[]) case 'l': port = atoi(optarg); break; + case 'f': + daemonize = false; + break; default: usage(); return EXIT_FAILURE; @@ -296,30 +323,18 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - if (daemon_detach() < 0) { + if (daemonize && daemon_detach() < 0) { syslog(LOG_CRIT, "unable to fork"); return EXIT_FAILURE; } pidfile_refresh(); - addr.sin_port = htons(port); - sock = tcp_listen((struct sockaddr *)&addr, sizeof(addr)); - if (sock < 0) + if (start_listener(port) < 0) return EXIT_FAILURE; - while (!sigint) { - int fd = accept(sock, NULL, 0); - if (fd < 0) { - if (errno != EINTR && errno != EAGAIN) - UNIXERR("accept"); - continue; - } - thread_launch(policy_run, fd, NULL); - threads_join(); - } + (void)server_loop(query_new, query_delete, policy_run, NULL); - close(sock); syslog(LOG_INFO, "Stopping..."); return EXIT_SUCCESS; }