#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 ));
static bool Init_Socket PARAMS(( int Sock ));
static void New_Server PARAMS(( int Server, ng_ipaddr_t *dest ));
static void Simple_Message PARAMS(( int Sock, const char *Msg ));
-static int NewListener PARAMS(( int af, const UINT16 Port ));
+static int NewListener PARAMS(( const char *listen_addr, UINT16 Port ));
static array My_Listeners;
static array My_ConnArray;
+static size_t NumConnections;
#ifdef TCPWRAP
int allow_severity = LOG_INFO;
cb_listen(int sock, short irrelevant)
{
(void) irrelevant;
- New_Connection( sock );
+ if (New_Connection( sock ) >= 0)
+ NumConnections++;
}
/* Speicher fuer Verbindungs-Pool anfordern */
Pool_Size = CONNECTION_POOL;
- if( Conf_MaxConnections > 0 )
- {
- /* konfiguriertes Limit beachten */
- if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
- }
-
+ if ((Conf_MaxConnections > 0) &&
+ (Pool_Size > Conf_MaxConnections))
+ Pool_Size = Conf_MaxConnections;
+
if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Pool_Size)) {
Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
exit( 1 );
static unsigned int
-ports_initlisteners(array *a, int af, void (*func)(int,short))
+ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short))
{
unsigned int created = 0;
size_t len;
len = array_length(a, sizeof (UINT16));
port = array_start(a);
- while(len--) {
- fd = NewListener(af, *port);
+ while (len--) {
+ fd = NewListener(listen_addr, *port);
if (fd < 0) {
port++;
continue;
}
if (!io_event_create( fd, IO_WANTREAD, func )) {
Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!",
- fd, (unsigned int) *port, strerror(errno));
+ fd, (unsigned int) *port, strerror(errno));
close(fd);
port++;
continue;
created++;
port++;
}
-
return created;
}
Conn_InitListeners( void )
{
/* Initialize ports on which the server should accept connections */
-
unsigned int created = 0;
+ char *copy, *listen_addr;
if (!io_library_init(CONNECTION_POOL)) {
Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
return -1;
}
-#ifdef WANT_IPV6
- if (Conf_ListenIPv6)
- created = ports_initlisteners(&Conf_ListenPorts, AF_INET6, cb_listen);
-#endif
- if (Conf_ListenIPv4)
- created += ports_initlisteners(&Conf_ListenPorts, AF_INET, cb_listen);
+ assert(Conf_ListenAddress);
+ /* can't use Conf_ListenAddress directly, see below */
+ copy = strdup(Conf_ListenAddress);
+ if (!copy) {
+ Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, strerror(errno));
+ return 0;
+ }
+ listen_addr = strtok(copy, ",");
+
+ while (listen_addr) {
+ ngt_TrimStr(listen_addr);
+ if (*listen_addr)
+ created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen);
+
+ listen_addr = strtok(NULL, ",");
+ }
+
+ /*
+ * can't free() Conf_ListenAddress here. On /REHASH, if the config file
+ * cannot be re-loaded, we'd end up with a NULL Conf_ListenAddress.
+ * Instead, free() takes place in conf.c, before the config file
+ * is being parsed.
+ */
+ free(copy);
return created;
} /* Conn_InitListeners */
static bool
-InitSinaddrListenAddr(int af, ng_ipaddr_t *addr, UINT16 Port)
+InitSinaddrListenAddr(ng_ipaddr_t *addr, const char *listen_addrstr, UINT16 Port)
{
bool ret;
- const char *listen_addrstr = NULL;
-#ifdef WANT_IPV6
- if (af == AF_INET)
- listen_addrstr = "0.0.0.0";
-#else
- (void)af;
-#endif
- if (Conf_ListenAddress[0]) /* overrides V4/V6 atm */
- listen_addrstr = Conf_ListenAddress;
ret = ng_ipaddr_init(addr, listen_addrstr, Port);
if (!ret) {
- if (!listen_addrstr)
- listen_addrstr = "";
- Log(LOG_CRIT, "Can't bind to %s:%u: can't convert ip address \"%s\"",
- listen_addrstr, Port, listen_addrstr);
+ assert(listen_addrstr);
+ Log(LOG_CRIT, "Can't bind to [%s]:%u: can't convert ip address \"%s\"",
+ listen_addrstr, Port, listen_addrstr);
}
return ret;
}
/* return new listening port file descriptor or -1 on failure */
static int
-NewListener(int af, const UINT16 Port)
+NewListener(const char *listen_addr, UINT16 Port)
{
/* Create new listening socket on specified port */
ng_ipaddr_t addr;
- int sock;
+ int sock, af;
#ifdef ZEROCONF
char name[CLIENT_ID_LEN], *info;
#endif
- if (!InitSinaddrListenAddr(af, &addr, Port))
+ if (!InitSinaddrListenAddr(&addr, listen_addr, Port))
return -1;
- sock = socket(ng_ipaddr_af(&addr), SOCK_STREAM, 0);
+ af = ng_ipaddr_af(&addr);
+ sock = socket(af, SOCK_STREAM, 0);
if( sock < 0 ) {
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+ Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno));
return -1;
}
- af = ng_ipaddr_af(&addr);
-
set_v6_only(af, sock);
if (!Init_Socket(sock))
return -1;
}
-#ifdef WANT_IPV6
- if (af == AF_INET6)
- Log(LOG_INFO, "Now listening on [%s]:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
- else
-#endif
- Log(LOG_INFO, "Now listening on %s:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
+ Log(LOG_INFO, "Now listening on [%s]:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
#ifdef ZEROCONF
/* Get best server description text */
} /* 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 */
/* Clean up connection structure (=free it) */
Init_Conn_Struct( Idx );
- LogDebug("Shutdown of connection %d completed.", Idx );
+ assert(NumConnections > 0);
+ if (NumConnections)
+ NumConnections--;
+ LogDebug("Shutdown of connection %d completed", Idx );
} /* Conn_Close */
#endif
ng_ipaddr_t new_addr;
char ip_str[NG_INET_ADDRSTRLEN];
- int new_sock, new_sock_len, new_Pool_Size;
+ int new_sock, new_sock_len;
CLIENT *c;
long cnt;
Log(LOG_CRIT, "fd %d: Can't convert IP address!", new_sock);
Simple_Message(new_sock, "ERROR :Internal Server Error");
close(new_sock);
+ return -1;
}
#ifdef TCPWRAP
return -1;
}
- 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!", Pool_Size );
- Simple_Message( new_sock, "ERROR :Connection limit reached" );
- close( new_sock );
- return -1;
- }
+ if ((Conf_MaxConnections > 0) &&
+ (NumConnections >= (size_t) Conf_MaxConnections))
+ {
+ Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Conf_MaxConnections);
+ Simple_Message( new_sock, "ERROR :Connection limit reached" );
+ close( new_sock );
+ return -1;
+ }
+ if( new_sock >= Pool_Size ) {
if (!array_alloc(&My_ConnArray, sizeof(CONNECTION),
(size_t)new_sock)) {
Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
/* Adjust pointer to new block */
My_Connections = array_start(&My_ConnArray);
- while (Pool_Size < new_Pool_Size)
+ while (Pool_Size <= new_sock)
Init_Conn_Struct(Pool_Size++);
}
/**
- * 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 */
af_dest = ng_ipaddr_af(dest);
new_sock = socket(af_dest, SOCK_STREAM, 0);
if (new_sock < 0) {
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+ Log( LOG_CRIT, "Can't create socket (af %d) : %s!", af_dest, strerror( errno ));
return;
}
projects / ngircd-alex.git / blobdiff