X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.h;h=869477f091f69f2f9ed2d7f6b40dbb8c7109a85b;hb=f27827d7937375b5348107ca7427abf74c9eff3d;hp=7dcc8d9d590619c143276d93b003c0c565d3a4e4;hpb=164954a78856893c9be03d95dac73e781e4f78f5;p=ngircd.git diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 7dcc8d9d..869477f0 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -42,7 +42,7 @@ #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 long CONN_ID; +typedef int CONN_ID; #include "client.h" #include "proc.h" @@ -54,6 +54,10 @@ typedef long CONN_ID; #include "tool.h" #include "ng_ipaddr.h" +#ifdef ICONV +# include +#endif + #ifdef ZLIB #include typedef struct _ZipData @@ -95,11 +99,25 @@ typedef struct _Connection #ifndef STRICT_RFC long auth_ping; /** PING response expected on login */ #endif +#ifdef ICONV + iconv_t iconv_from; /** iconv: convert from client to server */ + iconv_t iconv_to; /** iconv: convert from server to client */ +#endif } CONNECTION; -GLOBAL CONNECTION *My_Connections; -GLOBAL CONN_ID Pool_Size; -GLOBAL long WCounter; + +#ifdef CONN_MODULE_GLOBAL_INIT +CONNECTION *My_Connections; +CONN_ID Pool_Size; +long WCounter; +#else +extern CONNECTION *My_Connections; +extern CONN_ID Pool_Size; +extern long WCounter; +#endif + + +#define CONNECTION2ID(x) (long)(x - My_Connections) #endif /* CONN_MODULE */ @@ -112,6 +130,8 @@ GLOBAL void Conn_CloseAllSockets PARAMS((int ExceptOf)); GLOBAL unsigned int Conn_InitListeners PARAMS(( void )); GLOBAL void Conn_ExitListeners PARAMS(( void )); +GLOBAL void Conn_StartLogin PARAMS((CONN_ID Idx)); + GLOBAL void Conn_Handler PARAMS(( void )); GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... )); @@ -126,13 +146,13 @@ GLOBAL void Conn_SyncServerStruct PARAMS(( void )); GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd)); GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i)); GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i)); + +GLOBAL char *Conn_GetCertFp PARAMS((CONN_ID Idx)); +GLOBAL bool Conn_SetCertFp PARAMS((CONN_ID Idx, const char *fingerprint)); +GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx)); + #ifdef SSL_SUPPORT GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len)); -GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx)); -#else -static inline bool -Conn_UsesSSL(UNUSED CONN_ID Idx) -{ return false; } #endif GLOBAL const char *Conn_GetIPAInfo PARAMS((CONN_ID Idx));