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

mod_capwap sends correct wtp descriptor now.

Browse Source 
FossilOrigin-Name: b1f651a31ae1205d51b70d058e975756b6a302d5c75b5a98e441f3369d5fe5d2
This commit is contained in:
7u83@mail.ru
2016-03-04 21:32:01 +00:00
parent b47702131d
commit d85ef39abe
7 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wtp/conf_uci.c
View File

@ -179,8 +179,8 @@ int read_config(const char * filename){
str = uci_lookup_option_string(ctx,section,"software_version");
if (str){
uint8_t * s = bstr_create_from_cfgstr(str);
bstr_replace(&conf_software_version,s);
uint8_t * s = bstr16_create_from_cfgstr(str);
bstr16_replace(&conf_software_version,s);
}
str = uci_lookup_option_string(ctx,section,"hardware_version");
@ -191,8 +191,8 @@ int read_config(const char * filename){
str = uci_lookup_option_string(ctx,section,"bootloader_version");
if (str){
uint8_t * s = bstr_create_from_cfgstr(str);
bstr_replace(&conf_bootloader_version,s);
uint8_t * s = bstr16_create_from_cfgstr(str);
bstr16_replace(&conf_bootloader_version,s);
}

22
src/wtp/wtp_main.c
View File

@ -172,13 +172,25 @@ mavl_destroy(b);
mbag_set_mbag(conn->config, CW_ITEM_WTP_BOARD_DATA, board_data);
bstrv_t hw =
bstrv_create(conf_vendor_id, bstr16_data(conf_hardware_version),
bstr16_len(conf_hardware_version));
mbag_set_bstrv(conn->config, CW_ITEM_WTP_HARDWARE_VERSION,
0,
bstr16_data(conf_hardware_version),
bstr16_len(conf_hardware_version));
mbag_set_bstrv(conn->config, CW_ITEM_WTP_SOFTWARE_VERSION,
0,
bstr16_data(conf_software_version),
bstr16_len(conf_software_version));
mbag_set_bstrv(conn->config, CW_ITEM_WTP_BOOTLOADER_VERSION,
0,
bstr16_data(conf_bootloader_version),
bstr16_len(conf_bootloader_version));
mbag_set_bstr16(conn->config, CW_ITEM_WTP_HARDWARE_VERSION, hw);
//mbag_set_bstr16(conn->config, CW_ITEM_WTP_SOFTWARE_VERSION,conf_software_version);
// mbag_set_bstrv(conn->config, CW_ITEM_WTP_SOFTWARE_VERSION, sw);
printf("Board_data %p\n", board_data);