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+ */
} \
} 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);
buffer_init(&buf);
for (;;) {
+ ssize_t search_offs = MAX(0, buf.len - 1);
int nb = buffer_read(&buf, fd, -1);
const char *eoq;
query_t q;
break;
}
- eoq = strstr(buf.data + MAX(0, buf.len - 3), "\r\n\r\n");
+ eoq = strstr(buf.data + search_offs, "\n\n");
if (!eoq)
continue;
if (postfix_parsejob(&q, buf.data) < 0)
break;
- buffer_consume(&buf, eoq + strlen("\r\n\r\n") - buf.data);
- if (xwrite(fd, "DUNNO\r\n", strlen("DUNNO\r\n"))) {
+ buffer_consume(&buf, eoq + strlen("\n\n") - buf.data);
+ if (xwrite(fd, "DUNNO\n\n", strlen("DUNNO\n\n"))) {
UNIXERR("write");
break;
}
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;
"Options:\n"
" -l <port> port to listen to\n"
" -p <pidfile> file to write our pid to\n"
+ " -f stay in foreground\n"
, stderr);
}
.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;
case 'l':
port = atoi(optarg);
break;
+ case 'f':
+ daemonize = false;
+ break;
default:
usage();
return EXIT_FAILURE;
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));
+ sock = tcp_listen_nonblock((struct sockaddr *)&addr, sizeof(addr));
if (sock < 0)
return EXIT_FAILURE;
while (!sigint) {
- int fd = accept(sock, NULL, 0);
- if (fd < 0) {
- if (errno != EINTR && errno != EAGAIN)
- UNIXERR("accept");
- continue;
+ fd_set rfd;
+ struct timeval tv = { 1, 0 };
+ int res;
+
+ FD_SET(sock, &rfd);
+ res = select(sock + 1, &rfd, NULL, NULL, &tv);
+
+ if (res < 0) {
+ if (errno != EINTR && errno != EAGAIN) {
+ UNIXERR("select");
+ return EXIT_FAILURE;
+ }
+ }
+ if (res > 0) {
+ int fd = accept(sock, NULL, 0);
+ if (fd < 0) {
+ if (errno != EINTR && errno != EAGAIN) {
+ UNIXERR("accept");
+ return EXIT_FAILURE;
+ }
+ continue;
+ }
+ thread_launch(policy_run, fd, NULL);
}
- thread_launch(policy_run, fd, NULL);
threads_join();
}