From 84d52857a7799c9450b0ce1c1d4a97b97f7ec5d8 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Tue, 28 Apr 2015 13:29:27 +0000
Subject: [PATCH] Added some Cisco Specific messages.

FossilOrigin-Name: bb1e9f49a5278c62e9ffd20954a027c2f28bc26ebb37715b16df001ed91183b0
---
 src/capwap/capwap_cisco.h       |  3 ++-
 src/capwap/cw_cisco_id_to_str.c |  4 ++++
 src/capwap/lw_cisco_id_to_str.c |  2 ++
 src/capwap/lwapp.h              |  1 +
 src/capwap/lwapp_cisco.h        |  2 ++
 src/wtp/cfg.json                | 10 ----------
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/capwap/capwap_cisco.h b/src/capwap/capwap_cisco.h
index 6148bdfe..c0f8ffc0 100644
--- a/src/capwap/capwap_cisco.h
+++ b/src/capwap/capwap_cisco.h
@@ -58,6 +58,7 @@
 #define CW_CISCO_CERTIFICATE			LW_ELEM_CERTIFICATE			/* 44 */
 #define CW_CISCO_WTP_BOARD_DATA			LW_ELEM_WTP_BOARD_DATA			/* 50 */
 #define CW_CISCO_AP_MODE_AND_TYPE		LW_ELEM_80211_WTP_MODE_AND_TYPE		/* 54 */
+#define CW_CISCO_AP_QOS				LW_ELEM_QOS				/* 57 */
 
 #define CW_CISCO_AC_IPV4_LIST			LW_ELEM_AC_IPV4_LIST			/* 59 */
 
@@ -92,7 +93,7 @@
 #define CW_CISCO_BOARD_DATA_OPTIONS		207
 #define CW_CISCO_MWAR_TYPE			208
 #define CW_CISCO_80211_ASSOC_LIMIT		213
-#define CW_CISCO_TVL_PAYLOAD			215
+#define CW_CISCO_TLV_PAYLOAD			215
 
 #define CW_CISCO_AP_RETRANSMIT_PARAM		240
 #define CW_CISCO_AP_VENUE_SETTINGS		249
diff --git a/src/capwap/cw_cisco_id_to_str.c b/src/capwap/cw_cisco_id_to_str.c
index 41c12a6c..0c940856 100644
--- a/src/capwap/cw_cisco_id_to_str.c
+++ b/src/capwap/cw_cisco_id_to_str.c
@@ -122,6 +122,10 @@ const char * cw_cisco_id_to_str(int elem_id)
 			return "Signature Toggle";
 		case CW_CISCO_80211_ASSOC_LIMIT:
 			return "Assoc Limit";
+		case CW_CISCO_AP_QOS:
+			return "AP Quality of Services";
+		case CW_CISCO_TLV_PAYLOAD:
+			return "TLV Payload";
 	
 		default:
 			return "Unknown";
diff --git a/src/capwap/lw_cisco_id_to_str.c b/src/capwap/lw_cisco_id_to_str.c
index d619d2e3..4e819984 100644
--- a/src/capwap/lw_cisco_id_to_str.c
+++ b/src/capwap/lw_cisco_id_to_str.c
@@ -24,6 +24,8 @@ const char * lw_cisco_id_to_str(int elem_id)
 		case LW_CISCO_AP_JOIN_IP_PREF_MODE:
 			return "AP Join IP Pref Mode";
 			
+		case LW_CISCO_MCAST_MGID_INFO:
+			return "MCAST MGID Info";
 
 		default: 
 			return "Unknown";
diff --git a/src/capwap/lwapp.h b/src/capwap/lwapp.h
index bcf8fd09..2aee75a6 100644
--- a/src/capwap/lwapp.h
+++ b/src/capwap/lwapp.h
@@ -149,6 +149,7 @@
 #define LW_ELEM_CERTIFICATE				44
 #define LW_ELEM_WTP_BOARD_DATA				50
 #define LW_ELEM_WTP_MODE_AND_TYPE			54
+#define LW_ELEM_QOS					57
 
 #define LW_ELEM_AC_IPV4_LIST				59
 #define LW_ELEM_AP_IP_ADDR				82
diff --git a/src/capwap/lwapp_cisco.h b/src/capwap/lwapp_cisco.h
index 7153d87e..dd6a94db 100644
--- a/src/capwap/lwapp_cisco.h
+++ b/src/capwap/lwapp_cisco.h
@@ -33,6 +33,8 @@ enum lwap_cisco_elems {
 
 LW_CISCO_AP_USERNAME_PASSWORD=18,
 LW_CISCO_AC_IP_ADDR_WITH_INDEX=32,
+LW_CISCO_MCAST_MGID_INFO=39,
+
 LW_CISCO_AP_LOGHOST_CONFIG=36,
 
 LW_CISCO_AP_SUBMODE=67,
diff --git a/src/wtp/cfg.json b/src/wtp/cfg.json
index f9431e76..64a39c2c 100644
--- a/src/wtp/cfg.json
+++ b/src/wtp/cfg.json
@@ -30,16 +30,6 @@
 			"admin_state":"1",
 			"radio_type":"1",
 			"bssid":".x123456789abc"
-		},
-		"1":{
-			"admin_state":"1",
-			"radio_type":"2",
-			"bssid":".xaabbccddeeff"
-		},
-		"2":{
-			"admin_state":"1",
-			"radio_type":"2",
-			"bssid":".xaabbccddeeff"
 		}
 	},
 	"bssid":""