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

Merge branch 'master' of https://github.com/7u83/actube 

FossilOrigin-Name: 701ce8cfc4b859cce42dba74558891e67038dd4b39a8e8c3e834593be0327b83
This commit is contained in:
7u83@mail.ru 2016-03-01 07:30:50 +00:00
parent c7fdafc2dd 515b958ab2
commit dde5af6ffc
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/cisco/cisco.h
View File

@ -5,8 +5,9 @@
#include "capwap/action.h"
extern int cisco_out_ap_timesync(struct conn *conn,struct cw_action_out * a,uint8_t *dst);
int cisco_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
extern int cisco_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from);
extern int cisco_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,uint8_t *dst) ;
#endif

2
src/mod/cisco/cisco_actions_ac.c
View File

@ -90,7 +90,7 @@ static cw_action_out_t actions_out[]={
.msg_id = CW_MSG_DISCOVERY_RESPONSE,
.item_id = CW_ITEM_AC_DESCRIPTOR,
.elem_id = CW_ELEM_AC_DESCRIPTOR,
.out = cw_out_cisco_ac_descriptor,
.out = cisco_out_ac_descriptor,
.mand = 1
}

4
src/wtp/Makefile
View File

@ -22,10 +22,10 @@ endif
CFLAGS += -O0 -Wall -Wno-unused-variable -Werror -g
#CFLAGS += -Os -Wall
LDFLAGS += -L../contrib/jsmn -L../../src/capwap/$(ARCH)
LDFLAGS += -L../contrib/jsmn -L../../src/lib/$(ARCH)
LIBS+=-lcapwap
LIBS+=-lcw
LIBS+=-lnl-3
LIBS+=-lnl-genl-3
LIBS+=-ljsmn

6
src/wtp/wtp_main.c
View File

@ -132,7 +132,7 @@ mavl_destroy(b);
conn->base_rmac=get_base_rmac();
conn->capwap_mode = CW_MODE_CAPWAP;
//conn->capwap_mode = CW_MODE_CISCO;
conn->capwap_mode = CW_MODE_CISCO;
the_conn->strict_capwap=0;
@ -169,8 +169,8 @@ conn->config=mbag_create();
cw_set_msg_end_callback(conn,CW_STATE_RUN,CW_MSG_CONFIGURATION_UPDATE_REQUEST,handle_update_req);
cw_set_msg_end_callback(conn,CW_STATE_CONFIGURE,CW_MSG_CONFIGURATION_STATUS_RESPONSE,handle_update_req);
//cw_set_msg_end_callback(conn,CW_STATE_RUN,CW_MSG_CONFIGURATION_UPDATE_REQUEST,handle_update_req);
//cw_set_msg_end_callback(conn,CW_STATE_CONFIGURE,CW_MSG_CONFIGURATION_STATUS_RESPONSE,handle_update_req);