From 620249a2af0b84d3d7eda1b74fb4c14266962c88 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@optus.net>
Date: Tue, 11 Oct 2005 07:59:09 +0000
Subject: [PATCH] move plugin_radius_reset from *ctl to auto* plugins

---
 Changes        | 1 +
 autosnoop.c    | 9 ++++++++-
 autothrottle.c | 8 +++++++-
 snoopctl.c     | 9 +--------
 throttlectl.c  | 8 +-------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Changes b/Changes
index e245c30..dfeabaa 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@
 - Fix Calling-Station-Id in RADIUS accounting records (Slobodan Tomic).
 - Fix RADIUS authentication on DAE responses.
 - Don't send tunnel HELLO when there are pending control messages.
+- Move plugin_radius_reset from *ctl to auto* plugins.
 
 * Mon Sep 19 2005 Brendan O'Dea <bod@optus.net> 2.1.8
 - Move code from signal handlers into mainloop, avoiding a race
diff --git a/autosnoop.c b/autosnoop.c
index 64ec278..0a971de 100644
--- a/autosnoop.c
+++ b/autosnoop.c
@@ -4,7 +4,7 @@
 
 /* set up intercept based on RADIUS reply */
 
-char const *cvs_id = "$Id: autosnoop.c,v 1.10 2004-11-30 05:49:47 bodea Exp $";
+char const *cvs_id = "$Id: autosnoop.c,v 1.11 2005-10-11 07:59:09 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 struct pluginfuncs *p;
@@ -36,6 +36,13 @@ int plugin_radius_response(struct param_radius_response *data)
 	return PLUGIN_RET_OK;
 }
 
+int plugin_radius_reset(struct param_radius_reset *data)
+{
+	data->s->snoop_ip = 0;
+	data->s->snoop_port = 0;
+	return PLUGIN_RET_OK;
+}
+
 int plugin_init(struct pluginfuncs *funcs)
 {
 	return ((p = funcs)) ? 1 : 0;
diff --git a/autothrottle.c b/autothrottle.c
index 074fe53..051b9a8 100644
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -13,7 +13,7 @@
  * throttle=no
  */
 
-char const *cvs_id = "$Id: autothrottle.c,v 1.14 2005-05-13 05:28:16 bodea Exp $";
+char const *cvs_id = "$Id: autothrottle.c,v 1.15 2005-10-11 07:59:09 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 struct pluginfuncs *p;
@@ -110,6 +110,12 @@ int plugin_radius_response(struct param_radius_response *data)
 	return PLUGIN_RET_OK;
 }
 
+int plugin_radius_reset(struct param_radius_reset *data)
+{
+	p->throttle(p->get_id_by_session(data->s), 0, 0);
+	return PLUGIN_RET_OK;
+}
+
 int plugin_init(struct pluginfuncs *funcs)
 {
 	return ((p = funcs)) ? 1 : 0;
diff --git a/snoopctl.c b/snoopctl.c
index f6e8535..b935723 100644
--- a/snoopctl.c
+++ b/snoopctl.c
@@ -5,7 +5,7 @@
 
 /* snoop control */
 
-char const *cvs_id = "$Id: snoopctl.c,v 1.5 2005-06-28 14:48:28 bodea Exp $";
+char const *cvs_id = "$Id: snoopctl.c,v 1.6 2005-10-11 07:59:09 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
@@ -116,13 +116,6 @@ int plugin_control(struct param_control *data)
 	return PLUGIN_RET_STOP;
 }
 
-int plugin_radius_reset(struct param_radius_reset *data)
-{
-	data->s->snoop_ip = 0;
-	data->s->snoop_port = 0;
-	return PLUGIN_RET_OK;
-}
-
 int plugin_init(struct pluginfuncs *funcs)
 {
 	return ((p = funcs)) ? 1 : 0;
diff --git a/throttlectl.c b/throttlectl.c
index 7aca35e..bcdfd70 100644
--- a/throttlectl.c
+++ b/throttlectl.c
@@ -5,7 +5,7 @@
 
 /* throttle control */
 
-char const *cvs_id = "$Id: throttlectl.c,v 1.7 2005-06-28 14:48:28 bodea Exp $";
+char const *cvs_id = "$Id: throttlectl.c,v 1.8 2005-10-11 07:59:09 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
@@ -129,12 +129,6 @@ int plugin_control(struct param_control *data)
 	return PLUGIN_RET_STOP;
 }
 
-int plugin_radius_reset(struct param_radius_reset *data)
-{
-	p->throttle(p->get_id_by_session(data->s), 0, 0);
-	return PLUGIN_RET_OK;
-}
-
 int plugin_init(struct pluginfuncs *funcs)
 {
 	return ((p = funcs)) ? 1 : 0;
-- 
2.20.1