|
|
|
@ -12,160 +12,150 @@ |
|
|
|
|
#include "cw/dbg.h" |
|
|
|
|
#include "cw/timer.h" |
|
|
|
|
#include "cw/cw.h" |
|
|
|
|
#include "cw/rand.h" |
|
|
|
|
|
|
|
|
|
#include "wtp.h" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int cw_select_ac(mavl_t local_cfg,mlist_t aclist){ |
|
|
|
|
mlistelem_t * e; |
|
|
|
|
mavl_t cw_select_ac(mavl_t local_cfg, mlist_t aclist) |
|
|
|
|
{ |
|
|
|
|
mlistelem_t *e; |
|
|
|
|
mavl_t iplist; |
|
|
|
|
int en; |
|
|
|
|
|
|
|
|
|
iplist=cw_ktv_create(); |
|
|
|
|
|
|
|
|
|
iplist = cw_ktv_create(); |
|
|
|
|
if (iplist == NULL) |
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
en=0; |
|
|
|
|
en = 0; |
|
|
|
|
|
|
|
|
|
/* for each discovery response */ |
|
|
|
|
mlist_foreach(e,aclist){ |
|
|
|
|
char acname[CAPWAP_MAX_AC_NAME_LEN+1]; |
|
|
|
|
mlist_foreach(e, aclist) { |
|
|
|
|
char acname[CAPWAP_MAX_AC_NAME_LEN + 1]; |
|
|
|
|
char key[CW_KTV_MAX_KEY_LEN]; |
|
|
|
|
mavl_t remote_cfg; |
|
|
|
|
cw_KTV_t * val, *ipval; |
|
|
|
|
int prio,i; |
|
|
|
|
|
|
|
|
|
cw_KTV_t *val, *ipval; |
|
|
|
|
int prio, i; |
|
|
|
|
|
|
|
|
|
remote_cfg = mlistelem_get_ptr(e); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* get ac name */ |
|
|
|
|
val = cw_ktv_get(remote_cfg,"ac-name", CW_TYPE_BSTR16); |
|
|
|
|
if (val==NULL){ |
|
|
|
|
val = cw_ktv_get(remote_cfg, "ac-name", CW_TYPE_BSTR16); |
|
|
|
|
if (val == NULL) { |
|
|
|
|
/* this should not happen, because AC Name is a
|
|
|
|
|
* amndatory message element */ |
|
|
|
|
prio=255; |
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
prio = 255; |
|
|
|
|
} else { |
|
|
|
|
/* Get priority for AC from
|
|
|
|
|
* ac-name-with-priority list */ |
|
|
|
|
val->type->to_str(val,acname,CAPWAP_MAX_AC_NAME_LEN); |
|
|
|
|
sprintf(key,"ac-name-with-priority/%s",acname); |
|
|
|
|
prio = cw_ktv_get_byte(local_cfg,key,255); |
|
|
|
|
val->type->to_str(val, acname, CAPWAP_MAX_AC_NAME_LEN); |
|
|
|
|
sprintf(key, "ac-name-with-priority/%s", acname); |
|
|
|
|
prio = cw_ktv_get_byte(local_cfg, key, 255); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* for each control ip address the AC has sent */ |
|
|
|
|
i=0;
|
|
|
|
|
i = 0; |
|
|
|
|
do { |
|
|
|
|
sprintf(key,"%s.%d","capwap-control-ip-address/wtps",i); |
|
|
|
|
val = cw_ktv_get(remote_cfg,key,CW_TYPE_WORD); |
|
|
|
|
sprintf(key, "%s.%d", "capwap-control-ip-address/wtps", i); |
|
|
|
|
val = cw_ktv_get(remote_cfg, key, CW_TYPE_WORD); |
|
|
|
|
if (val == NULL) |
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sprintf(key,"%s.%d","capwap-control-ip-address/address",i); |
|
|
|
|
ipval = cw_ktv_get(remote_cfg,key,CW_TYPE_IPADDRESS); |
|
|
|
|
|
|
|
|
|
sprintf(key,"%04d%05d%04d",prio,val->val.word,en); |
|
|
|
|
|
|
|
|
|
cw_ktv_add(iplist,key,CW_TYPE_SYSPTR,(uint8_t*)(&ipval),sizeof(ipval)); |
|
|
|
|
sprintf(key, "%s.%d", "capwap-control-ip-address/address", i); |
|
|
|
|
ipval = cw_ktv_get(remote_cfg, key, CW_TYPE_IPADDRESS); |
|
|
|
|
|
|
|
|
|
sprintf(key, "%04d%05d%04d", prio, val->val.word, en); |
|
|
|
|
|
|
|
|
|
cw_ktv_add(iplist, key, CW_TYPE_SYSPTR, (uint8_t *) (&ipval), |
|
|
|
|
sizeof(ipval)); |
|
|
|
|
i++; |
|
|
|
|
en++; |
|
|
|
|
}while(1); |
|
|
|
|
|
|
|
|
|
} while (1); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
cw_dbg_ktv_dump(iplist,DBG_INFO,"=== IP list ===", "IP", "=== END IP List ==="); |
|
|
|
|
|
|
|
|
|
cw_dbg_ktv_dump(iplist, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ==="); |
|
|
|
|
{ |
|
|
|
|
mavliter_t i; |
|
|
|
|
mavliter_init(&i,iplist); |
|
|
|
|
|
|
|
|
|
mavliter_foreach(&i){ |
|
|
|
|
mavliter_init(&i, iplist); |
|
|
|
|
|
|
|
|
|
mavliter_foreach(&i) { |
|
|
|
|
char ipstr[100]; |
|
|
|
|
char *rk; |
|
|
|
|
cw_KTV_t * val; |
|
|
|
|
cw_KTV_t *val; |
|
|
|
|
val = mavliter_get(&i); |
|
|
|
|
rk = val->key; |
|
|
|
|
val = val->val.ptr; |
|
|
|
|
val->type->to_str(val,ipstr,100); |
|
|
|
|
printf("PTRVAL(%s): %s - %s\n",rk,val->key,ipstr); |
|
|
|
|
val->type->to_str(val, ipstr, 100); |
|
|
|
|
printf("PTRVAL(%s): %s - %s\n", rk, val->key, ipstr); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int run_discovery(struct conn *conn) |
|
|
|
|
{ |
|
|
|
|
/*// conn->incomming = mbag_create();*/ |
|
|
|
|
time_t timer; |
|
|
|
|
/* uint8_t dtype=0;*/ |
|
|
|
|
mlist_t discovery_results; |
|
|
|
|
struct sockaddr_storage from; |
|
|
|
|
int delay, min, max; |
|
|
|
|
|
|
|
|
|
conn->capwap_state = CAPWAP_STATE_DISCOVERY; |
|
|
|
|
|
|
|
|
|
min = cw_ktv_get_byte(conn->local_cfg,"capwap-timers/min-discovery-interval", |
|
|
|
|
CAPWAP_MIN_DISCOVERY_INTERVAL); |
|
|
|
|
max = cw_ktv_get_byte(conn->local_cfg,"capwap-timers/max-discovery-interval", |
|
|
|
|
CAPWAP_MAX_DISCOVERY_INTERVAL); |
|
|
|
|
|
|
|
|
|
delay = cw_randint(min,max); |
|
|
|
|
if (delay>0){ |
|
|
|
|
cw_dbg(DBG_INFO,"Sleeping for %d seconds before sending Discovery Request.", delay); |
|
|
|
|
sleep(delay); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/*cw_ktv_add(conn->local_cfg, "discovery-type", CW_TYPE_BYTE, &dtype,17);*/ |
|
|
|
|
|
|
|
|
|
conn->capwap_state = CAPWAP_STATE_DISCOVERY; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* create and send a discovery request message */ |
|
|
|
|
cw_init_request(conn, CAPWAP_MSG_DISCOVERY_REQUEST); |
|
|
|
|
cw_put_msg(conn, conn->req_buffer); |
|
|
|
|
conn_send_msg(conn, conn->req_buffer); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
timer = cw_timer_start(0); |
|
|
|
|
timer = cw_timer_start(cw_ktv_get_byte(conn->local_cfg, "discovery-interval", |
|
|
|
|
CAPWAP_DISCOVERY_INTERVAL))-1; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
discovery_results = mlist_create(NULL,NULL,sizeof(void*)); |
|
|
|
|
discovery_results = mlist_create(NULL, NULL, sizeof(void *)); |
|
|
|
|
while (!cw_timer_timeout(timer) |
|
|
|
|
&& conn->capwap_state == CAPWAP_STATE_DISCOVERY) { |
|
|
|
|
int rc; |
|
|
|
|
char addr_str[SOCK_ADDR_BUFSIZE]; |
|
|
|
|
/*mavl_del_all(conn->incomming);*/ |
|
|
|
|
|
|
|
|
|
conn->remote_cfg = cw_ktv_create(); |
|
|
|
|
if (conn->remote_cfg == NULL) { |
|
|
|
|
cw_log_errno("Can't allocate memory for remote_cfg"); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
rc = cw_read_from(conn, &from); |
|
|
|
|
if (rc<0) { |
|
|
|
|
if (errno==EAGAIN) |
|
|
|
|
if (rc < 0) { |
|
|
|
|
if (errno == EAGAIN) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
cw_log(LOG_ERROR,"Error reading messages: %s",strerror(errno)); |
|
|
|
|
cw_log(LOG_ERROR, "Error reading messages: %s", strerror(errno)); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
cw_dbg(DBG_INFO,"Received Discovery Response from %s", sock_addr2str(&from,addr_str)); |
|
|
|
|
mlist_append_ptr(discovery_results,conn->remote_cfg); |
|
|
|
|
conn->remote_cfg=cw_ktv_create(); |
|
|
|
|
cw_dbg(DBG_INFO, "Received Discovery Response from %s", |
|
|
|
|
sock_addr2str(&from, addr_str)); |
|
|
|
|
mlist_append_ptr(discovery_results, conn->remote_cfg); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
cw_select_ac(conn->local_cfg,discovery_results); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
mbag_t discs; |
|
|
|
|
discs = mbag_get_mavl(conn->remote, CW_ITEM_DISCOVERIES); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!discs) { |
|
|
|
|
cw_log(LOG_ERR,"No discovery responses received"); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int i; |
|
|
|
|
|
|
|
|
|
cw_aciplist_t list = cw_select_ac(conn, discs); |
|
|
|
|
cw_select_ac(conn->local_cfg, discovery_results); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DEFINE_AVLITER(ii,list); |
|
|
|
|
avliter_foreach(&ii){ |
|
|
|
|
cw_acip_t * ip = avliter_get(&ii); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mavl_del_all(conn->remote); |
|
|
|
|
|
|
|
|
|
mbag_set_mavl(conn->local,CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST,list); |
|
|
|
|
*/ |
|
|
|
|
return 1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -177,50 +167,48 @@ int cw_run_discovery(struct conn *conn, const char *addr, const char *bindaddr) |
|
|
|
|
char sock_buf[SOCK_ADDR_BUFSIZE]; |
|
|
|
|
struct sockaddr_storage dstaddr; |
|
|
|
|
char caddr[256], control_port[64]; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int rc; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* get addr of destination */ |
|
|
|
|
struct addrinfo hints; |
|
|
|
|
struct addrinfo *res, *res0; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
memset(&hints, 0, sizeof(hints)); |
|
|
|
|
|
|
|
|
|
hints.ai_socktype = SOCK_DGRAM; |
|
|
|
|
hints.ai_family = AF_UNSPEC; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
strncpy(caddr, addr, sizeof(caddr)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* try to convert the given address string to sockaddr */ |
|
|
|
|
rc = sock_strtoaddr(caddr,(struct sockaddr*)&dstaddr); |
|
|
|
|
rc = sock_strtoaddr(caddr, (struct sockaddr *) &dstaddr); |
|
|
|
|
if (rc) { |
|
|
|
|
int iport; |
|
|
|
|
/* converting to socaddr was successful */
|
|
|
|
|
iport = sock_getport((struct sockaddr*)&dstaddr); |
|
|
|
|
/* converting to socaddr was successful */ |
|
|
|
|
iport = sock_getport((struct sockaddr *) &dstaddr); |
|
|
|
|
if (iport != 0) |
|
|
|
|
sprintf(control_port, "%d", iport); |
|
|
|
|
else |
|
|
|
|
sprintf(control_port,"%d", CAPWAP_CONTROL_PORT); |
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
char * port; |
|
|
|
|
sprintf(control_port, "%d", CAPWAP_CONTROL_PORT); |
|
|
|
|
} else { |
|
|
|
|
char *port; |
|
|
|
|
/* converting went wrong, so the address string might
|
|
|
|
|
* be a DNS entry. Look for a colon to find the port. */ |
|
|
|
|
port = strchr(addr,':'); |
|
|
|
|
if (port){ |
|
|
|
|
strncpy(control_port,port+1,sizeof(control_port)); |
|
|
|
|
caddr[port-addr]=0; |
|
|
|
|
} |
|
|
|
|
else{ |
|
|
|
|
sprintf(control_port,"%d", CAPWAP_CONTROL_PORT); |
|
|
|
|
port = strchr(addr, ':'); |
|
|
|
|
if (port) { |
|
|
|
|
strncpy(control_port, port + 1, sizeof(control_port)); |
|
|
|
|
caddr[port - addr] = 0; |
|
|
|
|
} else { |
|
|
|
|
sprintf(control_port, "%d", CAPWAP_CONTROL_PORT); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*printf("Addr: %s, Port: %s\n",caddr,control_port);*/ |
|
|
|
|
|
|
|
|
|
/*printf("Addr: %s, Port: %s\n",caddr,control_port); */ |
|
|
|
|
|
|
|
|
|
rc = getaddrinfo(caddr, control_port, &hints, &res0); |
|
|
|
|
if (rc) { |
|
|
|
@ -248,29 +236,31 @@ int cw_run_discovery(struct conn *conn, const char *addr, const char *bindaddr) |
|
|
|
|
|
|
|
|
|
sock_copyaddr(&conn->addr, res->ai_addr); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (bindaddr){ |
|
|
|
|
|
|
|
|
|
if (bindaddr) { |
|
|
|
|
int brc; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct sockaddr bind_address; |
|
|
|
|
sock_strtoaddr(bindaddr,&bind_address);
|
|
|
|
|
brc = bind(sockfd,&bind_address,sock_addrlen(&bind_address)); |
|
|
|
|
if (brc<0) { |
|
|
|
|
cw_log(LOG_ERR,"Can't bind to %s",sock_addr2str(&bind_address,sock_buf)); |
|
|
|
|
sock_strtoaddr(bindaddr, &bind_address); |
|
|
|
|
brc = bind(sockfd, &bind_address, sock_addrlen(&bind_address)); |
|
|
|
|
if (brc < 0) { |
|
|
|
|
cw_log(LOG_ERR, "Can't bind to %s", |
|
|
|
|
sock_addr2str(&bind_address, sock_buf)); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
conn->sock = sockfd; |
|
|
|
|
conn->readfrom = conn_recvfrom_packet; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cw_dbg(DBG_INFO,"Discovery to %s", sock_addr2str_p(&conn->addr,sock_buf)); |
|
|
|
|
|
|
|
|
|
cw_dbg(DBG_INFO, "Discovery to %s", |
|
|
|
|
sock_addr2str_p(&conn->addr, sock_buf)); |
|
|
|
|
|
|
|
|
|
run_discovery(conn); |
|
|
|
|
|
|
|
|
|
conn->readfrom=NULL; |
|
|
|
|
conn->readfrom = NULL; |
|
|
|
|
close(sockfd); |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -280,6 +270,3 @@ int cw_run_discovery(struct conn *conn, const char *addr, const char *bindaddr) |
|
|
|
|
|
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|