From deecc72f6a96153d93dccd547177676bc878a3f3 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Mon, 6 Dec 2010 17:33:09 +0300 Subject: switch logs on contexts which dosn't handles ppp too so potential race conditions may be arised --- accel-pptpd/ctrl/l2tp/l2tp.c | 5 +++-- accel-pptpd/ctrl/pppoe/pppoe.c | 1 + accel-pptpd/ctrl/pptp/pptp.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'accel-pptpd/ctrl') diff --git a/accel-pptpd/ctrl/l2tp/l2tp.c b/accel-pptpd/ctrl/l2tp/l2tp.c index 2314748a..cb891b6e 100644 --- a/accel-pptpd/ctrl/l2tp/l2tp.c +++ b/accel-pptpd/ctrl/l2tp/l2tp.c @@ -1043,8 +1043,9 @@ static void l2tp_udp_close(struct triton_context_t *ctx) static struct l2tp_serv_t udp_serv = { - .hnd.read=l2tp_udp_read, - .ctx.close=l2tp_udp_close, + .hnd.read = l2tp_udp_read, + .ctx.close = l2tp_udp_close, + .ctx.before_switch = log_switch, }; /*static struct l2tp_serv_t ip_serv = diff --git a/accel-pptpd/ctrl/pppoe/pppoe.c b/accel-pptpd/ctrl/pppoe/pppoe.c index 839c7169..b5a91895 100644 --- a/accel-pptpd/ctrl/pppoe/pppoe.c +++ b/accel-pptpd/ctrl/pppoe/pppoe.c @@ -1051,6 +1051,7 @@ void pppoe_server_start(const char *ifname, void *cli) } serv->ctx.close = pppoe_serv_close; + serv->ctx.before_switch = log_switch; serv->hnd.fd = sock; serv->hnd.read = pppoe_serv_read; serv->ifname = _strdup(ifname); diff --git a/accel-pptpd/ctrl/pptp/pptp.c b/accel-pptpd/ctrl/pptp/pptp.c index 8a1cbbeb..f7ffee00 100644 --- a/accel-pptpd/ctrl/pptp/pptp.c +++ b/accel-pptpd/ctrl/pptp/pptp.c @@ -680,8 +680,9 @@ static void pptp_serv_close(struct triton_context_t *ctx) static struct pptp_serv_t serv= { - .hnd.read=pptp_connect, - .ctx.close=pptp_serv_close, + .hnd.read = pptp_connect, + .ctx.close = pptp_serv_close, + .ctx.before_switch = log_switch, }; static int show_stat_exec(const char *cmd, char * const *fields, int fields_cnt, void *client) -- cgit v1.2.3