return query_new();
}
+static bool config_refresh(void *config)
+{
+ return config_reload(config);
+}
+
static int postfix_parsejob(query_t *query, char *p)
{
#define PARSE_CHECK(expr, error, ...) \
} while (0)
p_clear(query, 1);
+ query->state = SMTP_UNKNOWN;
while (*p != '\n') {
char *k, *v;
int klen, vlen, vtk;
vtk = policy_tokenize(v, vlen);
switch (policy_tokenize(k, klen)) {
-#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0'; break;
+#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0'; syslog(LOG_DEBUG, "%s = %s", ptokens[PTK_##up], query->low); break;
CASE(HELO_NAME, helo_name);
CASE(QUEUE_ID, queue_id);
CASE(SENDER, sender);
epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
}
-static void policy_process(server_t *pcy, config_t *config)
+static bool policy_process(server_t *pcy, const config_t *config)
{
const query_t* query = pcy->data;
- filter_t *filter = array_ptr(config->filters, config->entry_point);
+ const filter_t *filter;
+ if (config->entry_points[query->state] == -1) {
+ syslog(LOG_WARNING, "no filter defined for current protocol_state (%d)", query->state);
+ return false;
+ }
+ filter = array_ptr(config->filters, config->entry_points[query->state]);
while (true) {
- filter_hook_t *hook = filter_run(filter, query);
+ const filter_hook_t *hook = filter_run(filter, query);
if (hook == NULL) {
- policy_answer(pcy, "DUNNO");
- return;
+ syslog(LOG_WARNING, "request aborted");
+ return false;
} else if (hook->postfix) {
policy_answer(pcy, "%s", hook->value);
- return;
+ return true;
} else {
filter = array_ptr(config->filters, hook->filter_id);
}
static int policy_run(server_t *pcy, void* vconfig)
{
- ssize_t search_offs = MAX(0, pcy->ibuf.len - 1);
+ ssize_t search_offs = MAX(0, (ssize_t)(pcy->ibuf.len - 1));
int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
const char *eoq;
query_t *query = pcy->data;
- config_t *config = vconfig;
+ const config_t *config = vconfig;
if (nb < 0) {
if (errno == EAGAIN || errno == EINTR)
return -1;
query->eoq = eoq + strlen("\n\n");
epoll_modify(pcy->fd, 0, pcy);
- policy_process(pcy, config);
- return 0;
+ return policy_process(pcy, config) ? 0 : -1;
}
int start_listener(int port)
const char *pidfile = NULL;
bool daemonize = true;
int port = DEFAULT_PORT;
+ bool port_from_cli = false;
for (int c = 0; (c = getopt(argc, argv, "hf" "l:p:")) >= 0; ) {
switch (c) {
break;
case 'l':
port = atoi(optarg);
+ port_from_cli = true;
break;
case 'f':
daemonize = false;
if (config == NULL) {
return EXIT_FAILURE;
}
+ if (port_from_cli || config->port == 0) {
+ config->port = port;
+ }
if (common_setup(pidfile, false, RUNAS_USER, RUNAS_GROUP,
daemonize) != EXIT_SUCCESS
- || start_listener(port) < 0) {
+ || start_listener(config->port) < 0) {
+ config_delete(&config);
return EXIT_FAILURE;
}
- return server_loop(query_starter, (delete_client_t)query_delete,
- policy_run, NULL);
+ {
+ int res = server_loop(query_starter, (delete_client_t)query_delete,
+ policy_run, config_refresh, config);
+ config_delete(&config);
+ return res;
+ }
}