Separating cipwap/capwap/...

FossilOrigin-Name: b1ce08cd3e7e9389bef7f6f2b038cd5fc95c31150341b17b78b8a116594cb4cb

src/mod/cisco/Makefile

@@ -15,6 +15,7 @@ OBJS=\
 	cisco_in_radio_administrative_state.o \
 	cisco_in_spam_vendor_specific.o \
 	cisco_in_telnet_ssh.o \
+	cisco_out_radio_administrative_states.o
 
 
 	

src/mod/cisco/cisco.h

@@ -31,4 +31,8 @@ int cisco_in_telnet_ssh(struct conn *conn, struct cw_action_in *a, uint8_t * dat
 
 int cisco_out_telnet_ssh(struct conn *conn,struct cw_action_out * a,uint8_t *dst);
 
+int cisco_out_radio_administrative_states(struct conn *conn, struct cw_action_out *a, uint8_t * dst);
+
+
+
 #endif

src/mod/cisco/cisco_actions_ac.c

@@ -300,6 +300,17 @@ static cw_action_out_t actions_out[]={
 	}
 	,
 
+	/* Radio Administrative State -  OUT */
+	{
+		.msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST,
+		.elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE,
+		.item_id = CW_RADIOITEM_ADMIN_STATE,
+	 	.out = cisco_out_radio_administrative_states, 
+		.get = cw_out_get_outgoing,
+		.mand = 0
+	}
+	,
+
 
 
 
@@ -320,7 +331,7 @@ static cw_action_in_t actions80211_in[] = {
 		.capwap_state = CW_STATE_DISCOVERY, 
 		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
 		.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
-		.item_id = CW_ITEM80211_WTP_RADIO_INFORMATION,
+		.item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION,
 	 	.start = cw_in_radio_generic, 
 		.mand = 0, 
 		.min_len = 5, 
@@ -333,7 +344,7 @@ static cw_action_in_t actions80211_in[] = {
 		.vendor_id = CW_VENDOR_ID_CISCO,
 		.msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, 
 		.elem_id = CW_CISCO_SUPPORTED_RATES,
-		.item_id = CW_ITEM80211_SUPPORTED_RATES,
+		.item_id = CW_RADIOITEM80211_SUPPORTED_RATES,
 	 	.start = cw_in_radio_generic, 
 		.mand = 0, 
 		.min_len = 5, 
@@ -345,6 +356,7 @@ static cw_action_in_t actions80211_in[] = {
 };
 
 
+
 #include "cw/item.h"
 
 static struct cw_itemdef _capwap_itemdefs[] = {

src/mod/cisco/cisco_actions_wtp.c

@@ -125,7 +125,7 @@ static cw_action_in_t actions_in[] = {
 		.capwap_state = CW_STATE_RUN, 
 		.msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST,
 		.elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE,
-		.item_id = CW_ITEM_RADIO_ADMINISTRATIVE_STATE,
+		.item_id = CW_RADIOITEM_ADMIN_STATE,
 		.start = cisco_in_radio_administrative_state_wtp,
 		.mand = 1
 	}
@@ -238,7 +238,7 @@ static cw_action_out_t actions_out[]={
 		.vendor_id = CW_VENDOR_ID_CISCO,
 		.msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST,
 		.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
-		.item_id = CW_ITEM80211_WTP_RADIO_INFORMATION,
+		.item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION,
 		.out = cisco_out_80211_wtp_radio_cfg,
 		.get = cw_out_get_config,
 		.mand = 1

src/mod/cisco/cisco_in_telnet_ssh.c

@@ -1,7 +1,7 @@
 
 
 #include "cisco.h"
-#include "cw/capwap_items.h"
+#include "cw/cipwap_items.h"
 #include "cw/cw.h"
 #include "cw/dbg.h"
 
@@ -14,10 +14,10 @@ int cisco_in_telnet_ssh(struct conn *conn, struct cw_action_in *a, uint8_t * dat
 
 	switch (type){
 		case 0:
-			mbag_set_byte(conn->incomming,CW_ITEM_TELNET_ENABLE,enable);
+			mbag_set_byte(conn->incomming,CIPWAP_ITEM_TELNET_ENABLE,enable);
 			break;
 		case 1:
-			mbag_set_byte(conn->incomming,CW_ITEM_SSH_ENABLE,enable);
+			mbag_set_byte(conn->incomming,CIPWAP_ITEM_SSH_ENABLE,enable);
 			break;
 		default:
 			cw_dbg(DBG_ELEM_ERR,"Unknown Telnet/SSH Type: %d",type);

src/mod/cisco/cisco_out_radio_administrative_states.c

@@ -0,0 +1,24 @@
+#include "cw/cw.h"
+#include "cw/dbg.h"
+#include "cw/capwap_items.h"
+
+
+int cisco_out_radio_administrative_states(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
+{
+	int l=0;
+	MAVLITER_DEFINE(it,conn->radios_upd);
+	mavliter_foreach(&it){
+		struct mbag_item *i = mavliter_get(&it);
+		if ( i->type != MBAG_MBAG ) {
+			continue;
+		}
+
+		int state = mbag_get_byte(i->data,CW_RADIOITEM_ADMIN_STATE,CW_RADIO_ADMIN_STATE_DISABLED);
+		l+=cw_put_elem_radio_administrative_state(dst+l,i->iid,i->data);
+//		l+=cw_put_elem_radio_operational_state(dst+l,i->iid,state<<8,0);
+
+	}
+	return l;
+}
+
+

src/mod/cisco/cisco_out_telnet_ssh.c

@@ -1,6 +1,8 @@
 
 #include "cisco.h"
 #include "cw/capwap_items.h"
+#include "cw/cipwap_items.h"
+
 #include "cw/lwapp.h"
 #include "cw/cw.h"
 #include "cw/dbg.h"
@@ -56,8 +58,8 @@ int cw_cisco_put_telnet_ssh(struct conn *conn,uint8_t type,const char * item_id,
 int cisco_out_telnet_ssh(struct conn *conn,struct cw_action_out * a,uint8_t *dst) 
 {
 	int l;
-	l=cw_cisco_put_telnet_ssh(conn,0,CW_ITEM_TELNET_ENABLE,dst);
-	l+=cw_cisco_put_telnet_ssh(conn,1,CW_ITEM_SSH_ENABLE,dst+l);
+	l=cw_cisco_put_telnet_ssh(conn,0,CIPWAP_ITEM_TELNET_ENABLE,dst);
+	l+=cw_cisco_put_telnet_ssh(conn,1,CIPWAP_ITEM_SSH_ENABLE,dst+l);
 	return l;
 	
 }

src/mod/cisco/mod_cisco_ac.c

@@ -21,10 +21,10 @@ static int register_actions(struct cw_actiondef *actions, int mode)
 		case MOD_MODE_CAPWAP:
 		{
 
-			struct mod_ac *cmod = modload_ac("capwap");
+			struct mod_ac *cmod = modload_ac("cipwap");
 			if (!cmod) {
 				cw_log(LOG_ERR,
-				       "Can't initialize mod_cisco, failed to load base mod mod_capwap");
+				       "Can't initialize mod_cisco, failed to load base mod mod_cipwap");
 				return 1;
 			}
 			cmod->register_actions(actions, MOD_MODE_CAPWAP);