#include "portab.h"
#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.176 2005/08/30 22:08:00 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.192 2006/04/23 10:37:27 fw Exp $";
#include "imp.h"
#include <assert.h>
static void Check_Servers PARAMS(( void ));
static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
static bool Init_Socket PARAMS(( int Sock ));
-static void New_Server PARAMS(( int Server, CONN_ID Idx ));
-static void Simple_Message PARAMS(( int Sock, char *Msg ));
+static void New_Server PARAMS(( int Server ));
+static void Simple_Message PARAMS(( int Sock, const char *Msg ));
static int Count_Connections PARAMS(( struct sockaddr_in addr ));
static int NewListener PARAMS(( const UINT16 Port ));
static array My_Listeners;
+static array My_ConnArray;
#ifdef TCPWRAP
int allow_severity = LOG_INFO;
static void server_login PARAMS((CONN_ID idx));
+static void cb_Read_Resolver_Result PARAMS(( int sock, UNUSED short what));
+static void cb_Connect_to_Server PARAMS(( int sock, UNUSED short what));
static void cb_clientserver PARAMS((int sock, short what));
static void
CLIENT *c;
CONN_ID idx = Socket2Index( sock );
if (idx <= NONE) {
-#ifdef DEBUG
- Log(LOG_DEBUG, "cb_connserver wants to write on unknown socket?!");
-#endif
+ LogDebug("cb_connserver wants to write on unknown socket?!");
io_close(sock);
return;
}
res = getsockopt( My_Connections[idx].sock, SOL_SOCKET, SO_ERROR, &err, &sock_len );
assert( sock_len == sizeof( err ));
- /* Fehler aufgetreten? */
- if(( res != 0 ) || ( err != 0 )) {
- if ( res != 0 )
- Log( LOG_CRIT, "getsockopt (connection %d): %s!", idx, strerror( errno ));
- else
- Log( LOG_CRIT, "Can't connect socket to \"%s:%d\" (connection %d): %s!",
- My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port,
- idx, strerror( err ));
-
- /* Clean up socket, connection and client structures */
- c = Client_GetFromConn( idx );
- if( c ) Client_DestroyNow( c );
- io_close( My_Connections[idx].sock );
- Init_Conn_Struct( idx );
-
- /* Bei Server-Verbindungen lasttry-Zeitpunkt auf "jetzt" setzen */
- Conf_Server[Conf_GetServer( idx )].lasttry = time( NULL );
- Conf_UnsetServer( idx );
- return;
+ /* Error while connecting? */
+ if ((res != 0) || (err != 0)) {
+ if (res != 0)
+ Log(LOG_CRIT, "getsockopt (connection %d): %s!",
+ idx, strerror(errno));
+ else
+ Log(LOG_CRIT,
+ "Can't connect socket to \"%s:%d\" (connection %d): %s!",
+ My_Connections[idx].host,
+ Conf_Server[Conf_GetServer(idx)].port,
+ idx, strerror(err));
+
+ /* Clean up the CLIENT structure (to avoid silly log
+ * messages) and call Conn_Close() to do the rest. */
+ c = Conn_GetClient(idx);
+ if (c)
+ Client_DestroyNow(c);
+
+ Conn_Close(idx, "Can't connect!", NULL, false);
+
+ return;
}
Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
}
-static void
-FreeRes_stat( CONNECTION *c )
-{
- assert( c != NULL );
- assert( c->res_stat != NULL );
-
- if (!c->res_stat) return;
-
- io_close( c->res_stat->pipe[0] );
-
- array_free(&c->res_stat->buffer);
- free( c->res_stat );
- c->res_stat = NULL;
-}
-
-
GLOBAL void
Conn_Init( void )
{
/* konfiguriertes Limit beachten */
if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
}
- My_Connections = (CONNECTION *) calloc( Pool_Size, sizeof( CONNECTION ) );
- if( ! My_Connections )
- {
- /* Speicher konnte nicht alloziert werden! */
+
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), Pool_Size)) {
Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
exit( 1 );
}
-#ifdef DEBUG
- Log( LOG_DEBUG, "Allocated connection pool for %d items (%ld bytes).", Pool_Size, sizeof( CONNECTION ) * Pool_Size );
-#endif
- array_free( &My_Listeners );
+ /* XXX: My_Connetions/Pool_Size are needed by other parts of the code; remove them */
+ My_Connections = (CONNECTION*) array_start(&My_ConnArray);
+
+ LogDebug("Allocated connection pool for %d items (%ld bytes).",
+ array_length(&My_ConnArray, sizeof( CONNECTION )), array_bytes(&My_ConnArray));
- /* Groesster File-Descriptor fuer select() */
- Conn_MaxFD = 0;
+ assert( array_length(&My_ConnArray, sizeof( CONNECTION )) >= (size_t) Pool_Size);
+
+ array_free( &My_Listeners );
/* Connection-Struktur initialisieren */
for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
CONN_ID idx;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Shutting down all connections ..." );
-#endif
+ LogDebug("Shutting down all connections ..." );
Conn_ExitListeners();
if( My_Connections[idx].sock > NONE ) {
Conn_Close( idx, NULL, NGIRCd_SignalRestart ?
"Server going down (restarting)":"Server going down", true );
- continue;
}
}
- free( My_Connections );
+ array_free(&My_ConnArray);
My_Connections = NULL;
Pool_Size = 0;
io_library_shutdown();
{
/* Close down all listening sockets */
int *fd;
- unsigned int arraylen;
+ size_t arraylen;
#ifdef ZEROCONF
Rendezvous_UnregisterListeners( );
#endif
arraylen = array_length(&My_Listeners, sizeof (int));
- Log( LOG_INFO, "Shutting down all listening sockets (%d)...", arraylen );
+ Log( LOG_INFO, "Shutting down all listening sockets (%d total)...", arraylen );
+ fd = array_start(&My_Listeners);
while(arraylen--) {
- fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen);
- if (fd) {
- close(*fd);
-#ifdef DEBUG
- Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
- } else {
- Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
-#endif
- }
+ assert(fd);
+ assert(*fd >= 0);
+ io_close(*fd);
+ LogDebug("Listening socket %d closed.", *fd );
+ fd++;
}
array_free(&My_Listeners);
} /* Conn_ExitListeners */
if( inaddr.s_addr == (unsigned)-1 )
#endif
{
- Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress );
+ Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!",
+ Conf_ListenAddress, Port, Conf_ListenAddress );
return -1;
}
}
else inaddr.s_addr = htonl( INADDR_ANY );
addr.sin_addr = inaddr;
- /* Socket erzeugen */
sock = socket( PF_INET, SOCK_STREAM, 0);
- if( sock < 0 )
- {
+ if( sock < 0 ) {
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
return -1;
}
if( ! Init_Socket( sock )) return -1;
- /* an Port binden */
- if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
- {
+ if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 ) {
Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
close( sock );
return -1;
}
- /* in "listen mode" gehen :-) */
- if( listen( sock, 10 ) != 0 )
- {
- Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
+ if( listen( sock, 10 ) != 0 ) {
+ Log( LOG_CRIT, "Can't listen on socket: %s!", strerror( errno ));
close( sock );
return -1;
}
- /* Neuen Listener in Strukturen einfuegen */
+ /* keep fd in list so we can close it when ngircd restarts/shuts down */
if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) {
Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno ));
close( sock );
int i;
unsigned int wdatalen;
struct timeval tv;
- time_t start, t;
+ time_t t;
bool timeout;
- start = time( NULL );
- while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart ))
- {
+ while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart )) {
timeout = true;
#ifdef ZEROCONF
#endif
/* Should the configuration be reloaded? */
- if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+ if (NGIRCd_SignalRehash) {
+ NGIRCd_Rehash( );
+ }
/* Check configured servers and established links */
Check_Servers( );
t = time( NULL );
/* noch volle Lese-Buffer suchen */
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
if(( My_Connections[i].sock > NONE ) && ( array_bytes(&My_Connections[i].rbuf) > 0 ) &&
( My_Connections[i].delaytime < t ))
{
if ( My_Connections[i].sock <= NONE )
continue;
- if ( My_Connections[i].res_stat ) {
+ if (Resolve_INPROGRESS(&My_Connections[i].res_stat)) {
/* wait for completion of Resolver Sub-Process */
io_event_del( My_Connections[i].sock, IO_WANTREAD );
continue;
io_event_add( My_Connections[i].sock, IO_WANTREAD );
}
- /* Timeout initialisieren */
+ /* (re-)set timeout - tv_sec/usec are undefined after io_dispatch() returns */
tv.tv_usec = 0;
- if( timeout ) tv.tv_sec = 1;
- else tv.tv_sec = 0;
+ tv.tv_sec = timeout ? 1 : 0;
- /* Auf Aktivitaet warten */
+ /* wait for activity */
i = io_dispatch( &tv );
if (i == -1 && errno != EINTR ) {
Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!", strerror(errno));
#endif
{
char buffer[COMMAND_LEN];
+ size_t len;
bool ok;
va_list ap;
Log(LOG_DEBUG, " -> connection %d: '%s'.", Idx, buffer);
#endif
- strlcat( buffer, "\r\n", sizeof( buffer ));
- ok = Conn_Write( Idx, buffer, strlen( buffer ));
+ len = strlcat( buffer, "\r\n", sizeof( buffer ));
+ ok = Conn_Write(Idx, buffer, len);
My_Connections[Idx].msg_out++;
va_end( ap );
* "Handler-Durchlauf" kann es passieren, dass dem nicht mehr so
* ist, wenn einer von mehreren Conn_Write()'s fehlgeschlagen ist.
* In diesem Fall wird hier einfach ein Fehler geliefert. */
- if( My_Connections[Idx].sock <= NONE )
- {
-#ifdef DEBUG
- Log( LOG_DEBUG, "Skipped write on closed socket (connection %d).", Idx );
-#endif
+ if( My_Connections[Idx].sock <= NONE ) {
+ LogDebug("Skipped write on closed socket (connection %d).", Idx );
return false;
}
if( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ISCLOSING )) {
/* Conn_Close() has been called recursively for this link;
* probabe reason: Handle_Write() failed -- see below. */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Recursive request to close connection: %d", Idx );
-#endif
+ LogDebug("Recursive request to close connection: %d", Idx );
return;
}
Log( LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ));
/* Search client, if any */
- c = Client_GetFromConn( Idx );
+ c = Conn_GetClient( Idx );
/* Should the client be informed? */
if (InformClient) {
Conn_WriteStr(Idx, "ERROR :Closing connection.");
}
- /* Try to write out the write buffer */
+ /* Try to write out the write buffer. Note: Handle_Write() eventually
+ * removes the CLIENT structure associated with this connection if an
+ * error occurs! So we have to re-check if there is still an valid
+ * CLIENT structure after calling Handle_Write() ...*/
(void)Handle_Write( Idx );
+ /* Search client, if any (re-check!) */
+ c = Conn_GetClient( Idx );
+
/* Shut down socket */
if( ! io_close( My_Connections[Idx].sock ))
{
Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
}
- /* Is there a resolver sub-process running? */
- if( My_Connections[Idx].res_stat )
- FreeRes_stat( &My_Connections[Idx] );
+ /* cancel running resolver */
+ if (Resolve_INPROGRESS(&My_Connections[Idx].res_stat)) {
+ Resolve_Shutdown(&My_Connections[Idx].res_stat);
+ }
/* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx );
/* Clean up connection structure (=free it) */
Init_Conn_Struct( Idx );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Shutdown of connection %d completed.", Idx );
-#endif
+ LogDebug("Shutdown of connection %d completed.", Idx );
} /* Conn_Close */
CONN_ID i;
int c;
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
/* Established connection? */
- if( My_Connections[i].sock <= NONE ) continue;
+ if (My_Connections[i].sock < 0)
+ continue;
/* Server connection? */
- client = Client_GetFromConn( i );
+ client = Conn_GetClient( i );
if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
for( c = 0; c < MAX_SERVERS; c++ )
if( ! Conf_Server[c].host[0] ) continue;
/* Duplicate? */
- if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+ if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 )
+ Conf_Server[c].conn_id = i;
}
}
} /* SyncServerStruct */
int len;
unsigned int wdatalen;
- Log(LOG_DEBUG, "Handle_Write");
assert( Idx > NONE );
if ( My_Connections[Idx].sock < 0 ) {
- Log(LOG_WARNING, "Handle_Write() on closed socket, idx %d", Idx);
+ LogDebug("Handle_Write() on closed socket, connection %d", Idx);
return false;
}
assert( My_Connections[Idx].sock > NONE );
+ LogDebug("Handle_Write() called for connection %d ...", Idx);
+
wdatalen = array_bytes(&My_Connections[Idx].wbuf );
#ifdef ZLIB
- if(( wdatalen == 0 ) && ( ! array_bytes(&My_Connections[Idx].zip.wbuf))) {
+ if (wdatalen == 0 && !array_bytes(&My_Connections[Idx].zip.wbuf)) {
io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
return true;
}
- /* write buffer empty, but not compression buf? -> flush compression buf. */
- if( wdatalen == 0 ) Zip_Flush( Idx );
+ /* write buffer empty, but not compression buffer?
+ * -> flush compression buffer! */
+ if (wdatalen == 0)
+ Zip_Flush(Idx);
#else
- if( wdatalen == 0 ) {
+ if (wdatalen == 0) {
io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
return true;
}
#endif
- wdatalen = array_bytes(&My_Connections[Idx].wbuf ); /* Zip_Flush may change wbuf */
- len = write( My_Connections[Idx].sock, array_start(&My_Connections[Idx].wbuf), wdatalen );
+ /* Zip_Flush() may have changed the write buffer ... */
+ wdatalen = array_bytes(&My_Connections[Idx].wbuf);
+
+ len = write(My_Connections[Idx].sock,
+ array_start(&My_Connections[Idx].wbuf), wdatalen );
+
if( len < 0 ) {
- if( errno == EAGAIN || errno == EINTR)
+ if (errno == EAGAIN || errno == EINTR)
return true;
- Log( LOG_ERR, "Write error on connection %d (socket %d): %s!", Idx,
- My_Connections[Idx].sock, strerror( errno ));
- Conn_Close( Idx, "Write error!", NULL, false );
+ Log(LOG_ERR, "Write error on connection %d (socket %d): %s!",
+ Idx, My_Connections[Idx].sock, strerror(errno));
+ Conn_Close(Idx, "Write error!", NULL, false);
return false;
}
struct request_info req;
#endif
struct sockaddr_in new_addr;
- int new_sock, new_sock_len;
- RES_STAT *s;
- CONN_ID idx;
+ int new_sock, new_sock_len, new_Pool_Size;
CLIENT *c;
- POINTER *ptr;
- long new_size, cnt;
+ long cnt;
assert( Sock > NONE );
/* Connection auf Listen-Socket annehmen */
#endif
/* Socket initialisieren */
- Init_Socket( new_sock );
+ if (!Init_Socket( new_sock ))
+ return -1;
/* Check IP-based connection limit */
cnt = Count_Connections( new_addr );
return -1;
}
- /* Freie Connection-Struktur suchen */
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
- if( idx >= Pool_Size )
- {
- new_size = Pool_Size + CONNECTION_POOL;
-
- /* Im bisherigen Pool wurde keine freie Connection-Struktur mehr gefunden.
- * Wenn erlaubt und moeglich muss nun der Pool vergroessert werden: */
-
- if( Conf_MaxConnections > 0 )
- {
- /* Es ist ein Limit konfiguriert */
- if( Pool_Size >= Conf_MaxConnections )
- {
- /* Mehr Verbindungen duerfen wir leider nicht mehr annehmen ... */
- Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Pool_Size );
- Simple_Message( new_sock, "ERROR :Connection limit reached" );
- close( new_sock );
- return -1;
- }
- if( new_size > Conf_MaxConnections ) new_size = Conf_MaxConnections;
- }
- if( new_size < Pool_Size )
+ if( new_sock >= Pool_Size ) {
+ new_Pool_Size = new_sock + 1;
+ /* No free Connection Structures, check if we may accept further connections */
+ if ((( Conf_MaxConnections > 0) && Pool_Size >= Conf_MaxConnections) ||
+ (new_Pool_Size < Pool_Size))
{
- Log( LOG_ALERT, "Can't accept connection: limit (%d) reached -- overflow!", Pool_Size );
+ Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Pool_Size );
Simple_Message( new_sock, "ERROR :Connection limit reached" );
close( new_sock );
return -1;
}
- ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
- if( ! ptr ) {
+ if (!array_alloc(&My_ConnArray, sizeof( CONNECTION ), new_sock)) {
Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
Simple_Message( new_sock, "ERROR: Internal error" );
close( new_sock );
return -1;
}
-
-#ifdef DEBUG
- Log( LOG_DEBUG, "Allocated new connection pool for %ld items (%ld bytes). [realloc()]", new_size, sizeof( CONNECTION ) * new_size );
-#endif
+ LogDebug("Bumped connection pool to %ld items (internal: %ld items, %ld bytes)",
+ new_sock, array_length(&My_ConnArray, sizeof(CONNECTION)), array_bytes(&My_ConnArray));
/* Adjust pointer to new block */
- My_Connections = (CONNECTION *)ptr;
-
- /* Initialize new items */
- for( idx = Pool_Size; idx < new_size; idx++ ) Init_Conn_Struct( idx );
- idx = Pool_Size;
-
- /* Adjust new pool size */
- Pool_Size = new_size;
+ My_Connections = array_start(&My_ConnArray);
+ Pool_Size = new_Pool_Size;
}
- /* Client-Struktur initialisieren */
- c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
+ c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
if( ! c ) {
Log( LOG_ALERT, "Can't accept connection: can't create client structure!" );
Simple_Message( new_sock, "ERROR :Internal error" );
return -1;
}
- /* Verbindung registrieren */
- Init_Conn_Struct( idx );
- My_Connections[idx].sock = new_sock;
- My_Connections[idx].addr = new_addr;
+ Init_Conn_Struct( new_sock );
+ My_Connections[new_sock].sock = new_sock;
+ My_Connections[new_sock].addr = new_addr;
+ My_Connections[new_sock].client = c;
- /* Neuen Socket registrieren */
+ /* register callback */
if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
Simple_Message( new_sock, "ERROR :Internal error" );
- Conn_Close( idx, "io_event_create() failed", NULL, false );
+ Conn_Close( new_sock, "io_event_create() failed", NULL, false );
return -1;
}
- Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", idx, inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
+ Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock,
+ inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
/* Hostnamen ermitteln */
- strlcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_addr ), sizeof( My_Connections[idx].host ));
- Client_SetHostname( c, My_Connections[idx].host );
-#ifdef IDENTAUTH
- s = Resolve_Addr( &new_addr, My_Connections[idx].sock );
-#else
- s = Resolve_Addr( &new_addr );
-#endif
- /* resolver process has been started */
- if( s ) My_Connections[idx].res_stat = s;
+ strlcpy( My_Connections[new_sock].host, inet_ntoa( new_addr.sin_addr ),
+ sizeof( My_Connections[new_sock].host ));
+
+ Client_SetHostname( c, My_Connections[new_sock].host );
+
+ Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
+ My_Connections[new_sock].sock, cb_Read_Resolver_Result);
/* Penalty-Zeit setzen */
- Conn_SetPenalty( idx, 4 );
+ Conn_SetPenalty( new_sock, 4 );
return new_sock;
} /* New_Connection */
{
/* zum Socket passende Connection suchen */
- CONN_ID idx;
-
- assert( Sock > NONE );
-
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == Sock ) break;
+ assert( Sock >= 0 );
- if( idx >= Pool_Size )
- {
+ if( Sock >= Pool_Size || My_Connections[Sock].sock != Sock ) {
/* die Connection wurde vermutlich (wegen eines
* Fehlers) bereits wieder abgebaut ... */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Socket2Index: can't get connection for socket %d!", Sock );
-#endif
+ LogDebug("Socket2Index: can't get connection for socket %d!", Sock);
return NONE;
}
- else return idx;
+ return Sock;
} /* Socket2Index */
* registered as a user, server or service connection. Don't update
* otherwise, so users have at least Conf_PongTimeout seconds time to
* register with the IRC server -- see Check_Connections(). */
- c = Client_GetFromConn(Idx);
+ c = Conn_GetClient(Idx);
if (c && (Client_Type(c) == CLIENT_USER
|| Client_Type(c) == CLIENT_SERVER
|| Client_Type(c) == CLIENT_SERVICE))
char *ptr;
int len, delta;
bool result;
+ time_t starttime;
#ifdef ZLIB
bool old_z;
#endif
+ starttime = time(NULL);
result = false;
for (;;) {
/* Check penalty */
- if( My_Connections[Idx].delaytime > time( NULL )) return result;
+ if( My_Connections[Idx].delaytime > starttime) return result;
#ifdef ZLIB
/* unpack compressed data */
if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP ))
result = true;
array_moveleft(&My_Connections[Idx].rbuf, 1, len);
-#ifdef DEBUG
- Log(LOG_DEBUG, "%u byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf));
-#endif
-
+ LogDebug("Connection %d: %d bytes left in read buffer.",
+ Idx, array_bytes(&My_Connections[Idx].rbuf));
#ifdef ZLIB
if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) &&
( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
return false;
array_trunc(&My_Connections[Idx].rbuf);
-#ifdef DEBUG
- Log( LOG_DEBUG, "Moved already received data (%u bytes) to uncompression buffer.",
+ LogDebug("Moved already received data (%u bytes) to uncompression buffer.",
array_bytes(&My_Connections[Idx].zip.rbuf));
-#endif /* DEBUG */
}
#endif /* ZLIB */
}
-
return result;
} /* Handle_Buffer */
CONN_ID i;
for( i = 0; i < Pool_Size; i++ ) {
- if( My_Connections[i].sock == NONE ) continue;
+ if (My_Connections[i].sock < 0)
+ continue;
- c = Client_GetFromConn( i );
+ c = Conn_GetClient( i );
if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE )))
{
/* connected User, Server or Service */
/* we already sent a ping */
if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) {
/* Timeout */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout );
-#endif
+ LogDebug("Connection %d: Ping timeout: %d seconds.",
+ i, Conf_PongTimeout );
Conn_Close( i, NULL, "Ping timeout", true );
}
}
else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) {
/* we need to sent a PING */
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d: sending PING ...", i );
-#endif
+ LogDebug("Connection %d: sending PING ...", i );
My_Connections[i].lastping = time( NULL );
Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( )));
}
if (My_Connections[i].lastdata <
time(NULL) - Conf_PongTimeout) {
-#ifdef DEBUG
- Log(LOG_DEBUG,
- "Unregistered connection %d timed out ...",
- i);
-#endif
+ LogDebug("Unregistered connection %d timed out ...", i);
Conn_Close(i, NULL, "Timeout", false);
}
}
{
/* Check if we can establish further server links */
- RES_STAT *s;
- CONN_ID idx;
int i, n;
-
- /* Search all connections, are there results from the resolver? */
- for( idx = 0; idx < Pool_Size; idx++ ) {
- if( My_Connections[idx].sock != SERVER_WAIT ) continue;
-
- /* IP resolved? */
- if( My_Connections[idx].res_stat == NULL ) New_Server( Conf_GetServer( idx ), idx );
- }
+ time_t time_now;
/* Check all configured servers */
for( i = 0; i < MAX_SERVERS; i++ ) {
/* Is there already a connection in this group? */
if( Conf_Server[i].group > NONE ) {
- for( n = 0; n < MAX_SERVERS; n++ ) {
- if( n == i ) continue;
- if(( Conf_Server[n].conn_id > NONE ) &&
- ( Conf_Server[n].group == Conf_Server[i].group ))
+ for (n = 0; n < MAX_SERVERS; n++) {
+ if (n == i) continue;
+ if ((Conf_Server[n].conn_id > NONE) &&
+ (Conf_Server[n].group == Conf_Server[i].group))
break;
}
if (n < MAX_SERVERS) continue;
}
/* Check last connect attempt? */
- if( Conf_Server[i].lasttry > time( NULL ) - Conf_ConnectRetry ) continue;
+ time_now = time(NULL);
+ if( Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry))
+ continue;
/* Okay, try to connect now */
- Conf_Server[i].lasttry = time( NULL );
-
- /* Search free connection structure */
- for( idx = 0; idx < Pool_Size; idx++ ) if( My_Connections[idx].sock == NONE ) break;
- if( idx >= Pool_Size )
- {
- Log( LOG_ALERT, "Can't establist server connection: connection limit reached (%d)!", Pool_Size );
- return;
- }
-#ifdef DEBUG
- Log( LOG_DEBUG, "Preparing connection %d for \"%s\" ...", idx, Conf_Server[i].host );
-#endif
-
- /* Verbindungs-Struktur initialisieren */
- Init_Conn_Struct( idx );
- My_Connections[idx].sock = SERVER_WAIT;
- Conf_Server[i].conn_id = idx;
-
- /* Resolve Hostname. If this fails, try to use it as an IP address */
- strlcpy( Conf_Server[i].ip, Conf_Server[i].host, sizeof( Conf_Server[i].ip ));
- strlcpy( My_Connections[idx].host, Conf_Server[i].host, sizeof( My_Connections[idx].host ));
- s = Resolve_Name( Conf_Server[i].host );
-
- /* resolver process running? */
- if( s ) My_Connections[idx].res_stat = s;
+ Conf_Server[i].lasttry = time_now;
+ assert(Resolve_Getfd(&Conf_Server[i].res_stat) < 0);
+ Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server);
}
} /* Check_Servers */
static void
-New_Server( int Server, CONN_ID Idx )
+New_Server( int Server )
{
/* Establish new server link */
CLIENT *c;
assert( Server > NONE );
- assert( Idx > NONE );
-
- /* Did we get a valid IP address? */
- if( ! Conf_Server[Server].ip[0] ) {
- /* No. Free connection structure and abort: */
- Log( LOG_ERR, "Can't connect to \"%s\": ip address unknown!", Conf_Server[Server].host );
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
- return;
- }
Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ", Conf_Server[Server].host,
Conf_Server[Server].ip, Conf_Server[Server].port );
if( inaddr.s_addr == (unsigned)-1 )
#endif
{
- /* Can't convert IP address */
- Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): can't convert ip address %s!", Conf_Server[Server].host, Idx, Conf_Server[Server].ip );
- goto out;
+ Log( LOG_ERR, "Can't connect to \"%s\": can't convert ip address %s!",
+ Conf_Server[Server].host, Conf_Server[Server].ip );
+ return;
}
memset( &new_addr, 0, sizeof( new_addr ));
new_sock = socket( PF_INET, SOCK_STREAM, 0 );
if ( new_sock < 0 ) {
- /* Can't create socket */
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
- goto out;
+ return;
}
if( ! Init_Socket( new_sock )) return;
res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
if(( res != 0 ) && ( errno != EINPROGRESS )) {
- /* Can't connect socket */
Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
close( new_sock );
- goto out;
+ return;
+ }
+
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), new_sock)) {
+ Log( LOG_ALERT, "Cannot allocate memory for server connection (socket %d)", new_sock);
+ close( new_sock );
+ return;
}
- /* Client-Struktur initialisieren */
- c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
+ My_Connections = array_start(&My_ConnArray);
+
+ assert(My_Connections[new_sock].sock <= 0);
+
+ Init_Conn_Struct(new_sock);
+
+ c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
if( ! c ) {
- /* Can't create new client structure */
Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
close( new_sock );
- goto out;
+ return;
}
Client_SetIntroducer( c, c );
Client_SetToken( c, TOKEN_OUTBOUND );
/* Register connection */
- My_Connections[Idx].sock = new_sock;
- My_Connections[Idx].addr = new_addr;
- strlcpy( My_Connections[Idx].host, Conf_Server[Server].host, sizeof( My_Connections[Idx].host ));
+ Conf_Server[Server].conn_id = new_sock;
+ My_Connections[new_sock].sock = new_sock;
+ My_Connections[new_sock].addr = new_addr;
+ My_Connections[new_sock].client = c;
+ strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host,
+ sizeof(My_Connections[new_sock].host ));
/* Register new socket */
if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
- Conn_Close( Idx, "io_event_create() failed", NULL, false );
- goto out;
+ Conn_Close( new_sock, "io_event_create() failed", NULL, false );
+ Init_Conn_Struct( new_sock );
+ Conf_Server[Server].conn_id = NONE;
}
-#ifdef DEBUG
- Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
-#endif
- Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
- return;
-out:
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
+ LogDebug("Registered new connection %d on socket %d.",
+ new_sock, My_Connections[new_sock].sock );
+ Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );
} /* New_Server */
/* Connection-Struktur initialisieren */
memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
- My_Connections[Idx].sock = NONE;
+ My_Connections[Idx].sock = -1;
My_Connections[Idx].lastdata = now;
My_Connections[Idx].lastprivmsg = now;
+ Resolve_Init(&My_Connections[Idx].res_stat);
} /* Init_Conn_Struct */
/* Set type of service (TOS) */
#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
value = IPTOS_LOWDELAY;
-#ifdef DEBUG
- Log( LOG_DEBUG, "Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
-#endif
+ LogDebug("Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
{
Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
} /* Init_Socket */
-GLOBAL
-void Read_Resolver_Result( int r_fd )
+
+static void
+cb_Connect_to_Server(int fd, UNUSED short events)
+{
+ /* Read result of resolver sub-process from pipe and start connection */
+ int i;
+ size_t len;
+ char readbuf[HOST_LEN + 1];
+
+ LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
+
+ for (i=0; i < MAX_SERVERS; i++) {
+ if (Resolve_Getfd(&Conf_Server[i].res_stat) == fd )
+ break;
+ }
+
+ if( i >= MAX_SERVERS) {
+ /* Ops, no matching server found?! */
+ io_close( fd );
+ LogDebug("Resolver: Got Forward Lookup callback for unknown server!?");
+ return;
+ }
+
+ /* Read result from pipe */
+ len = Resolve_Read(&Conf_Server[i].res_stat, readbuf, sizeof readbuf -1);
+ if (len == 0)
+ return;
+
+ readbuf[len] = '\0';
+ LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
+ strlcpy( Conf_Server[i].ip, readbuf, sizeof( Conf_Server[i].ip ));
+
+ /* connect() */
+ New_Server(i);
+} /* cb_Read_Forward_Lookup */
+
+
+static void
+cb_Read_Resolver_Result( int r_fd, UNUSED short events )
{
/* Read result of resolver sub-process from pipe and update the
* apropriate connection/client structure(s): hostname and/or
* IDENT user name.*/
CLIENT *c;
- int bytes_read, i, n;
- unsigned int len;
- RES_STAT *s;
- char *ptr;
- char *bufptr;
- char readbuf[HOST_LEN];
+ int i;
+ size_t len;
+ char *identptr;
+#ifdef IDENTAUTH
+ char readbuf[HOST_LEN + 2 + CLIENT_USER_LEN];
+#else
+ char readbuf[HOST_LEN + 1];
+#endif
+
+ LogDebug("Resolver: Got callback on fd %d, events %d", r_fd, events );
- Log( LOG_DEBUG, "Resolver: started, fd %d", r_fd );
/* Search associated connection ... */
for( i = 0; i < Pool_Size; i++ ) {
if(( My_Connections[i].sock != NONE )
- && ( My_Connections[i].res_stat != NULL )
- && ( My_Connections[i].res_stat->pipe[0] == r_fd ))
+ && ( Resolve_Getfd(&My_Connections[i].res_stat) == r_fd ))
break;
}
- if( i >= Pool_Size )
- {
+ if( i >= Pool_Size ) {
/* Ops, none found? Probably the connection has already
* been closed!? We'll ignore that ... */
io_close( r_fd );
-#ifdef DEBUG
- Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
-#endif
+ LogDebug("Resolver: Got callback for unknown connection!?");
return;
}
- /* Get resolver structure */
- s = My_Connections[i].res_stat;
- assert( s != NULL );
-
/* Read result from pipe */
- bytes_read = read( r_fd, readbuf, sizeof readbuf -1 );
- if( bytes_read < 0 ) {
- /* Error! */
- Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
- FreeRes_stat( &My_Connections[i] );
- return;
- }
- len = (unsigned int) bytes_read;
- readbuf[len] = '\0';
- if (!array_catb(&s->buffer, readbuf, len)) {
- Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
- FreeRes_stat(&My_Connections[i]);
+ len = Resolve_Read(&My_Connections[i].res_stat, readbuf, sizeof readbuf -1);
+ if (len == 0)
return;
- }
- if (!array_cat0_temporary(&s->buffer)) {
- Log( LOG_CRIT, "Resolver: Can't append result %s to buffer: %s", readbuf, strerror( errno ));
- FreeRes_stat(&My_Connections[i]);
+ readbuf[len] = '\0';
+ identptr = strchr(readbuf, '\n');
+ assert(identptr != NULL);
+ if (!identptr) {
+ Log( LOG_CRIT, "Resolver: Got malformed result!");
return;
}
- /* If the result string is incomplete, return to main loop and
- * wait until we can read in more bytes. */
-#ifdef IDENTAUTH
-try_resolve:
-#endif
- bufptr = (char*) array_start(&s->buffer);
- assert(bufptr != NULL);
- ptr = strchr( bufptr, '\n' );
- if( ! ptr ) return;
- *ptr = '\0';
-
-#ifdef DEBUG
- Log( LOG_DEBUG, "Got result from resolver: \"%s\" (%u bytes read), stage %d.", bufptr, len, s->stage);
-#endif
-
+ *identptr = '\0';
+ LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
/* Okay, we got a complete result: this is a host name for outgoing
- * connections and a host name or IDENT user name (if enabled) for
+ * connections and a host name and IDENT user name (if enabled) for
* incoming connections.*/
- if( My_Connections[i].sock > NONE )
- {
- /* Incoming connection. Search client ... */
- c = Client_GetFromConn( i );
- assert( c != NULL );
-
- /* Only update client information of unregistered clients */
- if( Client_Type( c ) == CLIENT_UNKNOWN )
- {
- switch(s->stage) {
- case 0: /* host name */
- strlcpy( My_Connections[i].host, bufptr, sizeof( My_Connections[i].host));
+ assert ( My_Connections[i].sock >= 0 );
+ /* Incoming connection. Search client ... */
+ c = Conn_GetClient( i );
+ assert( c != NULL );
- Client_SetHostname( c, bufptr);
+ /* Only update client information of unregistered clients */
+ if( Client_Type( c ) == CLIENT_UNKNOWN ) {
+ strlcpy(My_Connections[i].host, readbuf, sizeof( My_Connections[i].host));
+ Client_SetHostname( c, readbuf);
#ifdef IDENTAUTH
- /* clean up buffer for IDENT result */
- len = strlen(bufptr) + 1;
- assert(len <= array_bytes(&s->buffer));
- array_moveleft(&s->buffer, 1, len);
-
- /* Don't close pipe and clean up, but
- * instead wait for IDENT result */
- s->stage = 1;
- goto try_resolve;
-
- case 1: /* IDENT user name */
- if (array_bytes(&s->buffer)) {
- bufptr = (char*) array_start(&s->buffer);
- Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, bufptr);
- Client_SetUser( c, bufptr, true );
- }
- else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
-#endif
- break;
- default:
- Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
- }
+ ++identptr;
+ if (*identptr) {
+ Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, identptr);
+ Client_SetUser( c, identptr, true );
+ } else {
+ Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
}
+#endif
+ }
#ifdef DEBUG
else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
#endif
- }
- else
- {
- /* Outgoing connection (server link): set the IP address
- * so that we can connect to it in the main loop. */
-
- /* Search server ... */
- n = Conf_GetServer( i );
- assert( n > NONE );
-
- bufptr = (char*) array_start(&s->buffer);
- strlcpy( Conf_Server[n].ip, bufptr, sizeof( Conf_Server[n].ip ));
- }
-
- /* Clean up ... */
- FreeRes_stat( &My_Connections[i] );
-
/* Reset penalty time */
Conn_ResetPenalty( i );
-} /* Read_Resolver_Result */
+} /* cb_Read_Resolver_Result */
static void
-Simple_Message( int Sock, char *Msg )
+Simple_Message( int Sock, const char *Msg )
{
char buf[COMMAND_LEN];
+ size_t len;
/* Write "simple" message to socket, without using compression
* or even the connection write buffers. Used e.g. for error
* messages by New_Connection(). */
assert( Msg != NULL );
strlcpy( buf, Msg, sizeof buf - 2);
- strlcat( buf, "\r\n", sizeof buf);
- (void)write( Sock, buf, strlen( buf ) );
+ len = strlcat( buf, "\r\n", sizeof buf);
+ (void)write(Sock, buf, len);
} /* Simple_Error */
int i, cnt;
cnt = 0;
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++;
}
return cnt;
} /* Count_Connections */
+GLOBAL CLIENT *
+Conn_GetClient( CONN_ID Idx )
+{
+ /* return Client-Structure that belongs to the local Connection Idx.
+ * If none is found, return NULL.
+ */
+ CONNECTION *c;
+ assert( Idx >= 0 );
+
+ c = array_get(&My_ConnArray, sizeof (CONNECTION), Idx);
+
+ assert(c != NULL);
+
+ return c ? c->client : NULL;
+}
/* -eof- */
projects / ngircd-alex.git / blobdiff