Refactoring fo capwap.h

FossilOrigin-Name: eaf59431a22faf0b18914afc2e4190aa2ec934f8fa9aa5d7bee009196b90c7cb
This commit is contained in:
7u83@mail.ru
2018-02-22 22:04:15 +00:00
parent ff0cf22c49
commit 5fa4653fa6
12 changed files with 41 additions and 34 deletions

View File

@ -620,7 +620,7 @@ int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *pr
char *ctrlport;
switch (*proto) {
case AC_PROTO_CAPWAP:
ctrlport = CAPWAP_CONTROL_PORT_STR;
ctrlport = CW_CONTROL_PORT_STR;
break;
case AC_PROTO_LWAPP:
ctrlport = LWAPP_CONTROL_PORT_STR;

View File

@ -69,7 +69,7 @@ extern struct mod_ac ** conf_mods;
#ifndef CONF_DEFAULT_CONTROL_PORT
#define CONF_DEFAULT_CONTROL_PORT CAPWAP_CONTROL_PORT
#define CONF_DEFAULT_CONTROL_PORT CW_CONTROL_PORT
#endif
#ifndef CONF_DEFAULT_LW_CONTROL_PORT

View File

@ -46,7 +46,7 @@
static void reset_echointerval_timer(struct wtpman *wtpman)
{
uint16_t ct = mbag_get_word(wtpman->conn->local, CW_ITEM_CAPWAP_TIMERS,
CAPWAP_MAX_DISCOVERY_INTERVAL << 8 |
CW_MAX_DISCOVERY_INTERVAL << 8 |
CAPWAP_ECHO_INTERVAL);
/* start echinterval timer and put 2 seconds for "safety" on it */