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

More work on mods ... integrating wtp 

FossilOrigin-Name: 023ead83c8cb82471e484667bfe72846dc5bd7953cdfa5ab1dcc3689f863673a
This commit is contained in:
7u83@mail.ru 2016-03-02 18:27:54 +00:00
parent b49b8787eb
commit 11f9dd3dca
8 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/Makefile
View File

@ -4,8 +4,10 @@ all:
$(MAKE) -C cipwap
$(MAKE) -C cisco
cc -c modload_ac.c -I../
cc -c modload_wtp.c -I../
clean:
$(MAKE) -C capwap clean
$(MAKE) -C cipwap clean
$(MAKE) -C cisco clean
rm *.o

2
src/mod/capwap/Makefile
View File

@ -1,7 +1,9 @@
OBJS=\
mod_capwap_ac.o \
mod_capwap_wtp.o\
capwap_actions_ac.o \
capwap_actions_wtp.o \
capwap_in_wtp_descriptor.o \
capwap_in_wtp_board_data.o

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

@ -197,7 +197,7 @@ static cw_action_in_t actions_in[] = {
}
,
/* WTP Frame Tunnel Mode - Join Request */
/* WTP Mac Type - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
@ -221,6 +221,19 @@ static cw_action_in_t actions_in[] = {
}
,
/* Maximum Message Length - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_MAXIMUM_MESSAGE_LENGTH,
.start = cw_in_generic2,
.item_id = CW_ITEM_MAXIMUM_MESSAGE_LENGTH,
.mand = 0,
.min_len = 2,
.max_len = 2
}
,
/* End of list */

1
src/mod/capwap/mod_capwap.h
View File

@ -2,6 +2,7 @@
#define __MOD_CAPWAP_H
struct mod_ac * mod_capwap_ac();
struct mod_wtp * mod_capwap_wtp();
extern int capwap_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,

1
src/mod/modload.h
View File

@ -2,4 +2,5 @@
#include "capwap/mod.h"
struct mod_ac * modload_ac(const char *name);
struct mod_wtp * modload_wtp(const char *name);

4
src/wtp/Makefile
View File

@ -25,6 +25,8 @@ CFLAGS += -O0 -Wall -Wno-unused-variable -Werror -g
LDFLAGS += -L../contrib/jsmn -L../../src/lib/$(ARCH)
LIBS+=-lcapwap
LIBS+=-lcisco
LIBS+=-lcw
LIBS+=-lnl-3
LIBS+=-lnl-genl-3
@ -122,7 +124,7 @@ endif
wtp: $(BCHECK) $(OBJS)
$(Q)$(CC) $(OBJS) -o wtp $(LDFLAGS) $(LIBS)
$(Q)$(CC) $(OBJS) ../mod/modload_wtp.o -o wtp $(LDFLAGS) $(LIBS)
@$(E) " LD " $@
clean:

28
src/wtp/cfg.json
View File

@ -1,34 +1,10 @@
{
"ac_name_with_priority":{
"":"2",
"Master AC":"1"
},
"capwap_timers":"2590",
"cisco_ap_mode_and_type":"4",
"cisco_board_data_options":".x00010404",
"idle_timeout":"300",
"location_data":"Germany",
"wtp_board_data":{
"model_no":"AIR-LAP1131AG-E-K9",
"serial_no":"2045",
"vendor_id":"4232704"
},
"wtp_frame_tunnel_mode":"4",
"wtp_group_name":"tobias",
"wtp_hardware_version":"4232704,.x01000000",
"wtp_mac_type":"1",
"wtp_name":"Kaffe-Point",
"wtp_software_version":"4232704,.x07007300",
"radios":{
"0":{
"admin_state":"1",
"bssid":".x123456789abc",
"radio_type":"1"
},
"1":{
"admin_state":"1",
"bssid":".xaabbccddeeff",
"radio_type":"2"
}
}
}

20
src/wtp/wtp_main.c
View File

@ -13,6 +13,9 @@
#include "capwap/capwap_80211.h"
#include "capwap/radio.h"
#include "capwap/mod.h"
#include "wtp.h"
#include "wtp_conf.h"
@ -24,7 +27,7 @@
#include "cfg.h"
#include "../mod/modload.h"
@ -111,8 +114,19 @@ mavl_destroy(b);
// mbag_set_dword(r,CW_RADIO_TYPE,1);
cw_register_actions_cipwap_wtp(&capwap_actions);
cw_register_actions_capwap_80211_wtp(&capwap_actions);
// cw_register_actions_cipwap_wtp(&capwap_actions);
// cw_register_actions_capwap_80211_wtp(&capwap_actions);
struct mod_wtp * mod = modload_wtp ("capwap");
if (!mod) {
printf ("Can't load mod capwap\n");
exit(0);
}
conn->detected=1;
mod->register_actions(&capwap_actions);
/*