projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Close the listeners on exit.
[apps/pfixtools.git]
/
main-postlicyd.c
diff --git
a/main-postlicyd.c
b/main-postlicyd.c
index
a1444ec
..
deb90b3
100644
(file)
--- a/
main-postlicyd.c
+++ b/
main-postlicyd.c
@@
-202,7
+202,7
@@
static int postfix_parsejob(query_t *query, char *p)
default:
syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k);
default:
syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k);
-
break
;
+
continue
;
}
}
}
}
@@
-214,18
+214,28
@@
__attribute__((format(printf,2,0)))
static void policy_answer(server_t *pcy, const char *fmt, ...)
{
va_list args;
static void policy_answer(server_t *pcy, const char *fmt, ...)
{
va_list args;
- va_start(args, fmt);
+ const query_t* query = pcy->data;
+
buffer_addstr(&pcy->obuf, "action=");
buffer_addstr(&pcy->obuf, "action=");
+ va_start(args, fmt);
buffer_addvf(&pcy->obuf, fmt, args);
va_end(args);
buffer_addstr(&pcy->obuf, "\n\n");
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);
+ buffer_consume(&pcy->ibuf,
query
->eoq - pcy->ibuf.data);
epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
}
epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
}
+static bool policy_run_filter(const query_t* query, void* filter, void* conf)
+{
+ return false;
+}
+
static void policy_process(server_t *pcy)
{
static void policy_process(server_t *pcy)
{
- policy_answer(pcy, "DUNNO");
+ const query_t* query = pcy->data;
+ if (!policy_run_filter(query, NULL, NULL)) {
+ policy_answer(pcy, "DUNNO");
+ }
}
static int policy_run(server_t *pcy, void* config)
}
static int policy_run(server_t *pcy, void* config)
@@
-233,6
+243,7
@@
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;
ssize_t search_offs = MAX(0, pcy->ibuf.len - 1);
int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
const char *eoq;
+ query_t* query = pcy->data;
if (nb < 0) {
if (errno == EAGAIN || errno == EINTR)
if (nb < 0) {
if (errno == EAGAIN || errno == EINTR)
@@
-251,7
+262,7
@@
static int policy_run(server_t *pcy, void* config)
if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0)
return -1;
if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0)
return -1;
-
((query_t*)pcy->data)
->eoq = eoq + strlen("\n\n");
+
query
->eoq = eoq + strlen("\n\n");
epoll_modify(pcy->fd, 0, pcy);
policy_process(pcy);
return 0;
epoll_modify(pcy->fd, 0, pcy);
policy_process(pcy);
return 0;