- fix wrong comparison of server->state

- move enum to top
- prefix enum with rsp_ / RSP_

Conflicts:
	radsecproxy.c

1 files changed, 4 insertions, 4 deletions

diff --git a/tcp.c b/tcp.c
index c213594..c6b2f52 100644
--- a/tcp.c
+++ b/tcp.c
@@ -102,8 +102,8 @@ int tcpconnect(struct server *server, struct timeval *when, int timeout, char *t
 	    pthread_mutex_unlock(&server->lock);
 	    return 0;
 	}
-	if (server->state == SERVER_STATE_CONNECTED) {
-	    server->state = SERVER_STATE_RECONNECTING;
+	if (server->state == RSP_SERVER_STATE_CONNECTED) {
+	    server->state = RSP_SERVER_STATE_RECONNECTING;
 	    sleep(2);
 	} else if (elapsed < 1)
 	    sleep(2);
@@ -121,7 +121,7 @@ int tcpconnect(struct server *server, struct timeval *when, int timeout, char *t
 	if ((server->sock = connecttcphostlist(server->conf->hostports, srcres)) >= 0)
 	    break;
     }
-    server->state = SERVER_STATE_CONNECTED;
+    server->state = RSP_SERVER_STATE_CONNECTED;
     gettimeofday(&server->lastconnecttry, NULL);
     pthread_mutex_unlock(&server->lock);
     return 1;
@@ -202,7 +202,7 @@ int clientradputtcp(struct server *server, unsigned char *rad) {
     size_t len;
     struct clsrvconf *conf = server->conf;
 
-    if (!server->state == SERVER_STATE_CONNECTED)
+    if (server->state != RSP_SERVER_STATE_CONNECTED)
 	return 0;
     len = RADLEN(rad);
     if ((cnt = write(server->sock, rad, len)) <= 0) {