summaryrefslogtreecommitdiff
path: root/radsecproxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'radsecproxy.c')
-rw-r--r--radsecproxy.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/radsecproxy.c b/radsecproxy.c
index 2cdeae0..eb6942c 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1258,11 +1258,11 @@ struct clsrvconf *choosesrvconf(struct list *srvconfs) {
server = (struct clsrvconf *)entry->data;
if (!server->servers)
return server;
- if (server->servers->state == SERVER_STATE_FAILING)
+ if (server->servers->state == RSP_SERVER_STATE_FAILING)
continue;
if (!first)
first = server;
- if (server->servers->state == SERVER_STATE_STARTUP || server->servers->state == SERVER_STATE_RECONNECTING)
+ if (server->servers->state == RSP_SERVER_STATE_STARTUP || server->servers->state == RSP_SERVER_STATE_RECONNECTING)
continue;
if (!server->servers->lostrqs)
return server;
@@ -1751,10 +1751,10 @@ void *clientwr(void *arg) {
#define ZZZ 900
- server->state = SERVER_STATE_STARTUP;
+ server->state = RSP_SERVER_STATE_STARTUP;
if (server->dynamiclookuparg && !dynamicconfig(server)) {
dynconffail = 1;
- server->state = SERVER_STATE_FAILING;
+ server->state = RSP_SERVER_STATE_FAILING;
debug(DBG_WARN, "%s: dynamicconfig(%s: %s) failed, sleeping %ds",
__func__, server->conf->name, server->dynamiclookuparg, ZZZ);
sleep(ZZZ);
@@ -1765,7 +1765,7 @@ void *clientwr(void *arg) {
* dynamicconfig() above? */
if (!resolvehostports(conf->hostports, conf->hostaf, conf->pdef->socktype)) {
debug(DBG_WARN, "%s: resolve failed, sleeping %ds", __func__, ZZZ);
- server->state = SERVER_STATE_FAILING;
+ server->state = RSP_SERVER_STATE_FAILING;
sleep(ZZZ);
goto errexit;
}
@@ -1779,7 +1779,7 @@ void *clientwr(void *arg) {
if (conf->pdef->connecter) {
if (!conf->pdef->connecter(server, NULL, server->dynamiclookuparg ? 5 : 0, "clientwr")) {
- server->state = SERVER_STATE_FAILING;
+ server->state = RSP_SERVER_STATE_FAILING;
if (server->dynamiclookuparg) {
debug(DBG_WARN, "%s: connect failed, sleeping %ds",
__func__, ZZZ);
@@ -1789,11 +1789,11 @@ void *clientwr(void *arg) {
}
if (pthread_create(&clientrdth, &pthread_attr, conf->pdef->clientconnreader, (void *)server)) {
debugerrno(errno, DBG_ERR, "clientwr: pthread_create failed");
- server->state = SERVER_STATE_FAILING;
+ server->state = RSP_SERVER_STATE_FAILING;
goto errexit;
}
}
- server->state = SERVER_STATE_CONNECTED;
+ server->state = RSP_SERVER_STATE_CONNECTED;
for (;;) {
pthread_mutex_lock(&server->newrq_mutex);
@@ -1831,7 +1831,7 @@ void *clientwr(void *arg) {
for (i = 0; i < MAX_REQUESTS; i++) {
if (server->clientrdgone) {
- server->state = SERVER_STATE_FAILING;
+ server->state = RSP_SERVER_STATE_FAILING;
pthread_join(clientrdth, NULL);
goto errexit;
}
@@ -1882,7 +1882,7 @@ void *clientwr(void *arg) {
conf->pdef->clientradput(server, rqout->rq->buf);
pthread_mutex_unlock(rqout->lock);
}
- if (conf->statusserver && server->state == SERVER_STATE_CONNECTED) {
+ if (conf->statusserver && server->state == RSP_SERVER_STATE_CONNECTED) {
secs = server->lastrcv.tv_sec > laststatsrv.tv_sec ? server->lastrcv.tv_sec : laststatsrv.tv_sec;
gettimeofday(&now, NULL);
if (now.tv_sec - secs > STATUS_SERVER_PERIOD) {
@@ -2178,7 +2178,7 @@ struct list *createsubrealmservers(struct realm *realm, struct list *srvconfs) {
* the srvconfs list. */
if (addserver(srvconf)) {
srvconf->servers->dynamiclookuparg = stringcopy(realm->name, 0);
- srvconf->servers->state = SERVER_STATE_STARTUP;
+ srvconf->servers->state = RSP_SERVER_STATE_STARTUP;
debug(DBG_DBG, "%s: new client writer for %s",
__func__, srvconf->servers->conf->name);
if (pthread_create(&clientth, &pthread_attr, clientwr, (void *)(srvconf->servers))) {