planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use defs from keys.h

Browse Source 
FossilOrigin-Name: f306fbf02aa901f2f6429393bb6bcafaca8008a64c1ea414f00e8e838fe93bdb
This commit is contained in:
7u83@mail.ru 2018-03-15 19:20:19 +00:00
parent 15cca4e553
commit 5f8db1b8ea
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actube.workspace
View File

@ -4,8 +4,8 @@
<Project Name="wtp" Path="wtp.project" Active="No"/> <Project Name="wtp" Path="wtp.project" Active="No"/>
<Project Name="mod_cipwap" Path="mod_cipwap.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_capwap" Path="mod_capwap.project" Active="No"/>
<Project Name="mod_cisco" Path="mod_cisco.project" Active="Yes"/> <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
<Project Name="libcw" Path="libcw.project" Active="No"/> <Project Name="libcw" Path="libcw.project" Active="Yes"/>
<Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/> <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
<Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/> <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
<BuildMatrix> <BuildMatrix>

3
src/cw/cw_read_wtp_descriptor_7.c
View File

@ -25,7 +25,8 @@ int cw_read_wtp_descriptor_7(mavl_t cfg, struct conn *conn,
struct cw_DescriptorSubelemDef *allowed) struct cw_DescriptorSubelemDef *allowed)
{ {
int ncrypt, pos; /* int ncrypt; //currentliy unused */
int pos;
char key[64]; char key[64];
sprintf(key,"%s/%s",eh->key, CW_SKEY_MAX_RADIOS); sprintf(key,"%s/%s",eh->key, CW_SKEY_MAX_RADIOS);

5
src/cw/keys.h
View File

@ -17,6 +17,11 @@
#define CW_KEY_WTP_NAME "wtp-name" #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 #endif

11
src/mod/capwap/capwap_actions_ac.c
View File

@ -22,6 +22,7 @@
#include "cw/log.h" #include "cw/log.h"
#include "cw/msgset.h" #include "cw/msgset.h"
#include "cw/keys.h"
#include "mod_capwap.h" #include "mod_capwap.h"
@ -33,7 +34,7 @@ static struct cw_ElemHandler handlers[] = {
0,0, /* Vendor / Proto */ 0,0, /* Vendor / Proto */
1,1, /* min/max length */ 1,1, /* min/max length */
CW_TYPE_BYTE, /* type */ CW_TYPE_BYTE, /* type */
"discovery_type", /* Key */ CW_KEY_DISCOVERY_TYPE, /* Key */
cw_in_generic, /* get */ cw_in_generic, /* get */
cw_out_generic /* put */ cw_out_generic /* put */
} }
@ -44,7 +45,7 @@ static struct cw_ElemHandler handlers[] = {
0,0, /* Vendor / Proto */ 0,0, /* Vendor / Proto */
1,1, /* min/max length */ 1,1, /* min/max length */
CW_TYPE_BYTE, /* type */ CW_TYPE_BYTE, /* type */
"wtp_mac_type", /* Key */ CW_KEY_WTP_MAC_TYPE, /* Key */
cw_in_generic, /* get */ cw_in_generic, /* get */
cw_out_generic /* put */ cw_out_generic /* put */
} }
@ -55,7 +56,7 @@ static struct cw_ElemHandler handlers[] = {
0,0, /* Vendor / Proto */ 0,0, /* Vendor / Proto */
4,128, /* min/max length */ 4,128, /* min/max length */
NULL, /* type */ NULL, /* type */
"wtp_board_data", /* Key */ CW_KEY_WTP_BOARD_DATA, /* Key */
capwap_in_wtp_board_data, /* get */ capwap_in_wtp_board_data, /* get */
NULL /* put */ NULL /* put */
} }
@ -66,7 +67,7 @@ static struct cw_ElemHandler handlers[] = {
0,0, /* Vendor / Proto */ 0,0, /* Vendor / Proto */
4,128, /* min/max length */ 4,128, /* min/max length */
NULL, /* type */ NULL, /* type */
"wtp_descriptor", /* Key */ CW_KEY_WTP_DESCRIPTOR, /* Key */
capwap_in_wtp_descriptor, /* get */ capwap_in_wtp_descriptor, /* get */
NULL /* put */ NULL /* put */
} }
@ -77,7 +78,7 @@ static struct cw_ElemHandler handlers[] = {
0,0, /* Vendor / Proto */ 0,0, /* Vendor / Proto */
1,1, /* min/max length */ 1,1, /* min/max length */
CW_TYPE_BYTE, /* type */ CW_TYPE_BYTE, /* type */
"wtp_frame_tunnel_mode", /* Key */ CW_KEY_WTP_FRAME_TUNNEL_MODE, /* Key */
cw_in_generic, /* get */ cw_in_generic, /* get */
cw_out_generic /* put */ cw_out_generic /* put */
} }