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

If there is no DNS available on system start the capwap-wtp will stop while evaluating the configuration. I fixed that by checking if the address was yet translated on every address access. If not a DNS request is started before continuing.

Browse Source
This commit is contained in:
Moritz Rosenthal
2016-03-24 07:09:29 +01:00
parent 1d95a62061
commit 7b9f515bd7
4 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/wtp/wtp_dfa_idle.c
View File

@ -12,11 +12,12 @@ static int wtp_join_prefered_ac()
while (g_wtp.acpreferedselected < g_wtp.acpreferedarray->count)
{
union sockaddr_capwap localaddr;
union sockaddr_capwap *peeraddr;
struct addr_capwap *peeraddr;
/* Found in configuration file the AC address */
peeraddr = capwap_array_get_item_pointer(g_wtp.acpreferedarray,
g_wtp.acpreferedselected);
g_wtp.acpreferedselected);
/* Next AC */
g_wtp.acpreferedselected++;
@ -28,7 +29,18 @@ static int wtp_join_prefered_ac()
return -1;
}
if (capwap_connect_socket(&g_wtp.net, peeraddr) < 0) {
if(!peeraddr->resolved) {
if (capwap_address_from_string(peeraddr->fqdn, &peeraddr->socket)) {
if (!CAPWAP_GET_NETWORK_PORT(&peeraddr->socket)) {
CAPWAP_SET_NETWORK_PORT(&peeraddr->socket, CAPWAP_CONTROL_PORT);
}
peeraddr->resolved = 1;
} else {
capwap_logging_info("%s:%d Could not resolve application.acprefered.host %s", __FILE__, __LINE__, peeraddr->fqdn);
}
}
if (capwap_connect_socket(&g_wtp.net, &peeraddr->socket) < 0) {
capwap_logging_fatal("Cannot bind control address");
capwap_close_sockets(&g_wtp.net);
return -1;
@ -42,7 +54,7 @@ static int wtp_join_prefered_ac()
}
/* */
capwap_crypt_setconnection(&g_wtp.dtls, g_wtp.net.socket, &localaddr, peeraddr);
capwap_crypt_setconnection(&g_wtp.dtls, g_wtp.net.socket, &localaddr, &peeraddr->socket);
/* */
if (!g_wtp.enabledtls) {