7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rework socket and discovery handling

Browse Source 
Swtich sockets to connected when talking to a specific AC. Use
unconnected UDP sockets only during DISCOVERY.

In JOIN, we need send our local address. The old, routing table
based local address discovery is broken for many reasons (VRF,
policy routing, ...). With a connected socket, we can the same
information with a simple getsockname.

During DISCOVERY we are talking to all potential AC's at once.
So using an unconnected socket makes still sense.
This commit is contained in:
Andreas Schultz
2016-03-02 15:13:56 +01:00
parent 067eb8d11a
commit 8dc30ae3c4
5 changed files with 121 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/wtp/wtp_dfa_discovery.c
View File

@ -106,22 +106,30 @@ void wtp_dfa_state_discovery_timeout(struct capwap_timeout* timeout, unsigned lo
if (peeraddr.ss.ss_family != AF_UNSPEC) {
union sockaddr_capwap localaddr;
/* Retrieve local address */
if (!capwap_network_get_localaddress(&localaddr, &peeraddr, g_wtp.net.bindiface)) {
CAPWAP_SET_NETWORK_PORT(&localaddr, CAPWAP_GET_NETWORK_PORT(&g_wtp.net.localaddr));
/* */
capwap_crypt_setconnection(&g_wtp.dtls, g_wtp.net.socket, &localaddr, &peeraddr);
/* */
if (!g_wtp.enabledtls) {
wtp_send_join(); /* Bypass DTLS connection */
} else {
wtp_start_dtlssetup(); /* Create DTLS connection */
}
if (capwap_connect_socket(&g_wtp.net, &peeraddr) < 0) {
capwap_logging_fatal("Cannot bind control address");
capwap_close_sockets(&g_wtp.net);
return;
}
/* Retrieve local address */
if (capwap_getsockname(&g_wtp.net, &localaddr) < 0) {
capwap_logging_fatal("Cannot get local endpoint address");
capwap_close_sockets(&g_wtp.net);
return;
}
/* */
capwap_crypt_setconnection(&g_wtp.dtls, g_wtp.net.socket, &localaddr, &peeraddr);
/* */
if (!g_wtp.enabledtls) {
wtp_send_join(); /* Bypass DTLS connection */
} else {
wtp_start_dtlssetup(); /* Create DTLS connection */
}
return;
}
}
@ -136,6 +144,12 @@ void wtp_dfa_state_discovery_timeout(struct capwap_timeout* timeout, unsigned lo
struct capwap_header_data capwapheader;
struct capwap_packet_txmng* txmngpacket;
if (g_wtp.net.socket < 0)
if (capwap_bind_sockets(&g_wtp.net) < 0) {
capwap_logging_fatal("Cannot bind control address");
exit(-1);
}
/* Update status radio */
g_wtp.descriptor.radiosinuse = wtp_update_radio_in_use();
@ -184,7 +198,8 @@ void wtp_dfa_state_discovery_timeout(struct capwap_timeout* timeout, unsigned lo
}
/* */
void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet) {
void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet)
{
unsigned short binding;
struct capwap_array* controlip;
@ -192,7 +207,10 @@ void wtp_dfa_state_discovery(struct capwap_parsed_packet* packet) {
/* */
binding = GET_WBID_HEADER(packet->rxmngpacket->header);
if ((binding == g_wtp.binding) && (packet->rxmngpacket->ctrlmsg.type == CAPWAP_DISCOVERY_RESPONSE) && (g_wtp.localseqnumber == packet->rxmngpacket->ctrlmsg.seq)) {
if ((binding == g_wtp.binding) &&
(packet->rxmngpacket->ctrlmsg.type == CAPWAP_DISCOVERY_RESPONSE) &&
(g_wtp.localseqnumber == packet->rxmngpacket->ctrlmsg.seq))
{
struct capwap_resultcode_element* resultcode;
/* */