From d743f191e6320892e651a628b9ec5673bb04bc90 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Thu, 5 Apr 2018 08:48:07 +0000
Subject: [PATCH] Ntohing new

FossilOrigin-Name: 43b26d6bc6feeb31d9db242882e6031a6f228ca1dfa38669f81a442a631279af
---
 actube.workspace   |  4 ++--
 src/WtpConfig.mak  |  2 +-
 src/wtp/config.ktv | 21 +++++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/actube.workspace b/actube.workspace
index b8870938..c63c2d68 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -3,8 +3,8 @@
   <Project Name="ac" Path="ac.project" Active="No"/>
   <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="Yes"/>
-  <Project Name="mod_cisco" Path="mod_cisco.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_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
diff --git a/src/WtpConfig.mak b/src/WtpConfig.mak
index 2aa1d3b2..bcf8984e 100644
--- a/src/WtpConfig.mak
+++ b/src/WtpConfig.mak
@@ -4,7 +4,7 @@ include ../Config.mak
 # Define witch SSL library to use
 # OPENSSL or GNUTLS
 #
-SSL_LIBRARY=GNUTLS
+SSL_LIBRARY=OPENSSL
 
 CFLAGS += -I/usr/include/libnl3
 CFLAGS += -I../contrib/uci
diff --git a/src/wtp/config.ktv b/src/wtp/config.ktv
index 2ad03929..ffa185a5 100644
--- a/src/wtp/config.ktv
+++ b/src/wtp/config.ktv
@@ -9,6 +9,16 @@ capwap/ssl-cipher:Str: +DHE-RSA:+RSA:+AES-256-CBC:+AES-128-CBC:+SHA1:+PSK
 capwap/ssl-psk:Bstr16:"HalloWelt"
 capwap/ssl-psk-enable:Bool:true
 
+
+cisco/ssl-certfile:Str:"../../ssl/certs/wtp-cisco.crt"
+cisco/ssl-keyfile:Str:"../../ssl/certs/wtp-cisco.key"
+#capwap/ssl-cipher:Str: +RSA:+AES-128-CBC:+SHA1
+#capwap/ssl-cipher:Str: +DHE-RSA:+RSA:+AES-256-CBC:+AES-128-CBC:+SHA1:+PSK
+#capwap/ssl-psk:Bstr16:"HalloWelt"
+#capwap/ssl-psk-enable:Bool:true
+
+
+
 #cisco/ssl-certfile:Str:"../../ssl/certs/wtp.crt"
 #cisco/ssl-keyfile:Str:"../../ssl/certs/wtp.key"
      
@@ -30,18 +40,17 @@ wtp-descriptor/software/vendor:Dword:906090
 wtp-descriptor/software/version:Bstr16:.x171312
 wtp-descriptor/bootloader/vendor:Dword:906090
 wtp-descriptor/bootloader/version:Bstr16:.x171312
-wtp-descriptor/max-radios:Byte:3
-
-radio/0/wtp-radio-information:Dword:01
-radio/1/wtp-radio-information:Dword:02
-radio/2/wtp-radio-information:Dword:03
+wtp-descriptor/max-radios:Byte:2
 
+radio/0/wtp-radio-information:Dword:3
+radio/1/wtp-radio-information:Dword:1
+#NGAB
 
 wtp-name:Bstr16:WFAT01
 
 wtp-fallback:Byte:1
 ac-name-with-priority/TubesAC:Byte:3
-ac-name-with-priority/"ac2":Byte:01
+ac-name-with-priority/"ac2":Byte:05
 
 capwap-timers/max-discovery-interval:Byte:0
 capwap-timers/min-discovery-interval:Byte:0