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

wtp can send an empty discovery request

Browse Source 
FossilOrigin-Name: 440ee8b077901e593d994ef900088b648204f1c8637b35189a5cddd18ec8f08f
This commit is contained in:
7u83@mail.ru
2018-03-12 17:01:40 +00:00
parent 835dc82e6f
commit 8b2e36e912
21 changed files with 272 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wtp/Makefile
View File

@ -31,7 +31,7 @@ endif
#SRC=$(wildcard *.c)
SRC=wtp_main.c
SRC=wtp_main.c discovery.c
OBJS=$(patsubst %.c,%.o,$(SRC))
OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS))

208
src/wtp/discovery.c
View File

@ -1,145 +1,43 @@
/*
This file is part of AC-Tube.
AC-Tube is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
AC-Tube is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include "cw/capwap.h"
#include "cw/capwap_items.h"
#include "cw/log.h"
#include "cw/conn.h"
#include "cw/sock.h"
#include "cw/cw_util.h"
#include "cw/aciplist.h"
#include "cw/acpriolist.h"
#include "cw/ktv.h"
#include "cw/log.h"
#include "cw/dbg.h"
#include "cw/timer.h"
#include "wtp.h"
#include "wtp_conf.h"
#include "wtp_interface.h"
#include <stdio.h>
cw_aciplist_t cw_select_ac(struct conn *conn, mbag_t discs)
{
/* create a list for results */
cw_aciplist_t resultlist=cw_aciplist_create();
if (!resultlist)
return NULL;
if (!discs)
return resultlist;
/*
cw_aciplist_t aciplist = cw_aciplist_create();
if (!aciplist) {
cw_log(LOG_ERROR, "Can't allocate aciplist");
return NULL;
}
*/
/* get the AC Name with Priority list */
cw_acpriolist_t priolist;
priolist = mbag_get_mavl(conn->config, CW_ITEM_AC_NAME_WITH_PRIORITY);
if (!priolist )
priolist=cw_acpriolist_create();
/* for each discovery reponse */
DEFINE_AVLITER(i, discs);
avliter_foreach(&i){
mbag_t ac = ((mbag_item_t *) (avliter_get(&i)))->data;
/* get the ac name */
char *ac_name = mbag_get_str(ac, CW_ITEM_AC_NAME,NULL);
int prio = 256;
if (ac_name) {
/* See if we can find AC Name in Priority List */
if (priolist)
prio = cw_acpriolist_get(priolist, ac_name);
}
/* get the IP list, the current AC has sent */
cw_aciplist_t acips =
mbag_get_mavl(ac, CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST);
if (!acips)
continue;
/* for each IP from the current AC add it to the result list
* and give it the priority whe have determined */
DEFINE_AVLITER(i2, acips);
avliter_foreach(&i2){
cw_acip_t *acip = avliter_get(&i2);
cw_acip_t *n = malloc(sizeof(cw_acip_t));
memcpy(n,acip,sizeof(cw_acip_t));
/* we missuse the wtp_count to sort by
* priority and wp_count */
n->index |= prio<<16;
cw_aciplist_del(resultlist,n);
cw_aciplist_add(resultlist,n);
}
}
return resultlist;
}
static int run_discovery(struct conn *conn)
{
// conn->incomming = mbag_create();
/*// conn->incomming = mbag_create();*/
time_t timer;
conn->capwap_state = CAPWAP_STATE_DISCOVERY;
mbag_set_byte(conn->outgoing, CW_ITEM_DISCOVERY_TYPE,
/* mbag_set_byte(conn->outgoing, CW_ITEM_DISCOVERY_TYPE,
CAPWAP_DISCOVERY_TYPE_UNKNOWN);
*/
cw_init_request(conn, CAPWAP_MSG_DISCOVERY_REQUEST);
cw_put_msg(conn, conn->req_buffer);
conn_send_msg(conn, conn->req_buffer);
time_t timer = cw_timer_start(0);
timer = cw_timer_start(0);
while (!cw_timer_timeout(timer)
&& conn->capwap_state == CAPWAP_STATE_DISCOVERY) {
int rc;
mavl_del_all(conn->incomming);
int rc = cw_read_from(conn);
rc = cw_read_from(conn);
if (rc<0) {
if (errno==EAGAIN)
@ -150,7 +48,7 @@ static int run_discovery(struct conn *conn)
}
}
/*
mbag_t discs;
discs = mbag_get_mavl(conn->remote, CW_ITEM_DISCOVERIES);
@ -177,30 +75,66 @@ static int run_discovery(struct conn *conn)
mavl_del_all(conn->remote);
mbag_set_mavl(conn->local,CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST,list);
*/
return 1;
}
/**
* Run discovery for on address (eg broadcast 255.255.255.255)
*/
static int cw_run_discovery(struct conn *conn, const char *acaddr)
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 = PF_UNSPEC;
int rc = getaddrinfo(acaddr, conf_control_port, &hints, &res0);
strncpy(caddr, addr, sizeof(caddr));
/* try to convert the given address string to sockaddr */
rc = sock_strtoaddr(caddr,(struct sockaddr*)&dstaddr);
if (rc) {
cw_log(LOG_ERR, "Can't connect to AC %s: %s", acaddr, gai_strerror(rc));
int iport;
/* 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;
/* 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);
}
}
/*printf("Addr: %s, Port: %s\n",caddr,control_port);*/
rc = getaddrinfo(caddr, control_port, &hints, &res0);
if (rc) {
cw_log(LOG_ERR, "Can't connect to AC %s: %s", caddr, gai_strerror(rc));
return 0;
}
@ -210,7 +144,7 @@ static int cw_run_discovery(struct conn *conn, const char *acaddr)
int opt;
sockfd = socket(res->ai_family, SOCK_DGRAM, 0);
if (sockfd == -1) {
cw_log(LOG_ERR, "Can't create socket for %s: %s", acaddr,
cw_log(LOG_ERR, "Can't create socket for %s: %s", caddr,
strerror(errno));
continue;
}
@ -225,20 +159,25 @@ static int cw_run_discovery(struct conn *conn, const char *acaddr)
sock_copyaddr(&conn->addr, res->ai_addr);
if (conf_ip){
if (bindaddr){
int brc;
struct sockaddr bind_address;
sock_strtoaddr(conf_ip,&bind_address);
int brc = bind(sockfd,&bind_address,sock_addrlen(&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));
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));
run_discovery(conn);
conn->readfrom=NULL;
@ -253,13 +192,4 @@ static int cw_run_discovery(struct conn *conn, const char *acaddr)
}
int discovery()
{
struct conn *conn = get_conn();
printf("Radios = %d\n",conn->radios->count);
cw_run_discovery(conn, "255.255.255.255");
conn->capwap_state=CAPWAP_STATE_JOIN;
return 1;
}

1
src/wtp/wtp.h
View File

@ -14,6 +14,7 @@ extern int configure();
extern int run();
extern int changestate();
int cw_run_discovery(struct conn *conn, const char *acaddr, const char *bindaddr);
struct conn * get_conn();

35
src/wtp/wtp_main.c
View File

@ -10,12 +10,16 @@
#include "cw/log.h"
#include "cw/msgset.h"
#include "wtp.h"
struct bootcfg{
const char * modname;
const char * modpath;
const char * cfgfilename;
};
static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
{
int c;
@ -63,11 +67,10 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
int main (int argc, char **argv)
{
mavl_t types;
mavliter_t it;
struct bootcfg bootcfg;
struct cw_Mod * mod;
struct cw_MsgSet * msgset;
struct conn * conn;
parse_args(argc,argv, &bootcfg);
@ -82,29 +85,25 @@ int main (int argc, char **argv)
exit (EXIT_FAILURE);
}
/* Build a message set from our loaded modules */
mod->register_messages(msgset, CW_MOD_MODE_CAPWAP);
mod->register_messages(msgset, CW_MOD_MODE_BINDINGS);
types = cw_ktv_create_types_tree();
if (types == NULL){
perror("Error creating types tree");
/* create a connection object */
conn = conn_create_noq(-1, NULL);
if (conn==NULL){
cw_log(LOG_ERR, "Connot create conn: %s", strerror(errno));
exit(EXIT_FAILURE);
}
conn->detected = 1;
conn->dtls_verify_peer=0;
conn->dtls_mtu = 12000;
conn->msgset=msgset;
conn->local_cfg = cw_ktv_create();
cw_run_discovery(conn, "255.255.255.255","192.168.0.14");
mavl_add_ptr(types,CW_TYPE_BSTR16);
mavl_add_ptr(types,CW_TYPE_DWORD);
mavliter_init(&it,types);
mavliter_foreach(&it){
struct cw_Type * t = mavliter_get_ptr(&it);
printf("The Type is %s\n",t->name);
}
return (EXIT_SUCCESS);
}