SSL/TLS: proper indentation, remove erroneous comment

[ngircd-alex.git] / src / ngircd / conn.h

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index 08f6dde01766040d4cdd0b333de1a39be80ac273..28bbda357860efdcbf938afc127b296c480bd389 100644 (file)
--- a/src/ngircd/conn.h
+++ b/src/ngircd/conn.h
@@ -18,7 +18,13 @@
 
 #include <time.h>                      /* for time_t, see below */
 
-
+/*
+ * connection state flags. this is a bitmask -- all values must
+ * be unique and a power of two.
+ *
+ * If you introduce new ones in between, make sure to adjust all
+ * remaining ones.
+ */
 #define CONN_ISCLOSING         1       /* Conn_Close() already called */
 #define CONN_ISCONNECTING      2       /* connect() in progress */
 #define CONN_RFC1459           4       /* RFC 1459 compatibility mode */
@@ -29,10 +35,11 @@
 #include "conf-ssl.h"
 
 #ifdef SSL_SUPPORT
-#define CONN_SSL_CONNECT       8       /* wait for ssl connect to finish */
-#define CONN_SSL               16      /* this connection is SSL encrypted */
-#define CONN_SSL_WANT_WRITE    32      /* SSL/TLS library needs to write protocol data */
-#define CONN_SSL_WANT_READ     64      /* SSL/TLS library needs to read protocol data */
+#define CONN_SSL_CONNECT       16      /* wait for ssl connect to finish */
+#define CONN_SSL               32      /* this connection is SSL encrypted */
+#define CONN_SSL_WANT_WRITE    64      /* SSL/TLS library needs to write protocol data */
+#define CONN_SSL_WANT_READ     128     /* SSL/TLS library needs to read protocol data */
+#define CONN_SSL_FLAGS_ALL     (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ)
 #endif
 typedef int CONN_ID;
 
@@ -101,7 +108,7 @@ GLOBAL void Conn_Handler PARAMS(( void ));
 
 GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... ));
 
-GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient ));
+GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ));
 
 GLOBAL void Conn_SyncServerStruct PARAMS(( void ));