From 2f351f964dec7cab9bf830d9646e1ba8c940bf39 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 19 Nov 2009 11:24:14 +0000
Subject: [PATCH] Move connection state enums to slap.h to ease debugging

---
 servers/slapd/connection.c | 18 ------------------
 servers/slapd/slap.h       | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 80edfb0fd0..2f426d6106 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -52,24 +52,6 @@ static unsigned long conn_nextid = 0;
 
 static const char conn_lost_str[] = "connection lost";
 
-/* structure state (protected by connections_mutex) */
-enum sc_struct_state {
-	SLAP_C_UNINITIALIZED = 0,	/* MUST BE ZERO (0) */
-	SLAP_C_UNUSED,
-	SLAP_C_USED,
-	SLAP_C_PENDING
-};
-
-/* connection state (protected by c_mutex ) */
-enum sc_conn_state {
-	SLAP_C_INVALID = 0,		/* MUST BE ZERO (0) */
-	SLAP_C_INACTIVE,		/* zero threads */
-	SLAP_C_CLOSING,			/* closing */
-	SLAP_C_ACTIVE,			/* one or more threads */
-	SLAP_C_BINDING,			/* binding */
-	SLAP_C_CLIENT			/* outbound client conn */
-};
-
 const char *
 connection_state2str( int state )
 {
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index ef9c40f7b9..6015dbf837 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2762,9 +2762,26 @@ typedef struct Listener Listener;
 /*
  * represents a connection from an ldap client
  */
+/* structure state (protected by connections_mutex) */
+enum sc_struct_state {
+	SLAP_C_UNINITIALIZED = 0,	/* MUST BE ZERO (0) */
+	SLAP_C_UNUSED,
+	SLAP_C_USED,
+	SLAP_C_PENDING
+};
+
+/* connection state (protected by c_mutex ) */
+enum sc_conn_state {
+	SLAP_C_INVALID = 0,		/* MUST BE ZERO (0) */
+	SLAP_C_INACTIVE,		/* zero threads */
+	SLAP_C_CLOSING,			/* closing */
+	SLAP_C_ACTIVE,			/* one or more threads */
+	SLAP_C_BINDING,			/* binding */
+	SLAP_C_CLIENT			/* outbound client conn */
+};
 struct Connection {
-	int			c_struct_state; /* structure management state */
-	int			c_conn_state;	/* connection state */
+	enum sc_struct_state	c_struct_state; /* structure management state */
+	enum sc_conn_state	c_conn_state;	/* connection state */
 	int			c_conn_idx;		/* slot in connections array */
 	ber_socket_t	c_sd;
 	const char	*c_close_reason; /* why connection is closing */
-- 
2.39.5