Added more Cisco vendor specific stuff.

FossilOrigin-Name: e327b128ace56c85b1b2b12875b6c57a29cafc3fb4db86a554f6b758262bc26e

doc/capwap_cisco.txt

@@ -210,8 +210,20 @@ AP = RAD = WTP
       bytes.
 
 
-108. Cisco Mesh Stats
+//108. Cisco Mesh Stats???
 
+108. Cisco AP Uptime
+   
+   Sent by the WTP this message element gibes information about
+   the uptime of the WTP.
+
+   0                   1                   2                   3
+   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   |       Current Uptime          |         Last Uptime           |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  
+   
 
 
 125. SPAM AP LED State 
@@ -289,6 +301,20 @@ AP = RAD = WTP
 
 170. Cisco AP IP Name Server
 
+183. Cisco Backup OS Version
+   Version of backup software image.
+
+    0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   | Version ... (6 Bytes)      
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
+     ... Version                   |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+  
+
 
 207. Cisco Board Data Options
 
@@ -408,7 +434,7 @@ Vendor spec CAPWAP | Vedor spec LWAPP  | Vendor specific LWAPP data
 
 
 
-20. Cisco AP Username Password (LWAPP 104)
+18. Cisco AP Username Password (LWAPP 104)
 
     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -437,7 +463,15 @@ Vendor spec CAPWAP | Vedor spec LWAPP  | Vendor specific LWAPP data
 	0xff = Radio Board Info (?)
 	 
 
+34. Cisco AP Ethernet Port Subtype (LWAPP)
+    0                   1                   2
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
+   |  Duplex       |   Speed                |
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
 
+Type: 34
+Length: 3
 
 
 36. Cisco AP Lohohost and Last Joined Controller (LWAPP 104)
@@ -468,12 +502,21 @@ Vendor spec CAPWAP | Vedor spec LWAPP  | Vendor specific LWAPP data
     0                   1             
     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 
    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |               |               |  
+   |      Type     |      Set      |  
    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
    Type: 44
    Length: 2
 
+   Type: 
+        0=Telnet?
+        1=SSH
+   Set:
+        0=Disable
+	1=Enable
+
+
+
 
 67. AP Submode (LWAPP)
     0
@@ -501,6 +544,25 @@ Type: 73
 Length: >=4
 
 
+74. Cisco DTLS Data Config (LWAPP)
+    0                   1                   
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+   | DTLS Data cap |DTLS Data en.  | 
+   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+Type: 74
+Length: 2 
+   
+   DTLS Data cab:
+	0: not capable
+	1: capabale
+
+   DTLS Data en
+	0: DTLS Data disabled
+	1: DTLS Data enabled
+
+
 133. Cisco SSC Hash Validation
     0
     0 1 2 3 4 5 6 7

src/capwap/capwap.h

