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

Moved a lot of macros from capwap.h to cw.h

Browse Source 
FossilOrigin-Name: 09114fbdffe3dd78d32f93da671f8f0cf9c40056a7b8f93114b12646f25db512
This commit is contained in:
7u83@mail.ru
2016-03-11 21:23:00 +00:00
parent 4a529fec12
commit d4ddbc0618
40 changed files with 385 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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)
CONFOBJS = wtp_conf.o
LIBS+=-lcapwap
LIBS+=-lcapwap80211
LIBS+=-lcisco
@ -33,7 +35,7 @@ LIBS+=-lnl-3
LIBS+=-lnl-genl-3
LIBS+=-ljsmn
CONFOBJS = wtp_conf.o
ifeq ($(CONF_LIBRARY),UCI)
CFLAGS+=-DWITH_UCI
@ -63,7 +65,6 @@ endif
#HA_FILES += ../contrib/hostap/src/drivers/driver_nl80211.o
HA_INCS += -I$(INCLUDE_DIR)/libnl-tiny

3
src/wtp/discovery.c
View File

@ -240,6 +240,9 @@ static int cw_run_discovery(struct conn *conn, const char *acaddr)
int discovery()
{
struct conn *conn = get_conn();
printf("Raqddios = %d\n",conn->radios->count);
cw_run_discovery(conn, "255.255.255.255");
conn->capwap_state=CW_STATE_JOIN;
return 1;

14
src/wtp/wtp_main.c
View File

@ -69,22 +69,23 @@ void update_reboot_stats(struct conn * conn, int cause)
mbag_t rs = mbag_get_mbag(conn->config,CW_ITEM_WTP_REBOOT_STATISTICS,NULL);
uint16_t rv;
printf("Loaded mbag %p\n",rs);
switch (cause){
case CW_REBOOT_TYPE_NOT_SUPPORTED:
break;
case CW_REBOOT_TYPE_AC_INITIATED:
mbag_inc_word(rs,CW_ITEM_REBOOT_AC_INITIATED_COUNT);
mbag_inc_word(rs,CW_ITEM_REBOOT_AC_INITIATED_COUNT,1);
break;
case CW_REBOOT_TYPE_OTHER_FAILURE:
mbag_inc_word(rs,CW_ITEM_REBOOT_OTHER_FAILURE_COUNT);
mbag_inc_word(rs,CW_ITEM_REBOOT_OTHER_FAILURE_COUNT,1);
break;
}
mbag_inc_word(rs,CW_ITEM_REBOOT_COUNT,1);
mbag_set_byte(rs,CW_ITEM_REBOOT_LAST_FAILURE_TYPE,cause);
cfg_to_json();
}
@ -92,7 +93,6 @@ void update_reboot_stats(struct conn * conn, int cause)
static void sig_handler(int sig)
{
struct conn * conn = the_conn; //get_conn();
printf("Ctrl+C pressed, updating reboot statistics for %p\n",conn);
update_reboot_stats(conn, CW_REBOOT_TYPE_OTHER_FAILURE);
exit(0);
@ -206,8 +206,6 @@ int main()
mbag_set_mbag(conn->config, CW_ITEM_WTP_BOARD_DATA, board_data);
mbag_t reboot_statistics = mbag_create();
mbag_set_mbag(conn->config, CW_ITEM_WTP_REBOOT_STATISTICS,reboot_statistics);
@ -245,7 +243,7 @@ int main()
if (!join())
return -1;
mavl_destroy(conn->incomming);
// mavl_del_all(conn->incomming);
conn->incomming = conn->config;
if (!configure())
return -1;