projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'pan/master' into not-linux
[apps/pfixtools.git]
/
postlicyd
/
main-postlicyd.c
diff --git
a/postlicyd/main-postlicyd.c
b/postlicyd/main-postlicyd.c
index
bf68941
..
9baf34a
100644
(file)
--- a/
postlicyd/main-postlicyd.c
+++ b/
postlicyd/main-postlicyd.c
@@
-38,7
+38,6
@@
#include "buffer.h"
#include "common.h"
#include "buffer.h"
#include "common.h"
-#include "epoll.h"
#include "policy_tokens.h"
#include "server.h"
#include "config.h"
#include "policy_tokens.h"
#include "server.h"
#include "config.h"
@@
-52,8
+51,9
@@
DECLARE_MAIN
DECLARE_MAIN
-static config_t *config = NULL;
-
+static config_t *config = NULL;
+static bool refresh = false;
+static PA(server_t) busy = ARRAY_INIT;
static void *query_starter(server_t* server)
{
static void *query_starter(server_t* server)
{
@@
-73,12
+73,17
@@
static void query_stopper(void *data)
static bool config_refresh(void *mconfig)
{
static bool config_refresh(void *mconfig)
{
+ refresh = true;
if (filter_running > 0) {
if (filter_running > 0) {
- sighup = true;
- sleep(1);
return true;
}
return true;
}
- return config_reload(mconfig);
+ bool ret = config_reload(mconfig);
+ foreach (server_t **server, busy) {
+ server_ro(*server);
+ }}
+ array_len(busy) = 0;
+ refresh = false;
+ return ret;
}
static void policy_answer(server_t *pcy, const char *message)
}
static void policy_answer(server_t *pcy, const char *message)
@@
-105,7
+110,7
@@
static void policy_answer(server_t *pcy, const char *message)
}
buffer_addstr(&pcy->obuf, "\n\n");
buffer_consume(&pcy->ibuf, query->eoq - pcy->ibuf.data);
}
buffer_addstr(&pcy->obuf, "\n\n");
buffer_consume(&pcy->ibuf, query->eoq - pcy->ibuf.data);
-
epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT,
pcy);
+
server_rw(
pcy);
}
static const filter_t *next_filter(server_t *pcy, const filter_t *filter,
}
static const filter_t *next_filter(server_t *pcy, const filter_t *filter,
@@
-186,7
+191,8
@@
static bool policy_process(server_t *pcy, const config_t *mconfig)
static int policy_run(server_t *pcy, void* vconfig)
{
static int policy_run(server_t *pcy, void* vconfig)
{
- if (sighup) {
+ if (refresh) {
+ array_add(busy, pcy);
return 0;
}
return 0;
}
@@
-220,7
+226,7
@@
static int policy_run(server_t *pcy, void* vconfig)
filter_context_clean(&context->context);
m_strcat(context->context.instance, 64, query->instance);
}
filter_context_clean(&context->context);
m_strcat(context->context.instance, 64, query->instance);
}
-
epoll_modify(pcy->fd, 0,
pcy);
+
server_none(
pcy);
return policy_process(pcy, mconfig) ? 0 : -1;
}
return policy_process(pcy, mconfig) ? 0 : -1;
}
@@
-240,6
+246,9
@@
static void policy_async_handler(filter_context_t *context,
if (!ok) {
server_release(server);
}
if (!ok) {
server_release(server);
}
+ if (refresh && filter_running == 0) {
+ config_refresh(config);
+ }
}
static int postlicyd_init(void)
}
static int postlicyd_init(void)
@@
-247,7
+256,13
@@
static int postlicyd_init(void)
filter_async_handler_register(policy_async_handler);
return 0;
}
filter_async_handler_register(policy_async_handler);
return 0;
}
+
+static void postlicyd_shutdown(void)
+{
+ array_deep_wipe(busy, server_delete);
+}
module_init(postlicyd_init);
module_init(postlicyd_init);
+module_exit(postlicyd_shutdown);
int start_listener(int port)
{
int start_listener(int port)
{