#include "portab.h"
#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.221 2008/02/26 22:04:17 fw Exp $";
-
#include "imp.h"
#include <assert.h>
#ifdef PROTOTYPES
static int New_Connection PARAMS(( int Sock ));
static CONN_ID Socket2Index PARAMS(( int Sock ));
static void Read_Request PARAMS(( CONN_ID Idx ));
-static bool Handle_Buffer PARAMS(( CONN_ID Idx ));
+static void Handle_Buffer PARAMS(( CONN_ID Idx ));
static void Check_Connections PARAMS(( void ));
static void Check_Servers PARAMS(( void ));
static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
} /* NewListener */
+/**
+ * "Main Loop": Loop until shutdown or restart is signalled.
+ * This function loops until a shutdown or restart of ngIRCd is signalled and
+ * calls io_dispatch() to check for readable and writable sockets every second.
+ * It checks for status changes on pending connections (e. g. when a hostname
+ * has been resolved), checks for "penalties" and timeouts, and handles the
+ * input buffers.
+ */
GLOBAL void
-Conn_Handler( void )
+Conn_Handler(void)
{
- /* "Main Loop.": Loop until a signal (for shutdown or restart) arrives.
- * Call io_dispatch() to check for read/writeable sockets every second
- * Wait for status change on pending connections (e.g: when the hostname has been resolved)
- * check for penalty/timeouts
- * handle input buffers
- */
int i;
unsigned int wdatalen;
struct timeval tv;
time_t t;
- bool timeout;
- while(( ! NGIRCd_SignalQuit ) && ( ! NGIRCd_SignalRestart )) {
- timeout = true;
+ while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
+ t = time(NULL);
#ifdef ZEROCONF
- Rendezvous_Handler( );
+ Rendezvous_Handler();
#endif
/* Should the configuration be reloaded? */
- if (NGIRCd_SignalRehash) {
- NGIRCd_Rehash( );
- }
+ if (NGIRCd_SignalRehash)
+ NGIRCd_Rehash();
/* Check configured servers and established links */
- Check_Servers( );
- Check_Connections( );
-
- t = time( NULL );
-
- /* noch volle Lese-Buffer suchen */
- 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 ))
- {
- /* Kann aus dem Buffer noch ein Befehl extrahiert werden? */
- if (Handle_Buffer( i )) timeout = false;
+ Check_Servers();
+ Check_Connections();
+
+ /* Look for non-empty read buffers ... */
+ 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)) {
+ /* ... and try to handle the received data */
+ Handle_Buffer(i);
}
}
- /* noch volle Schreib-Puffer suchen */
- for( i = 0; i < Pool_Size; i++ ) {
- if ( My_Connections[i].sock <= NONE )
+ /* Look for non-empty write buffers ... */
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
continue;
wdatalen = (unsigned int)array_bytes(&My_Connections[i].wbuf);
-
#ifdef ZLIB
- if (( wdatalen > 0 ) || ( array_bytes(&My_Connections[i].zip.wbuf)> 0 ))
+ if (wdatalen > 0 ||
+ array_bytes(&My_Connections[i].zip.wbuf) > 0)
#else
- if ( wdatalen > 0 )
+ if (wdatalen > 0)
#endif
{
- /* Socket der Verbindung in Set aufnehmen */
- io_event_add( My_Connections[i].sock, IO_WANTWRITE );
+ /* Set the "WANTWRITE" flag on this socket */
+ io_event_add(My_Connections[i].sock,
+ IO_WANTWRITE);
}
}
- /* von welchen Sockets koennte gelesen werden? */
- for (i = 0; i < Pool_Size; i++ ) {
- if ( My_Connections[i].sock <= NONE )
+ /* Check from which sockets we possibly could read ... */
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
continue;
if (Resolve_INPROGRESS(&My_Connections[i].res_stat)) {
- /* wait for completion of Resolver Sub-Process */
- io_event_del( My_Connections[i].sock, IO_WANTREAD );
+ /* Wait for completion of resolver sub-process ... */
+ io_event_del(My_Connections[i].sock,
+ IO_WANTREAD);
continue;
}
- if ( Conn_OPTION_ISSET( &My_Connections[i], CONN_ISCONNECTING ))
- continue; /* wait for completion of connect() */
+ if (Conn_OPTION_ISSET(&My_Connections[i], CONN_ISCONNECTING))
+ /* Wait for completion of connect() ... */
+ continue;
- if( My_Connections[i].delaytime > t ) {
- /* Fuer die Verbindung ist eine "Penalty-Zeit" gesetzt */
- io_event_del( My_Connections[i].sock, IO_WANTREAD );
+ if (My_Connections[i].delaytime > t) {
+ /* There is a "penalty time" set: ignore socket! */
+ io_event_del(My_Connections[i].sock,
+ IO_WANTREAD);
continue;
}
- io_event_add( My_Connections[i].sock, IO_WANTREAD );
+ io_event_add(My_Connections[i].sock, IO_WANTREAD);
}
- /* (re-)set timeout - tv_sec/usec are undefined after io_dispatch() returns */
+ /* Set the timeout for reading from the network to 1 second,
+ * which is the granularity with witch we handle "penalty
+ * times" for example.
+ * Note: tv_sec/usec are undefined(!) after io_dispatch()
+ * returns, so we have to set it beforce each call to it! */
tv.tv_usec = 0;
- tv.tv_sec = timeout ? 1 : 0;
-
- /* wait for activity */
- i = io_dispatch( &tv );
- if (i == -1 && errno != EINTR ) {
- Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!", strerror(errno));
- Log(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME);
- exit( 1 );
+ tv.tv_sec = 1;
+
+ /* Wait for activity ... */
+ i = io_dispatch(&tv);
+ if (i == -1 && errno != EINTR) {
+ Log(LOG_EMERG, "Conn_Handler(): io_dispatch(): %s!",
+ strerror(errno));
+ Log(LOG_ALERT, "%s exiting due to fatal errors!",
+ PACKAGE_NAME);
+ exit(1);
}
}
- if( NGIRCd_SignalQuit ) Log( LOG_NOTICE|LOG_snotice, "Server going down NOW!" );
- else if( NGIRCd_SignalRestart ) Log( LOG_NOTICE|LOG_snotice, "Server restarting NOW!" );
+ if (NGIRCd_SignalQuit)
+ Log(LOG_NOTICE | LOG_snotice, "Server going down NOW!");
+ else if (NGIRCd_SignalRestart)
+ Log(LOG_NOTICE | LOG_snotice, "Server restarting NOW!");
} /* Conn_Handler */
/**
- * Handle data in connection read-buffer.
- * @return true if a reuqest was handled, false otherwise (and on errors).
+ * Handle all data in the connection read-buffer.
+ * All data is precessed until no complete command is left. When a fatal
+ * error occurs, the connection is shut down.
*/
-static bool
+static void
Handle_Buffer(CONN_ID Idx)
{
#ifndef STRICT_RFC
- char *ptr1, *ptr2;
+ char *ptr1, *ptr2, *first_eol;
#endif
char *ptr;
size_t 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 > starttime)
- return result;
+ return;
#ifdef ZLIB
/* Unpack compressed data, if compression is in use */
if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) {
+ /* When unzipping fails, Unzip_Buffer() shuts
+ * down the connection itself */
if (!Unzip_Buffer(Idx))
- return false;
+ return;
}
#endif
if (0 == array_bytes(&My_Connections[Idx].rbuf))
- break;
+ return;
/* Make sure that the buffer is NULL terminated */
- if (!array_cat0_temporary(&My_Connections[Idx].rbuf))
- return false;
+ if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) {
+ Conn_Close(Idx, NULL,
+ "Can't allocate memory [Handle_Buffer]",
+ true);
+ return;
+ }
/* RFC 2812, section "2.3 Messages", 5th paragraph:
* "IRC messages are always lines of characters terminated
ptr = strstr(array_start(&My_Connections[Idx].rbuf), "\r\n");
#ifndef STRICT_RFC
- if (!ptr) {
- /* Check for non-RFC-compliant request (only CR or
- * LF)? Unfortunately, there are quite a few clients
- * out there that do this -- incl. "mIRC" :-( */
- delta = 1;
- ptr1 = strchr(array_start(&My_Connections[Idx].rbuf), '\r');
- ptr2 = strchr(array_start(&My_Connections[Idx].rbuf), '\n');
+ /* Check for non-RFC-compliant request (only CR or LF)?
+ * Unfortunately, there are quite a few clients out there
+ * that do this -- e. g. mIRC, BitchX, and Trillian :-( */
+ ptr1 = strchr(array_start(&My_Connections[Idx].rbuf), '\r');
+ ptr2 = strchr(array_start(&My_Connections[Idx].rbuf), '\n');
+ if (ptr) {
+ /* Check if there is a single CR or LF _before_ the
+ * corerct CR+LF line terminator: */
+ first_eol = ptr1 < ptr2 ? ptr1 : ptr2;
+ if (first_eol < ptr) {
+ /* Single CR or LF before CR+LF found */
+ ptr = first_eol;
+ delta = 1;
+ }
+ } else if (ptr1 || ptr2) {
+ /* No CR+LF terminated command found, but single
+ * CR or LF found ... */
if (ptr1 && ptr2)
- ptr = ptr1 > ptr2 ? ptr2 : ptr1;
- else if (ptr1)
- ptr = ptr1;
- else if (ptr2)
- ptr = ptr2;
+ ptr = ptr1 < ptr2 ? ptr1 : ptr2;
+ else
+ ptr = ptr1 ? ptr1 : ptr2;
+ delta = 1;
}
#endif
if (!ptr)
- break;
+ return;
/* Complete (=line terminated) request found, handle it! */
*ptr = '\0';
Idx, array_bytes(&My_Connections[Idx].rbuf),
COMMAND_LEN - 1);
Conn_Close(Idx, NULL, "Request too long", true);
- return false;
+ return;
}
if (len <= delta) {
/* Request is empty (only '\r\n', '\r' or '\n');
* delta is 2 ('\r\n') or 1 ('\r' or '\n'), see above */
array_moveleft(&My_Connections[Idx].rbuf, 1, len);
- break;
+ return;
}
#ifdef ZLIB
My_Connections[Idx].msg_in++;
if (!Parse_Request
(Idx, (char *)array_start(&My_Connections[Idx].rbuf)))
- return false;
-
- result = true;
+ return;
array_moveleft(&My_Connections[Idx].rbuf, 1, len);
LogDebug("Connection %d: %d bytes left in read buffer.",
* to the unzip buffer for decompression: */
if (!array_copy
(&My_Connections[Idx].zip.rbuf,
- &My_Connections[Idx].rbuf))
- return false;
+ &My_Connections[Idx].rbuf)) {
+ Conn_Close(Idx, NULL,
+ "Can't allocate memory [Handle_Buffer]",
+ true);
+ return;
+ }
array_trunc(&My_Connections[Idx].rbuf);
LogDebug
}
#endif
}
- return result;
} /* Handle_Buffer */