work on capwap80211

FossilOrigin-Name: eead3ab5d8c33c28eb77e72a7910394dca47547115646b5585152b0bc34c0613
This commit is contained in:
7u83@mail.ru 2018-03-26 11:56:00 +00:00
parent 5f5fccb14f
commit 887e10fcbc
11 changed files with 17 additions and 26 deletions

View File

@ -3,9 +3,9 @@
<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="No"/>
<Project Name="mod_capwap" Path="mod_capwap.project" Active="Yes"/>
<Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
<Project Name="libcw" Path="libcw.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"/>
<BuildMatrix>

View File

@ -4,7 +4,6 @@
<VirtualDirectory Name="mod">
<VirtualDirectory Name="capwap">
<File Name="src/mod/capwap/capwap_out_ac_ip_list.c"/>
<File Name="src/mod/capwap/capwap_actions.h"/>
<File Name="src/mod/capwap/mod_capwap_ac.c"/>
<File Name="src/mod/capwap/capwap_in_wtp_board_data.c"/>
<File Name="src/mod/capwap/capwap_actions_wtp.c"/>

View File

@ -8,12 +8,10 @@ OBJS=\
capwap_in_ac_descriptor.o \
capwap_out_wtp_board_data.o \
capwap_out_ac_descriptor.o \
capwap_out_get_session_id.o \
capwap_out_get_idle_timeout.o \
capwap_out_wtp_descriptor.o \
capwap_in_wtp_descriptor.o \
capwap_out_ac_ip_list.o \
capwap_in_session_id.o \
capwap_in_vendor_specific_payload.o \
capwap_in_mtu_discovery_padding.o \
capwap_out_capwap_control_ip_address.o \

View File

@ -1,7 +0,0 @@
#ifndef __CAPWAP_ACTIONS_H
#define __CAPWAP_ACTIONS_H
int capwap_in_session_id(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from);
#endif

View File

@ -32,10 +32,11 @@ int capwap_in_vendor_specific_payload(struct cw_ElemHandler *handler,
params->msgdata->name, cw_strstate(params->conn->capwap_state));
return 0;
}
/*
// cw_dbg_elem(DBG_ELEM_IN,params->conn,0,vhandler, data+6,len-6);
//vhandler->get(vhandler, params, data+6, len-6);
*/
cw_process_element(params,0,vendor_id,elem_id,data+6,len-6);
return 1;

View File

@ -9,8 +9,9 @@
int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
/*int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
{
*/
/* mbag_t ips = conn->local;
MAVLITER_DEFINE (it,ips);
@ -18,10 +19,10 @@ int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t *
}
*/
return 0;
/* return 0;
struct sockaddr sa;
sock_strtoaddr( "192.168.0.11", &sa);
cw_put_sockaddr(dst+4,(struct sockaddr_storage*)&sa);
return 4 + cw_put_elem_hdr(dst,CAPWAP_ELEM_AC_IPV4_LIST,4);
}
}*/

View File

@ -59,7 +59,7 @@ int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
d = dst;
i=0;
do {
uint8_t * msg;
/* uint8_t * msg;*/
int l;
sprintf(key,"%s/address.%d",eh->key,i);
@ -71,7 +71,7 @@ int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
break;
}
msg = d;
/* msg = d;*/
l = address->type->len(address);

View File

@ -8,10 +8,6 @@
#include "mod_capwap.h"
extern int capwap_register_actions_ac(struct cw_actiondef *def);
static int init(struct cw_Mod * mod, mavl_t global_cfg, int role)
{
cw_dbg(DBG_INFO,"CAPWAP: Inititalizing mod_capwap.");

View File

@ -2,7 +2,7 @@ include ../../Defs.mak
OBJS=\
mod_capwap80211_ac.o \
mod_capwap80211.o \
LIBDIR := ../../../lib

View File

@ -4,6 +4,8 @@
struct cw_Mod * mod_cipwap_ac();
struct cw_Mod * mod_cipwap_wtp();
/*
extern int cipwap_register_actions_ac(struct cw_actiondef *def);
*/
#endif

View File

@ -189,7 +189,7 @@ static struct cw_Mod capwap_ac = {
*/
static struct cw_Mod cisco_data = {
struct cw_Mod mod_cisco = {
"cisco", /* name */
init, /* init */
detect, /* detect */
@ -202,8 +202,9 @@ static struct cw_Mod cisco_data = {
/*
struct cw_Mod *mod_cisco()
{
return &cisco_data;
}
*/