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

More WTP functions.

Browse Source 
FossilOrigin-Name: d911169da02fad41102ebdbd34b7533d78a39bb3c452d4174269ba7e3c825c53
This commit is contained in:
7u83@mail.ru
2015-04-26 06:41:12 +00:00
parent f1feb4bc0d
commit 2ac7210734
28 changed files with 980 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wtp/Makefile
View File

@ -20,8 +20,8 @@ ifndef ARCH
endif
CFLAGS += -O0 -Wall -g
#CFLAGS += -Os -Wall
#CFLAGS += -O0 -Wall -g
CFLAGS += -Os -Wall
LDFLAGS += -L../contrib/jsmn -L../../src/capwap/$(ARCH)

884
src/wtp/cfg.c
View File

File diff suppressed because it is too large Load Diff

21
src/wtp/cfg.json
View File

@ -1,8 +1,10 @@
{
"idle_timeout":"300",
"wtp_name":"Kaffe-Point22",
"wtp_name":"Kaffe-Point",
"wtp_mac_type":"1",
"wtp_frame_tunnel_mode":"4",
"hardware_version":["4232704",".x01000000"],
"software_version":["4232704",".x08006e00"],
"software_version":["4232704",".x08007300"],
"wtp_board_data":{
"vendor_id":"4232704",
"model_no":"AIR-LAP1131AG-E-K9",
@ -16,5 +18,20 @@
"fe80::219:dbff:fee0:9327"
],
"location_data":"Germany",
"ac_name_with_priority":{
"":"2",
"Master AC":"1"
},
"wtp_group_name":"tobias",
"ap_mode_and_type":"512",
"wtp_board_data_options":".x00010000",
"radios":{
"0":{
"admin_state":"2"
},
"1":{
"admin_state":"2"
}
},
"bssid":""
}

4
src/wtp/discovery.c
View File

@ -55,7 +55,7 @@ cw_aciplist_t cw_select_ac(struct conn *conn, mbag_t dis)
/* get the AC Name with Priority list */
cw_acpriolist_t priolist;
priolist = mbag_get_avltree(conn->local, CW_ITEM_AC_PRIO_LIST);
priolist = mbag_get_avltree(conn->config, CW_ITEM_AC_NAME_WITH_PRIORITY);
cw_aciplist_t resultlist=cw_aciplist_create();
@ -73,6 +73,8 @@ cw_aciplist_t cw_select_ac(struct conn *conn, mbag_t dis)
prio = cw_acpriolist_get(priolist, ac_name);
else
prio = 256;
printf("Prio for %s is %d\n",ac_name,prio);
printf("nprio: %d\n",priolist->count);
}

10
src/wtp/wtp_main.c
View File

@ -37,7 +37,7 @@ bstr_t get_base_rmac()
{
// static uint8_t rm[8]={0x00,0x4a,0x99,0x02,0xfa,0xc0};
static uint8_t rm[8]={0x00,0x3a,0x99,0x02,0xfa,0xc0};
static uint8_t rm[8]={0x00,0x4a,0x99,0x02,0xfa,0xc0};
return bstr_create(rm,6);
}
@ -68,9 +68,6 @@ int handle_update_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int main()
{
wtpconf_preinit();
if (!read_config("./wtp_uci.conf")) {
@ -156,9 +153,8 @@ conn->config=mbag_create();
cw_acpriolist_set(acprios,"Master AC",strlen("Master AC"),1);
cw_acpriolist_set(acprios,"AC8new",strlen("AC8new"),12);
mbag_set_avltree(conn->local,CW_ITEM_AC_PRIO_LIST,acprios);
mbag_set_str(conn->local,CW_ITEM_LOCATION_DATA,"Berlin");
// mbag_set_str(conn->local,CW_ITEM_LOCATION_DATA,"Berlin");
// mbag_set_str(conn->local,CW_ITEM_WTP_NAME,"WTP Tube");
mbag_set_byte(conn->local,CW_ITEM_WTP_MAC_TYPE,0);
@ -172,7 +168,7 @@ cw_set_msg_end_callback(conn,CW_STATE_CONFIGURE,CW_MSG_CONFIGURATION_STATUS_RESP
the_conn->strict_capwap=1;
the_conn->strict_capwap=0;
discovery();
join();
mavl_destroy(conn->incomming);