X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/bbf522dd9d1e85ac22709e25d1e2c13cfe5d2c6b..620249a2af0b84d3d7eda1b74fb4c14266962c88:/snoopctl.c?ds=inline

diff --git a/snoopctl.c b/snoopctl.c
index fb39f5f..b935723 100644
--- a/snoopctl.c
+++ b/snoopctl.c
@@ -5,7 +5,7 @@
 
 /* snoop control */
 
-char const *cvs_id = "$Id: snoopctl.c,v 1.2 2004-11-18 05:44:36 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;
@@ -16,23 +16,6 @@ char *plugin_control_help[] = {
 	0
 };
 
-static int iam_master = 0;
-
-int plugin_init(struct pluginfuncs *funcs)
-{
-	if (!funcs)
-		return 0;
-
-	p = funcs;
-	return 1;
-}
-
-int plugin_become_master(void)
-{
-	iam_master = 1;
-	return PLUGIN_RET_OK;
-}
-
 int plugin_control(struct param_control *data)
 {
 	sessionidt session;
@@ -46,14 +29,10 @@ int plugin_control(struct param_control *data)
 	if (strcmp(data->argv[0], "snoop") && strcmp(data->argv[0], "unsnoop"))
 		return PLUGIN_RET_OK; // not for us
 
-	flag = data->argv[0][0] != 'u';
+	if (!data->iam_master)
+		return PLUGIN_RET_NOTMASTER;
 
-	if (!iam_master)
-	{
-	    	data->response = NSCTL_RES_ERR;
-		data->additional = "must be run on the cluster master";
-		return PLUGIN_RET_STOP;
-	}
+	flag = data->argv[0][0] != 'u';
 
 	if (flag)
 	{
@@ -89,8 +68,8 @@ int plugin_control(struct param_control *data)
 
 	if (flag)
 	{
-		ipt ip = inet_addr(data->argv[2]);
-		u16 port = atoi(data->argv[3]);
+		in_addr_t ip = inet_addr(data->argv[2]);
+		uint16_t port = atoi(data->argv[3]);
 
 		if (!ip || ip == INADDR_NONE)
 		{
@@ -136,3 +115,8 @@ int plugin_control(struct param_control *data)
 
 	return PLUGIN_RET_STOP;
 }
+
+int plugin_init(struct pluginfuncs *funcs)
+{
+	return ((p = funcs)) ? 1 : 0;
+}