From 85d3999d58aafa0127f45070c49fd23be2d03423 Mon Sep 17 00:00:00 2001
From: Fabian Mauchle <fabian.mauchle@switch.ch>
Date: Fri, 3 Mar 2017 11:04:56 +0100
Subject: - fix wrong comparison of server->state - move enum to top - prefix
 enum with rsp_ / RSP_

Conflicts:
	radsecproxy.c
---
 radsecproxy.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'radsecproxy.h')

diff --git a/radsecproxy.h b/radsecproxy.h
index 133b715..b362b1d 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -58,6 +58,13 @@ enum rsp_fticks_mac_type {
     RSP_FTICKS_MAC_FULLY_KEY_HASHED
 };
 
+enum rsp_server_state {
+    RSP_SERVER_STATE_STARTUP = 0, /* default */
+    RSP_SERVER_STATE_CONNECTED,
+    RSP_SERVER_STATE_RECONNECTING,
+    RSP_SERVER_STATE_FAILING
+};
+
 struct options {
     char *pidfile;
     char *logdestination;
@@ -156,14 +163,6 @@ struct client {
     time_t expiry; /* for udp */
 };
 
-enum server_state {
-    SERVER_STATE_STARTUP = 0, /* default */
-    SERVER_STATE_CONNECTED,
-    SERVER_STATE_RECONNECTING,
-    SERVER_STATE_FAILING
-};
-
-
 struct server {
     struct clsrvconf *conf;
     int sock;
@@ -173,7 +172,7 @@ struct server {
     uint8_t clientrdgone;
     struct timeval lastconnecttry;
     struct timeval lastreply;
-    enum server_state state;
+    enum rsp_server_state state;
     uint8_t lostrqs;
     char *dynamiclookuparg;
     int nextid;
-- 
cgit v1.1