From 5f8db1b8ea496a60ff8850c5a4a3b7d0f5b29244 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Thu, 15 Mar 2018 19:20:19 +0000
Subject: [PATCH] use defs from keys.h

FossilOrigin-Name: f306fbf02aa901f2f6429393bb6bcafaca8008a64c1ea414f00e8e838fe93bdb
---
 actube.workspace                   |  4 ++--
 src/cw/cw_read_wtp_descriptor_7.c  |  3 ++-
 src/cw/keys.h                      |  5 +++++
 src/mod/capwap/capwap_actions_ac.c | 11 ++++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/actube.workspace b/actube.workspace
index c63c2d68..e0162c79 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -4,8 +4,8 @@
   <Project Name="wtp" Path="wtp.project" Active="No"/>
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
   <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
-  <Project Name="mod_cisco" Path="mod_cisco.project" Active="Yes"/>
-  <Project Name="libcw" Path="libcw.project" Active="No"/>
+  <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
+  <Project Name="libcw" Path="libcw.project" Active="Yes"/>
   <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>
diff --git a/src/cw/cw_read_wtp_descriptor_7.c b/src/cw/cw_read_wtp_descriptor_7.c
index b2192eb7..e2e130f1 100644
--- a/src/cw/cw_read_wtp_descriptor_7.c
+++ b/src/cw/cw_read_wtp_descriptor_7.c
@@ -25,7 +25,8 @@ int cw_read_wtp_descriptor_7(mavl_t cfg, struct conn *conn,
 			     struct cw_DescriptorSubelemDef *allowed)
 {
 
-	int ncrypt, pos;
+/*	int ncrypt; //currentliy unused */
+	int pos;
 	char key[64];
 
 	sprintf(key,"%s/%s",eh->key, CW_SKEY_MAX_RADIOS);
diff --git a/src/cw/keys.h b/src/cw/keys.h
index 50078236..4ef50c93 100644
--- a/src/cw/keys.h
+++ b/src/cw/keys.h
@@ -17,6 +17,11 @@
 
 
 #define CW_KEY_WTP_NAME		"wtp-name"
+#define CW_KEY_DISCOVERY_TYPE	"discovery-type"
+#define CW_KEY_WTP_MAC_TYPE	"wtp-mac-type"
+#define CW_KEY_WTP_BOARD_DATA	"wtp-board-data"
+#define CW_KEY_WTP_FRAME_TUNNEL_MODE	"wtp-frame-tunnel-mode"
+
 
 #endif
 
diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
index c9029a51..f3b79329 100644
--- a/src/mod/capwap/capwap_actions_ac.c
+++ b/src/mod/capwap/capwap_actions_ac.c
@@ -22,6 +22,7 @@
 #include "cw/log.h"
 
 #include "cw/msgset.h"
+#include "cw/keys.h"
 
 #include "mod_capwap.h"
 
@@ -33,7 +34,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,				/* Vendor / Proto */
 		1,1,				/* min/max length */
 		CW_TYPE_BYTE,			/* type */
-		"discovery_type",		/* Key */
+		CW_KEY_DISCOVERY_TYPE,		/* Key */
 		cw_in_generic,			/* get */
 		cw_out_generic			/* put */
 	}
@@ -44,7 +45,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,				/* Vendor / Proto */
 		1,1,				/* min/max length */
 		CW_TYPE_BYTE,			/* type */
-		"wtp_mac_type",			/* Key */
+		CW_KEY_WTP_MAC_TYPE,		/* Key */
 		cw_in_generic,			/* get */
 		cw_out_generic			/* put */
 	}
@@ -55,7 +56,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,				/* Vendor / Proto */
 		4,128,				/* min/max length */
 		NULL,				/* type */
-		"wtp_board_data",		/* Key */
+		CW_KEY_WTP_BOARD_DATA,		/* Key */
 		capwap_in_wtp_board_data,	/* get */
 		NULL				/* put */
 	}
@@ -66,7 +67,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,				/* Vendor / Proto */
 		4,128,				/* min/max length */
 		NULL,				/* type */
-		"wtp_descriptor",		/* Key */
+		CW_KEY_WTP_DESCRIPTOR,		/* Key */
 		capwap_in_wtp_descriptor,	/* get */
 		NULL				/* put */
 	}
@@ -77,7 +78,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,					/* Vendor / Proto */
 		1,1,					/* min/max length */
 		CW_TYPE_BYTE,				/* type */
-		"wtp_frame_tunnel_mode",		/* Key */
+		CW_KEY_WTP_FRAME_TUNNEL_MODE,		/* Key */
 		cw_in_generic,				/* get */
 		cw_out_generic				/* put */
 	}