From eab1867526dd026918d9dc48139a46f253d35280 Mon Sep 17 00:00:00 2001 From: "7u83@maiol.ru" <7u83@maiol.ru@noemail.net> Date: Mon, 7 Nov 2016 06:28:36 +0000 Subject: [PATCH] ip adresse lists added FossilOrigin-Name: bf409307ad51adc02fa76ebf20f686211e873d9e8969c0f964ec5fd9a3500c29 --- src/cw/cw.h | 21 +++++++++++++++++++++ src/mod/capwap/capwap_actions_wtp.c | 17 +++++++++++++++++ src/mod/cisco/cisco_actions_wtp.c | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/cw/cw.h b/src/cw/cw.h index c274f4da..7b07e7d7 100644 --- a/src/cw/cw.h +++ b/src/cw/cw.h @@ -582,6 +582,27 @@ int cw_out_radio_generic(struct conn *conn, struct cw_action_out *a, uint8_t * d */ +struct cw_ip{ + struct sockaddr_storage ip; + uint32_t wtp_count; +}; + +typedef struct cw_ip cw_acip_t; + +typedef struct mavl * cw_aciplist_t; + +extern cw_iplist_t cw_aciplist_create(); + +#define cw_aciplist_destroy(l) mavl_destroy(l) +#define cw_aciplist_add(l,elem) mavl_add(l,elem) +#define cw_aciplist_del(l,elem) mavl_del(l,elem) +#define cw_aciplist_foreach(l,callback,cbpriv) mavl_foreach_asc(l,callback,cbpriv) +#define cw_aciplist_replace(l,r) mavl_replace(l,r) + + + + + /** *@} diff --git a/src/mod/capwap/capwap_actions_wtp.c b/src/mod/capwap/capwap_actions_wtp.c index 721df7b9..855e07a6 100644 --- a/src/mod/capwap/capwap_actions_wtp.c +++ b/src/mod/capwap/capwap_actions_wtp.c @@ -279,6 +279,20 @@ static cw_action_in_t actions_in[] = { .mand = 0 } , + + + /* AC IPv4 List - Config Status Resp */ + { + .capwap_state = CW_STATE_CONFIGURE, + .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .elem_id = CW_ELEM_AC_IPV4_LIST, + .item_id = CW_ITEM_AC_IP_LIST, + .start = NULL, + .min_len = 4, + .max_len = 1024*4, + .mand = 0 + } + , /* Vendor Specific Payload - Cponfig Status Resp */ @@ -289,6 +303,9 @@ static cw_action_in_t actions_in[] = { .start = cw_in_vendor_specific_payload } , + + + /* ---------------------------------------------------------------- * Change State Event Response - IN diff --git a/src/mod/cisco/cisco_actions_wtp.c b/src/mod/cisco/cisco_actions_wtp.c index 887c8a78..1ea8526c 100644 --- a/src/mod/cisco/cisco_actions_wtp.c +++ b/src/mod/cisco/cisco_actions_wtp.c @@ -395,7 +395,7 @@ static cw_action_out_t actions_out[]={ .vendor_id = CW_VENDOR_ID_CISCO, // .elem_id = CW_CISCO_AP_MODE_AND_TYPE, .item_id = CISCO_ITEM_WTP_OPER_STATE, - .out = cisco_out_wtp_operational_state, +// .out = cisco_out_wtp_operational_state, // .get = cw_out_get_outgoming, } ,