if (server->rbios)
freebios(server->rbios);
free(server->dynamiclookuparg);
- if (server->ssl)
- SSL_free(server->ssl);
+ if (server->ssl) {
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ if (server->sock >= 0)
+ close(server->sock);
+#endif
+ SSL_free(server->ssl);
+ }
if (destroymutex) {
pthread_mutex_destroy(&server->lock);
pthread_cond_destroy(&server->newrq_cond);
struct list_node *entry;
for (entry = list_first(srvconfs); entry; entry = list_next(entry))
- if (((struct clsrvconf *)entry->data)->dynamiclookupcommand)
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ if (((struct clsrvconf *)entry->data)->dynamiclookupcommand
+ || ((struct clsrvconf *)entry->data)->servers->in_use)
+#else
+ if (((struct clsrvconf *)entry->data)->dynamiclookupcommand)
+#endif
return 1;
return 0;
}
conf = server->conf;
-#define ZZZ 60
+#define ZZZ 900
if (server->dynamiclookuparg && !dynamicconfig(server)) {
dynconffail = 1;
server->dynstartup = 0;
server->dynfailing = 1;
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ pthread_mutex_unlock(&server->lock);
+#endif
debug(DBG_WARN, "%s: dynamicconfig(%s) failed, sleeping %ds",
__func__, server->conf->name, ZZZ);
sleep(ZZZ);
goto errexit;
}
-
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ pthread_mutex_unlock(&server->lock);
+#endif
/* FIXME: Is resolving not always done by compileserverconfig(),
* either as part of static configuration setup or by
* dynamicconfig() above? */
- if (!resolvehostports(conf->hostports, conf->pdef->socktype)) {
+ if (!resolvehostports(conf->hostports, conf->hostaf, conf->pdef->socktype)) {
debug(DBG_WARN, "%s: resolve failed, sleeping %ds", __func__, ZZZ);
sleep(ZZZ);
goto errexit;
goto errexit;
}
server->connectionok = 1;
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ server->in_use = 1;
+#endif
if (pthread_create(&clientrdth, NULL, conf->pdef->clientconnreader, (void *)server)) {
debugerrno(errno, DBG_ERR, "clientwr: pthread_create failed");
goto errexit;
}
}
errexit:
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ server->in_use = 0;
+#endif
conf->servers = NULL;
if (server->dynamiclookuparg) {
removeserversubrealms(realms, conf);
int s = -1, on = 1, *sp = NULL;
struct hostportres *hp = newhostport(arg, protodefs[type]->portdefault, 0);
- if (!hp || !resolvehostport(hp, protodefs[type]->socktype, 1))
+ if (!hp || !resolvehostport(hp, AF_UNSPEC, protodefs[type]->socktype, 1))
debugx(1, DBG_ERR, "createlistener: failed to resolve %s", arg);
for (res = hp->addrinfo; res; res = res->ai_next) {
srvconf->servers->dynstartup = 1;
debug(DBG_DBG, "%s: new client writer for %s",
__func__, srvconf->servers->conf->name);
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ pthread_mutex_lock(&srvconf->servers->lock);
+#endif
if (pthread_create(&clientth, NULL, clientwr, (void *)(srvconf->servers))) {
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ pthread_mutex_unlock(&srvconf->servers->lock);
+#endif
debugerrno(errno, DBG_ERR, "pthread_create failed");
freeserver(srvconf->servers, 1);
srvconf->servers = NULL;
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ conf = srvconf;
+ continue;
+#endif
} else
pthread_detach(clientth);
+
+#if defined ENABLE_EXPERIMENTAL_DYNDISC
+ /* If clientwr() could not find a NAPTR we have to
+ * wait for dynfailing=1 what is set in clientwr(). */
+ pthread_mutex_lock(&srvconf->servers->lock);
+#endif
}
conf = srvconf;
}
}
if (status) {
- if (WEXITSTATUS(status) == 10) {
- debug(DBG_INFO, "dynamicconfig: command signals empty config");
- }
- else {
- debug(DBG_INFO, "dynamicconfig: command exited with status %d",
- WEXITSTATUS(status));
- goto errexit;
- }
+ debug(DBG_INFO, "dynamicconfig: command exited with status %d",
+ WEXITSTATUS(status));
+ goto errexit;
}
if (ok)
return 1;
}
+/** Set *AF according to IPV4ONLY and IPV6ONLY:
+ - If both are set, the function fails.
+ - If exactly one is set, *AF is set accordingly.
+ - If none is set, *AF is not affected.
+ Return 0 on success and !0 on failure.
+ In the case of an error, *AF is not affected. */
+int config_hostaf(const char *desc, int ipv4only, int ipv6only, int *af) {
+ assert(af != NULL);
+ if (ipv4only && ipv6only) {
+ debug(DBG_ERR, "error in block %s, at most one of IPv4Only and "
+ "IPv6Only can be enabled", desc);
+ return -1;
+ }
+ if (ipv4only)
+ *af = AF_INET;
+ if (ipv6only)
+ *af = AF_INET6;
+ return 0;
+}
+
int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *val) {
struct clsrvconf *conf;
char *conftype = NULL, *rewriteinalias = NULL;
long int dupinterval = LONG_MIN, addttl = LONG_MIN;
+ uint8_t ipv4only = 0, ipv6only = 0;
debug(DBG_DBG, "confclient_cb called for %s", block);
cf, block,
"type", CONF_STR, &conftype,
"host", CONF_MSTR, &conf->hostsrc,
+ "IPv4Only", CONF_BLN, &ipv4only,
+ "IPv6Only", CONF_BLN, &ipv6only,
"secret", CONF_STR, &conf->secret,
#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
"tls", CONF_STR, &conf->tls,
}
#endif
+ conf->hostaf = AF_UNSPEC;
+ if (config_hostaf("top level", options.ipv4only, options.ipv6only, &conf->hostaf))
+ debugx(1, DBG_ERR, "config error: ^");
+ if (config_hostaf(block, ipv4only, ipv6only, &conf->hostaf))
+ debugx(1, DBG_ERR, "error in block %s: ^", block);
+
if (dupinterval != LONG_MIN) {
if (dupinterval < 0 || dupinterval > 255)
debugx(1, DBG_ERR, "error in block %s, value of option DuplicateInterval is %d, must be 0-255", block, dupinterval);
}
if (!addhostport(&conf->hostports, conf->hostsrc, conf->pdef->portdefault, 1) ||
- !resolvehostports(conf->hostports, conf->pdef->socktype))
+ !resolvehostports(conf->hostports, conf->hostaf, conf->pdef->socktype))
debugx(1, DBG_ERR, "%s: resolve failed, exiting", __func__);
if (!conf->secret) {
return 0;
}
- if (!conf->dynamiclookupcommand && !resolvehostports(conf->hostports, conf->pdef->socktype)) {
+ if (!conf->dynamiclookupcommand &&
+ !resolvehostports(conf->hostports, conf->hostaf,
+ conf->pdef->socktype)) {
debug(DBG_ERR, "%s: resolve failed", __func__);
return 0;
}
struct clsrvconf *conf, *resconf;
char *conftype = NULL, *rewriteinalias = NULL;
long int retryinterval = LONG_MIN, retrycount = LONG_MIN, addttl = LONG_MIN;
+ uint8_t ipv4only = 0, ipv6only = 0;
debug(DBG_DBG, "confserver_cb called for %s", block);
if (!getgenericconfig(cf, block,
"type", CONF_STR, &conftype,
"host", CONF_MSTR, &conf->hostsrc,
+ "IPv4Only", CONF_BLN, &ipv4only,
+ "IPv6Only", CONF_BLN, &ipv6only,
"port", CONF_STR, &conf->portsrc,
"secret", CONF_STR, &conf->secret,
#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
free(conftype);
conftype = NULL;
+ conf->hostaf = AF_UNSPEC;
+ if (config_hostaf("top level", options.ipv4only, options.ipv6only, &conf->hostaf))
+ debugx(1, DBG_ERR, "config error: ^");
+ if (config_hostaf(block, ipv4only, ipv6only, &conf->hostaf))
+ goto errexit;
+
conf->pdef = protodefs[conf->type];
if (!conf->confrewritein)
"FTicksKey", CONF_STR, &fticks_key_str,
"FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
#endif
+ "IPv4Only", CONF_BLN, &options.ipv4only,
+ "IPv6Only", CONF_BLN, &options.ipv6only,
NULL
))
debugx(1, DBG_ERR, "configuration error");