#include "buffer.h"
#include "common.h"
-#include "threads.h"
+#include "epoll.h"
#include "tokens.h"
#define DAEMON_NAME "postlicyd"
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+ */
const char *encryption_cipher;
const char *encryption_keysize;
const char *etrn_domain;
+
+ 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)
+{
+ plicyd_t *plicyd = p_new(plicyd_t, 1);
+ plicyd->fd = -1;
+ return plicyd;
+}
+
+static void plicyd_delete(plicyd_t **plicyd)
+{
+ if (*plicyd) {
+ if ((*plicyd)->fd >= 0)
+ close((*plicyd)->fd);
+ buffer_wipe(&(*plicyd)->ibuf);
+ buffer_wipe(&(*plicyd)->obuf);
+ p_delete(plicyd);
+ }
+}
+
static int postfix_parsejob(query_t *query, char *p)
{
#define PARSE_CHECK(expr, error, ...) \
} \
} 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;
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)) {
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);
#undef PARSE_CHECK
}
-static void *policy_run(int fd, void *data)
+__attribute__((format(printf,2,0)))
+static void policy_answer(plicyd_t *pcy, const char *fmt, ...)
{
- buffer_t buf;
+ 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);
+ epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
+}
- buffer_init(&buf);
- for (;;) {
- int nb = buffer_read(&buf, fd, -1);
- const char *eoq;
- query_t q;
+static void policy_process(plicyd_t *pcy)
+{
+ policy_answer(pcy, "DUNNO");
+}
- 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;
- }
+static int policy_run(plicyd_t *pcy)
+{
+ 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;
+ }
- eoq = strstr(buf.data + MAX(0, buf.len - 3), "\r\n\r\n");
- if (!eoq)
- continue;
+ if (!(eoq = strstr(pcy->ibuf.data + search_offs, "\n\n")))
+ return 0;
- if (postfix_parsejob(&q, buf.data) < 0)
- break;
+ if (postfix_parsejob(&pcy->q, pcy->ibuf.data) < 0)
+ return -1;
+ pcy->q.eoq = eoq + strlen("\n\n");
+ epoll_modify(pcy->fd, 0, pcy);
+ policy_process(pcy);
+ return 0;
+}
- buffer_consume(&buf, eoq + strlen("\r\n\r\n") - buf.data);
- if (xwrite(fd, "DUNNO\r\n", strlen("DUNNO\r\n"))) {
- UNIXERR("write");
- break;
- }
+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;
}
- buffer_wipe(&buf);
- close(fd);
- return NULL;
+ tmp = plicyd_new();
+ tmp->fd = sock;
+ epoll_register(sock, EPOLLIN, tmp);
}
/* administrivia {{{ */
static int main_initialize(void)
{
- struct sigaction sa;
-
openlog("postlicyd", LOG_PID, LOG_MAIL);
signal(SIGPIPE, SIG_IGN);
- sigaction(SIGINT, NULL, &sa);
- sa.sa_handler = &common_sighandler;
- sa.sa_flags &= ~SA_RESTART;
- sigaction(SIGINT, &sa, NULL);
+ signal(SIGINT, &common_sighandler);
signal(SIGTERM, &common_sighandler);
signal(SIGHUP, &common_sighandler);
signal(SIGSEGV, &common_sighandler);
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, "hf" "l:p:")) >= 0; ) {
switch (c) {
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");
+ 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;
}
- thread_launch(policy_run, fd, NULL);
- threads_join();
+
+ 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);
+ }
+ }
+ }
}
- close(sock);
syslog(LOG_INFO, "Stopping...");
return EXIT_SUCCESS;
}
projects / apps / pfixtools.git / blobdiff