From f6f41eb77779fd7d961a704e5071dde8b7e4f835 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Wed, 1 Dec 2004 02:52:46 +0000 Subject: [PATCH] don't send a RADIUS start record when ungardening on shutdown --- Changes | 3 +++ garden.c | 24 +++++++++++++----------- l2tpns.h | 4 ++-- l2tpns.spec | 6 +++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Changes b/Changes index c443d07..8dbf579 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +* Wed Dec 1 2004 Brendan O'Dea 2.0.11 +- Don't send a RADIUS start record when ungardening on shutdown. + * Wed Dec 1 2004 Brendan O'Dea 2.0.10 - Fix byte ordering of LCP header length (thanks Yuri). - Increase ip_conntrack_max due to dropped packets. diff --git a/garden.c b/garden.c index 5041f50..ecf3390 100644 --- a/garden.c +++ b/garden.c @@ -9,7 +9,7 @@ /* walled garden */ -char const *cvs_id = "$Id: garden.c,v 1.18 2004-11-30 21:54:23 bodea Exp $"; +char const *cvs_id = "$Id: garden.c,v 1.19 2004-12-01 02:52:46 bodea Exp $"; int plugin_api_version = PLUGIN_API_VERSION; static struct pluginfuncs *p = 0; @@ -40,6 +40,10 @@ char *down_commands[] = { NULL, }; +#define F_UNGARDEN 0 +#define F_GARDEN 1 +#define F_CLEANUP 2 + int garden_session(sessiont *s, int flag); int plugin_post_auth(struct param_post_auth *data) @@ -59,7 +63,7 @@ int plugin_new_session(struct param_new_session *data) return PLUGIN_RET_OK; // Slaves don't do walled garden processing. if (data->s->walled_garden) - garden_session(data->s, 1); + garden_session(data->s, F_GARDEN); return PLUGIN_RET_OK; } @@ -70,7 +74,7 @@ int plugin_kill_session(struct param_new_session *data) return PLUGIN_RET_OK; // Slaves don't do walled garden processing. if (data->s->walled_garden) - garden_session(data->s, 0); + garden_session(data->s, F_CLEANUP); return PLUGIN_RET_OK; } @@ -97,7 +101,7 @@ int plugin_control(struct param_control *data) if (!iam_master) return PLUGIN_RET_NOTMASTER; - flag = data->argv[0][0] != 'u'; + flag = data->argv[0][0] == 'g' ? F_GARDEN : F_UNGARDEN; if (data->argc != 2) { @@ -158,10 +162,7 @@ int plugin_become_master(void) int plugin_new_session_master(sessiont *s) { if (s->walled_garden) - { - s->walled_garden = 0; - garden_session(s, 1); - } + garden_session(s, F_GARDEN); return PLUGIN_RET_OK; } @@ -175,7 +176,7 @@ int garden_session(sessiont *s, int flag) if (!s->opened) return 0; sess = p->get_id_by_session(s); - if (flag == 1) + if (flag == F_GARDEN) { p->log(2, sess, s->tunnel, "Garden user %s (%s)\n", s->user, p->fmtaddr(htonl(s->ip), 0)); snprintf(cmd, sizeof(cmd), "iptables -t nat -A garden_users -s %s -j garden", p->fmtaddr(htonl(s->ip), 0)); @@ -209,13 +210,14 @@ int garden_session(sessiont *s, int flag) s->walled_garden = 0; - if (!s->die) { + if (flag != F_CLEANUP) + { /* OK, we're up! */ u16 r = p->radiusnew(p->get_id_by_session(s)); p->radiussend(r, RADIUSSTART); } } - s->walled_garden = flag; + return 1; } diff --git a/l2tpns.h b/l2tpns.h index 79dcc57..99c685d 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -1,5 +1,5 @@ // L2TPNS Global Stuff -// $Id: l2tpns.h,v 1.42 2004-11-30 19:37:46 bodea Exp $ +// $Id: l2tpns.h,v 1.43 2004-12-01 02:52:46 bodea Exp $ #ifndef __L2TPNS_H__ #define __L2TPNS_H__ @@ -15,7 +15,7 @@ #include #include -#define VERSION "2.0.10" +#define VERSION "2.0.11" // Limits #define MAXTUNNEL 500 // could be up to 65535 diff --git a/l2tpns.spec b/l2tpns.spec index 29907c7..22e3aff 100644 --- a/l2tpns.spec +++ b/l2tpns.spec @@ -1,6 +1,6 @@ Summary: A high-speed clustered L2TP LNS Name: l2tpns -Version: 2.0.10 +Version: 2.0.11 Release: 1 Copyright: GPL Group: System Environment/Daemons @@ -43,5 +43,5 @@ rm -rf %{buildroot} %attr(644,root,root) /usr/share/man/man[58]/* %changelog -* Wed Dec 1 2004 Brendan O'Dea 2.0.10-1 -- 2.0.10 release, see /usr/share/doc/l2tpns-2.0.10/Changes +* Wed Dec 1 2004 Brendan O'Dea 2.0.11-1 +- 2.0.11 release, see /usr/share/doc/l2tpns-2.0.11/Changes -- 2.20.1