From c8abeb9cb58b5db6111066509e6e6e33a91da535 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Tue, 8 Mar 2016 00:45:14 +0000
Subject: [PATCH] mod capwap80211 bindings added.

FossilOrigin-Name: 95f7acda203c7c0313e00e0507fa4db0ca1068ecdad43145f4814e466d83e800
---
 src/ac/Makefile              |  1 +
 src/ac/conf.c                |  3 ++-
 src/mod/cisco/mod_cisco_ac.c | 22 +++++++++++++++-------
 src/mod/modload_ac.c         |  3 ++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/ac/Makefile b/src/ac/Makefile
index d51bfa0c..56899662 100644
--- a/src/ac/Makefile
+++ b/src/ac/Makefile
@@ -17,6 +17,7 @@ CFLAGS += -Werror -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_AR
 LIBS+=-lcapwap
 LIBS+=-lcisco
 LIBS+=-lcipwap
+LIBS+=-lcapwap80211
 LIBS+=-lcw
 LIBS+=-lrt
 LIBS+=-lpthread
diff --git a/src/ac/conf.c b/src/ac/conf.c
index 5a48a3df..86fcdfb2 100644
--- a/src/ac/conf.c
+++ b/src/ac/conf.c
@@ -145,7 +145,8 @@ static int init_mods()
 	conf_mods[0]=modload_ac("cisco");
 	conf_mods[1]=modload_ac("cipwap");
 	conf_mods[2]=modload_ac("capwap");
-	conf_mods[3]=NULL;
+	conf_mods[3]=modload_ac("capwap80211");
+	conf_mods[4]=NULL;
 
 
 
diff --git a/src/mod/cisco/mod_cisco_ac.c b/src/mod/cisco/mod_cisco_ac.c
index 776a4b60..2d97f785 100644
--- a/src/mod/cisco/mod_cisco_ac.c
+++ b/src/mod/cisco/mod_cisco_ac.c
@@ -16,21 +16,29 @@ static struct cw_actiondef actions;
 
 extern int cisco_register_actions_ac(struct cw_actiondef *def);
 
-
-static int init()
+static int register_actions(struct cw_actiondef *actions)
 {
-	cw_dbg(DBG_INFO, "Initialiazing mod_cisco ...");
 	struct mod_ac *cmod = modload_ac("capwap");
-	cmod->register_actions(&actions);
 	if (!cmod) {
 		cw_log(LOG_ERR,
 		       "Can't initzialize mod_cisco, failed to load base mod mod_capwap");
 		return 1;
 	}
-
-	int rc = cisco_register_actions_ac(&actions);
+	cmod->register_actions(actions);
+	int rc = cisco_register_actions_ac(actions);
 	cw_dbg(DBG_INFO, "Initialized mod cisco with %d actions", rc);
 	return 0;
+
+
+}
+
+
+
+static int init()
+{
+	cw_dbg(DBG_INFO, "Initialiazing mod_cisco ...");
+//	struct mod_ac *cmod = modload_ac("capwap");
+	return 1;
 }
 
 
@@ -70,7 +78,7 @@ static struct mod_ac capwap_ac = {
 	.name = "cisco",
 	.init = init,
 	.detect = detect,
-	.register_actions = cisco_register_actions_ac
+	.register_actions = register_actions
 };
 
 struct mod_ac *mod_cisco_ac()
diff --git a/src/mod/modload_ac.c b/src/mod/modload_ac.c
index d196b3c7..999ab41c 100644
--- a/src/mod/modload_ac.c
+++ b/src/mod/modload_ac.c
@@ -4,8 +4,9 @@
 #include "cipwap/mod_cipwap.h"
 #include "capwap/mod_capwap.h"
 #include "cisco/mod_cisco.h"
+#include "capwap80211/mod_capwap80211.h"
 
-#define MODS_AC { mod_capwap_ac,mod_cipwap_ac, mod_cisco_ac, NULL }
+#define MODS_AC { mod_capwap_ac,mod_cipwap_ac, mod_cisco_ac, mod_capwap80211_ac, NULL }
 
 
 struct mod_ac *(*mods_ac[])() = MODS_AC;