@@ -533,7 +533,7 @@ extern int cw_readelem_vendor_specific_payload(void *data, int msgtype, int elem
 #define CW_RESULT_JOIN_FAILURE_SESSION_ALREADY_IN_USE		7
 #define CW_RESULT_JOIN_FAILURE_WTP_HARDWARE_NOT_SUPPORTED	8
 #define CW_RESULT_JOIN_FAILURE_BINDING_NOT_SUPPORTED		9
-#define CW_RESULT_RESET_FAILURE_UNABLE_TO_RESET			10
+#define CW_RESULT_RESET_UNABLE_TO_RESET				10
 
 #define CW_RESULT_RESET_FAILURE_FIRMWARE_WRITE_ERROR		11
 

src/capwap/capwap_cisco.h

@@ -72,6 +72,8 @@
 
 #define CW_CISCO_SPAM_VENDOR_SPECIFIC		104
 
+#define CW_CISCO_AP_UPTIME			108
+
 #define CW_CISCO_AP_GROUP_NAME			123
 #define CW_CISCO_SPAM_AP_LED_STATE		125
 #define CW_CISCO_AP_MODEL			127
@@ -89,11 +91,12 @@
 #define CW_CISCO_AP_DOMAIN			169
 #define CW_CISCO_AP_DNS				170
 
-
+#define CW_CISCO_AP_BACKUP_SOFTWARE_VERSION	183
 #define CW_CISCO_BOARD_DATA_OPTIONS		207
 #define CW_CISCO_MWAR_TYPE			208
 #define CW_CISCO_80211_ASSOC_LIMIT		213
 #define CW_CISCO_TLV_PAYLOAD			215
+#define CW_CISCO_AP_LOG_FACILITY		224
 
 #define CW_CISCO_AP_RETRANSMIT_PARAM		240
 #define CW_CISCO_AP_VENUE_SETTINGS		249

src/capwap/capwap_strings_result.c

@@ -6,6 +6,7 @@ struct cw_str capwap_strings_result[] = {
 	{CW_RESULT_SUCCESS,"Success"},							/* 0 */
 	{CW_RESULT_MISSING_AC_LIST,"AC List Message Element MUST be Present"},		/* 1 */
 	{CW_RESULT_SUCCESS_NAT,"Success - NAT Detected"},				/* 2 */
+	{CW_RESULT_RESET_UNABLE_TO_RESET,"Reset Failure - Unable to Reset"},		/* 10 */
 	{CW_RESULT_IMAGE_DATA_INVALID_CHECKSUM,"Image Data Error (Invalid Checksum)"},	/* 14 */
 	{CW_RESULT_IMAGE_DATA_ERROR,"Image Data Error (Unspecified)"},			/* 16 */
 	{CW_RESULT_MISSING_MAND_ELEM,"Missing Mandatory Message Element"},		/* 20 */

src/capwap/cw_cisco_id_to_str.c

@@ -126,7 +126,17 @@ const char * cw_cisco_id_to_str(int elem_id)
 			return "AP Quality of Services";
 		case CW_CISCO_TLV_PAYLOAD:
 			return "TLV Payload";
-	
+		case CW_CISCO_AP_UPTIME:
+			return "AP Uptime";
+		case CW_CISCO_AP_POWER_INJECTOR_CONFIG:
+			return "AP Power Injector Config";
+		case CW_CISCO_AP_PRE_STD_SWITCH_CONFIG:
+			return "AP Pre Std Switch Config";
+		case CW_CISCO_AP_BACKUP_SOFTWARE_VERSION:
+			return "Backup Software Version";
+		case CW_CISCO_AP_LOG_FACILITY:
+			return "AP Log Facility";
+		
 		default:
 			return "Unknown";
 

src/capwap/lw_cisco_id_to_str.c

@@ -26,6 +26,12 @@ const char * lw_cisco_id_to_str(int elem_id)
 			
 		case LW_CISCO_MCAST_MGID_INFO:
 			return "MCAST MGID Info";
+		case LW_CISCO_RADIO_MODULE_INFO:
+			return "Radio Module Info";
+		case LW_CISCO_TELNET_SSH:
+			return "Telnet SSH";
+		case LW_CISCO_AP_DTLS_DATA_CFG:
+			return "AP DTLS Data Config";
 
 		default: 
 			return "Unknown";

src/capwap/lwapp_cisco.h

@@ -32,14 +32,18 @@
 enum lwap_cisco_elems {
 
 LW_CISCO_AP_USERNAME_PASSWORD=18,
+
+LW_CISCO_RADIO_MODULE_INFO=21,
 LW_CISCO_AC_IP_ADDR_WITH_INDEX=32,
+LW_CISCO_AP_ETHERNET_PORT_SUBTYPE=34,
+LW_CISCO_AP_LOGHOST_CONFIG=36,
 LW_CISCO_MCAST_MGID_INFO=39,
 
-LW_CISCO_AP_LOGHOST_CONFIG=36,
+LW_CISCO_TELNET_SSH=44,
-
 LW_CISCO_AP_SUBMODE=67,
 
 LW_CISCO_PATH_MTU=73,
+LW_CISCO_AP_DTLS_DATA_CFG=74,
 
 LW_CISCO_ADD_WLAN=128,
 
@@ -47,6 +51,8 @@ LW_CISCO_SSC_HASH_VALIDATION=133,
 LW_CISCO_MWAR_HASH_VALUE=134,
 LW_CISCO_DOT11R_WLC_MAC_AND_IP=135,
 
+LW_CISCO_HARDWARE_INFO=139,
+
 LW_CISCO_AP_JOIN_IP_PREF_MODE=166
 
 };

src/wtp/cfg.json

@@ -27,7 +27,7 @@
 	"wtp_board_data_options":".x00010000",
 	"radios":{
 		"0":{
-			"admin_state":"1",
+			"admin_state":"2",
 			"radio_type":"1",
 			"bssid":".x123456789abc"
 		}