Separating cipwap/capwap/...

FossilOrigin-Name: b1ce08cd3e7e9389bef7f6f2b038cd5fc95c31150341b17b78b8a116594cb4cb

src/mod/cipwap/Makefile

@@ -1,6 +1,8 @@
 
 OBJS=\
-	mod_cipwap_ac.o
+	mod_cipwap_ac.o \
+	cipwap_actions_ac.o
+
 
 NAME=libcipwap.a
 

src/mod/cipwap/cipwap_actions_ac.c

@@ -0,0 +1,62 @@
+/*
+    This file is part of libcapwap.
+
+    libcapwap is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    libcapwap is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "cw/cw.h"
+#include "cw/action.h"
+#include "cw/cipwap_items.h"
+#include "cw/strheap.h"
+#include "cw/radio.h"
+
+
+#include "mod_cipwap.h"
+
+static cw_action_in_t actions_in[] = {
+	
+	/* End of list */
+	{0, 0}
+};
+
+static cw_action_out_t actions_out[]={
+
+	/* End of list */
+	{0,0}
+};
+
+
+
+
+int cipwap_register_actions_ac(struct cw_actiondef *def)
+{
+	int rc;
+
+	rc = cw_actionlist_in_register_actions(def->in, actions_in);
+	rc += cw_actionlist_out_register_actions(def->out, actions_out);
+/*
+	rc += cw_strheap_register_strings(def->strmsg, capwap_strings_msg);
+	rc += cw_strheap_register_strings(def->strelem, capwap_strings_elem);
+*/
+	rc += cw_itemdefheap_register(def->items, cipwap_itemdefs);
+
+/*	rc += cw_itemdefheap_register(def->radioitems, capwap_radiodefs);
+	intavltree_add(def->wbids, 0);
+*/
+
+
+	return rc;
+}

src/mod/cipwap/mod_cipwap.h

@@ -2,5 +2,6 @@
 #define __MOD_CIPWAP_H
 
 struct mod_ac * mod_cipwap_ac();
+extern int cipwap_register_actions_ac(struct cw_actiondef *def);
 
 #endif

src/mod/cipwap/mod_cipwap_ac.c

@@ -1,4 +1,7 @@
 
+
+#include "../modload.h"
+
 #include "cw/mod.h"
 #include "cw/log.h"
 #include "cw/dbg.h"
@@ -15,19 +18,62 @@ int cipwap_init()
 
 static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_len, struct sockaddr *from, int mode)
 {
-	if (mode != MOD_MODE_CAPWAP)
-		return 0;
+	if (mode == MOD_MODE_CAPWAP)
+		return 1;
 
-	cw_dbg(DBG_MOD,"CIPWAP detected: no");
 	return 0;
 }
 
+static int register_actions(struct cw_actiondef *actions, int mode)
+{
+	switch (mode) {
+		case MOD_MODE_CAPWAP:
+		{
+
+			struct mod_ac *cmod = modload_ac("capwap");
+			if (!cmod) {
+				cw_log(LOG_ERR,
+				       "Can't initialize mod_cisco, failed to load base mod mod_capwap");
+				return 1;
+			}
+			cmod->register_actions(actions, MOD_MODE_CAPWAP);
+			int rc = cipwap_register_actions_ac(actions);
+			cw_dbg(DBG_INFO, "Initialized mod_cisco with %d actions", rc);
+			return rc;
+		}
+
+/*		
+		case MOD_MODE_BINDINGS:
+		{
+			struct mod_ac *cmod = modload_ac("capwap80211");
+			if (!cmod) {
+				cw_log(LOG_ERR,
+				       "Can't initialize mod_cisco, failed to load base mod mod_capwap80211");
+				return 1;
+			}
+			cmod->register_actions(actions, MOD_MODE_BINDINGS);
+			int rc = cipwap_register_actions80211_ac(actions);
+			cw_dbg(DBG_INFO, "Initialized mod_cisco 80211 with %d actions", rc);
+			return 0;
+		}
+*/		
+		
+
+	}
+
+
+	return 0;
+
+
+}
+
 
 
 static struct mod_ac cipwap_ac = {
 	.name ="cipwap",
 	.init = cipwap_init,
-	.detect = detect
+	.detect = detect,
+	.register_actions=register_actions
 
 };