/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2019 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Please read the file COPYING, README and AUTHORS for more information.
*/
-#undef DEBUG_BUFFER
-
#define CONN_MODULE
+#define CONN_MODULE_GLOBAL_INIT
#include "portab.h"
-#include "conf-ssl.h"
-#include "io.h"
/**
* @file
* Connection management
*/
-#include "imp.h"
+/* Additionan debug messages related to buffer handling: 0=off / 1=on */
+#define DEBUG_BUFFER 0
+
#include <assert.h>
#ifdef PROTOTYPES
# include <stdarg.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
+#include <strings.h>
#include <sys/socket.h>
-#include <sys/time.h>
+#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
#include <netinet/in.h>
# include <tcpd.h> /* for TCP Wrappers */
#endif
-#include "array.h"
-#include "defines.h"
-
-#include "exp.h"
#include "conn.h"
-#include "imp.h"
#include "ngircd.h"
-#include "array.h"
-#include "client.h"
#include "class.h"
-#include "conf.h"
-#include "conn-encoding.h"
+#ifdef ICONV
+# include "conn-encoding.h"
+#endif
#include "conn-ssl.h"
#include "conn-zip.h"
#include "conn-func.h"
+#include "io.h"
#include "log.h"
#include "ng_ipaddr.h"
#include "parse.h"
#include "resolve.h"
-#include "tool.h"
-
-#include "exp.h"
-
-#define SERVER_WAIT (NONE - 1)
+#define SERVER_WAIT (NONE - 1) /** "Wait for outgoing connection" flag */
-#define MAX_COMMANDS 3
-#define MAX_COMMANDS_SERVER_MIN 10
-#define MAX_COMMANDS_SERVICE 10
+#define MAX_COMMANDS 3 /** Max. commands per loop for users */
+#define MAX_COMMANDS_SERVER_MIN 10 /** Min. commands per loop for servers */
+#define MAX_COMMANDS_SERVICE 10 /** Max. commands per loop for services */
-#define SD_LISTEN_FDS_START 3
+#define SD_LISTEN_FDS_START 3 /** systemd(8) socket activation offset */
+#define THROTTLE_CMDS 1 /** Throttling: max commands reached */
+#define THROTTLE_BPS 2 /** Throttling: max bps reached */
static bool Handle_Write PARAMS(( CONN_ID Idx ));
static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len ));
static void Simple_Message PARAMS(( int Sock, const char *Msg ));
static int NewListener PARAMS(( const char *listen_addr, UINT16 Port ));
static void Account_Connection PARAMS((void));
-
+static void Throttle_Connection PARAMS((const CONN_ID Idx, CLIENT *Client,
+ const int Reason, unsigned int Value));
static array My_Listeners;
static array My_ConnArray;
#ifdef SSL_SUPPORT
extern struct SSLOptions Conf_SSLOptions;
+static bool SSL_WantRead PARAMS((const CONNECTION *c));
+static bool SSL_WantWrite PARAMS((const CONNECTION *c));
+static void cb_listen_ssl PARAMS((int sock, short irrelevant));
static void cb_connserver_login_ssl PARAMS((int sock, short what));
static void cb_clientserver_ssl PARAMS((int sock, short what));
#endif
time_t idle_t = 0;
-
/**
* Get number of sockets available from systemd(8).
*
return count;
}
-
/**
* IO callback for listening sockets: handle new connections. This callback
* gets called when a new non-SSL connection should be accepted.
(void) New_Connection(sock, false);
}
-
-#ifdef SSL_SUPPORT
-/**
- * IO callback for listening SSL sockets: handle new connections. This callback
- * gets called when a new SSL-enabled connection should be accepted.
- *
- * @param sock Socket descriptor.
- * @param irrelevant (ignored IO specification)
- */
-static void
-cb_listen_ssl(int sock, short irrelevant)
-{
- int fd;
-
- (void) irrelevant;
- fd = New_Connection(sock, true);
- if (fd < 0)
- return;
- io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl);
-}
-#endif
-
-
/**
* IO callback for new outgoing non-SSL server connections.
*
CONN_ID idx = Socket2Index( sock );
if (idx <= NONE) {
- LogDebug("cb_connserver wants to write on unknown socket?!");
io_close(sock);
return;
}
server_login(idx);
}
-
/**
* Login to a remote server.
*
io_event_add( My_Connections[idx].sock, IO_WANTREAD|IO_WANTWRITE);
/* Send PASS and SERVER command to peer */
- Conn_WriteStr( idx, "PASS %s %s", Conf_Server[Conf_GetServer( idx )].pwd_out, NGIRCd_ProtoID );
- Conn_WriteStr( idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
-}
-
-
-#ifdef SSL_SUPPORT
-/**
- * IO callback for new outgoing SSL-enabled server connections.
- *
- * @param sock Socket descriptor.
- * @param unused (ignored IO specification)
- */
-static void
-cb_connserver_login_ssl(int sock, short unused)
-{
- CONN_ID idx = Socket2Index(sock);
-
- assert(idx >= 0);
- if (idx < 0) {
- io_close(sock);
- return;
- }
- (void) unused;
- switch (ConnSSL_Connect( &My_Connections[idx])) {
- case 1: break;
- case 0: LogDebug("ConnSSL_Connect: not ready");
- return;
- case -1:
- Log(LOG_ERR, "SSL connection on socket %d failed!", sock);
- Conn_Close(idx, "Can't connect", NULL, false);
- return;
- }
-
- Log( LOG_INFO, "SSL connection %d with \"%s:%d\" established.", idx,
- My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
-
- server_login(idx);
+ Conn_WriteStr(idx, "PASS %s %s",
+ Conf_Server[Conf_GetServer( idx )].pwd_out, NGIRCd_ProtoID);
+ Conn_WriteStr(idx, "SERVER %s :%s",
+ Conf_ServerName, Conf_ServerInfo);
}
-#endif
-
/**
* IO callback for established non-SSL client and server connections.
{
CONN_ID idx = Socket2Index(sock);
- assert(idx >= 0);
-
- if (idx < 0) {
+ if (idx <= NONE) {
io_close(sock);
return;
}
+
#ifdef SSL_SUPPORT
if (what & IO_WANTREAD
|| (Conn_OPTION_ISSET(&My_Connections[idx], CONN_SSL_WANT_WRITE))) {
Handle_Write(idx);
}
-
-#ifdef SSL_SUPPORT
-/**
- * IO callback for new SSL-enabled client and server connections.
- *
- * @param sock Socket descriptor.
- * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...).
- */
-static void
-cb_clientserver_ssl(int sock, UNUSED short what)
-{
- CONN_ID idx = Socket2Index(sock);
-
- assert(idx >= 0);
-
- if (idx < 0) {
- io_close(sock);
- return;
- }
-
- switch (ConnSSL_Accept(&My_Connections[idx])) {
- case 1:
- break; /* OK */
- case 0:
- return; /* EAGAIN: callback will be invoked again by IO layer */
- default:
- Conn_Close(idx,
- "SSL accept error, closing socket", "SSL accept error",
- false);
- return;
- }
-
- io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */
-}
-#endif
-
-
/**
* Initialize connection module.
*/
GLOBAL void
Conn_Init( void )
{
- CONN_ID i;
-
- Pool_Size = CONNECTION_POOL;
- if ((Conf_MaxConnections > 0) &&
- (Pool_Size > Conf_MaxConnections))
- Pool_Size = Conf_MaxConnections;
+ int size;
- if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Pool_Size)) {
- Log(LOG_EMERG, "Can't allocate memory! [Conn_Init]");
+ /* Initialize the "connection pool".
+ * FIXME: My_Connetions/Pool_Size is needed by other parts of the
+ * code; remove them! */
+ Pool_Size = 0;
+ size = Conf_MaxConnections > 0 ? Conf_MaxConnections : CONNECTION_POOL;
+ if (Socket2Index(size) <= NONE) {
+ Log(LOG_EMERG, "Failed to initialize connection pool!");
exit(1);
}
- /* FIXME: My_Connetions/Pool_Size is 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));
-
- assert(array_length(&My_ConnArray, sizeof(CONNECTION)) >= (size_t)Pool_Size);
-
+ /* Initialize "listener" array. */
array_free( &My_Listeners );
-
- for (i = 0; i < Pool_Size; i++)
- Init_Conn_Struct(i);
} /* Conn_Init */
-
/**
* Clean up connection module.
*/
io_library_shutdown();
} /* Conn_Exit */
-
/**
* Close all sockets (file descriptors) of open connections.
* This is useful in forked child processes, for example, to make sure that
}
}
-
/**
* Initialize listening ports.
*
return created;
}
-
/**
* Initialize all listening sockets.
*
for (i = 0; i < count; i++) {
fd = SD_LISTEN_FDS_START + i;
addr_len = (int)sizeof(addr);
- getsockname(fd, (struct sockaddr *)&addr, (socklen_t*)&addr_len);
+ getsockname(fd, (struct sockaddr *)&addr,
+ (socklen_t*)&addr_len);
#ifdef WANT_IPV6
- if (addr.sin4.sin_family != AF_INET && addr.sin4.sin_family != AF_INET6)
+ if (addr.sin4.sin_family != AF_INET
+ && addr.sin4.sin_family != AF_INET6)
#else
if (addr.sin4.sin_family != AF_INET)
#endif
{
- /* Socket is of unsupported type! For example, systemd passed in
- * an IPv6 socket but ngIRCd isn't compiled with IPv6 support. */
+ /* Socket is of unsupported type! For example,
+ * systemd passed in an IPv6 socket but ngIRCd
+ * isn't compiled with IPv6 support. */
switch (addr.sin4.sin_family)
{
case AF_UNSPEC: af_str = "AF_UNSPEC"; break;
return created;
} /* Conn_InitListeners */
-
/**
* Shut down all listening sockets.
*/
array_free(&My_Listeners);
} /* Conn_ExitListeners */
-
/**
* Bind a socket to a specific (source) address.
*
ret = ng_ipaddr_init(addr, listen_addrstr, Port);
if (!ret) {
assert(listen_addrstr);
- Log(LOG_CRIT, "Can't bind to [%s]:%u: can't convert ip address \"%s\"!",
- listen_addrstr, Port, listen_addrstr);
+ Log(LOG_CRIT,
+ "Can't listen on [%s]:%u: Failed to parse IP address!",
+ listen_addrstr, Port);
}
return ret;
}
-
/**
* Set a socket to "IPv6 only". If the given socket doesn't belong to the
* AF_INET6 family, or the operating system doesn't support this functionality,
#endif
}
-
/**
* Initialize new listening port.
*
return sock;
} /* NewListener */
-
-#ifdef SSL_SUPPORT
-
-/**
- * Check if SSL library needs to read SSL-protocol related data.
- *
- * SSL/TLS connections require extra treatment:
- * When either CONN_SSL_WANT_WRITE or CONN_SSL_WANT_READ is set, we
- * need to take care of that first, before checking read/write buffers.
- * For instance, while we might have data in our write buffer, the
- * TLS/SSL protocol might need to read internal data first for TLS/SSL
- * writes to succeed.
- *
- * If this function returns true, such a condition is met and we have
- * to reverse the condition (check for read even if we've data to write,
- * do not check for read but writeability even if write-buffer is empty).
- *
- * @param c Connection to check.
- * @returns true if SSL-library has to read protocol data.
- */
-static bool
-SSL_WantRead(const CONNECTION *c)
-{
- if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_READ)) {
- io_event_add(c->sock, IO_WANTREAD);
- return true;
- }
- return false;
-}
-
-/**
- * Check if SSL library needs to write SSL-protocol related data.
- *
- * Please see description of SSL_WantRead() for full description!
- *
- * @param c Connection to check.
- * @returns true if SSL-library has to write protocol data.
- */
-static bool
-SSL_WantWrite(const CONNECTION *c)
-{
- if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_WRITE)) {
- io_event_add(c->sock, IO_WANTWRITE);
- return true;
- }
- return false;
-}
-
-#else
-
-static inline bool
-SSL_WantRead(UNUSED const CONNECTION *c)
-{ return false; }
-
-static inline bool
-SSL_WantWrite(UNUSED const CONNECTION *c)
-{ return false; }
-
-#endif
-
-
/**
* "Main Loop": Loop until shutdown or restart is signalled.
*
Conn_Handler(void)
{
int i;
- unsigned int wdatalen, bytes_processed;
+ size_t wdatalen;
struct timeval tv;
time_t t;
+ Log(LOG_NOTICE, "Server \"%s\" (on \"%s\") ready.",
+ Client_ID(Client_ThisServer()), Client_Hostname(Client_ThisServer()));
+
while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
t = time(NULL);
if ((My_Connections[i].sock > NONE)
&& (array_bytes(&My_Connections[i].rbuf) > 0)) {
/* ... and try to handle the received data */
- bytes_processed = Handle_Buffer(i);
- /* if we processed data, and there might be
- * more commands in the input buffer, do not
- * try to read any more data now */
- if (bytes_processed &&
- array_bytes(&My_Connections[i].rbuf) > 2) {
- LogDebug
- ("Throttling connection %d: command limit reached!",
- i);
- Conn_SetPenalty(i, 1);
- }
+ Handle_Buffer(i);
}
}
if (My_Connections[i].sock <= NONE)
continue;
- wdatalen = (unsigned int)array_bytes(&My_Connections[i].wbuf);
+ wdatalen = array_bytes(&My_Connections[i].wbuf);
#ifdef ZLIB
if (wdatalen > 0 ||
array_bytes(&My_Connections[i].zip.wbuf) > 0)
if (wdatalen > 0)
#endif
{
+#ifdef SSL_SUPPORT
if (SSL_WantRead(&My_Connections[i]))
continue;
+#endif
io_event_add(My_Connections[i].sock,
IO_WANTWRITE);
}
continue;
#ifdef SSL_SUPPORT
if (SSL_WantWrite(&My_Connections[i]))
- continue; /* TLS/SSL layer needs to write data; deal with this first */
+ /* TLS/SSL layer needs to write data; deal
+ * with this first! */
+ continue;
#endif
if (Proc_InProgress(&My_Connections[i].proc_stat)) {
/* Wait for completion of forked subprocess
Log(LOG_NOTICE | LOG_snotice, "Server restarting NOW!");
} /* Conn_Handler */
-
/**
* Write a text string into the socket of a connection.
*
GLOBAL bool
Conn_WriteStr(CONN_ID Idx, const char *Format, ...)
#else
-GLOBAL bool
+GLOBAL bool
Conn_WriteStr(Idx, Format, va_alist)
CONN_ID Idx;
const char *Format;
size_t len;
bool ok;
va_list ap;
+ int r;
assert( Idx > NONE );
assert( Format != NULL );
#else
va_start( ap );
#endif
- if (vsnprintf( buffer, COMMAND_LEN - 2, Format, ap ) >= COMMAND_LEN - 2 ) {
+ r = vsnprintf(buffer, COMMAND_LEN - 2, Format, ap);
+ if (r >= COMMAND_LEN - 2 || r == -1) {
/*
* The string that should be written to the socket is longer
* than the allowed size of COMMAND_LEN bytes (including both
* IRC_WriteXXX() functions when the prefix of this server had
* to be added to an already "quite long" command line which
* has been received from a regular IRC client, for example.
- *
+ *
* We are not allowed to send such "oversized" messages to
* other servers and clients, see RFC 2812 2.3 and 2813 3.3
* ("these messages SHALL NOT exceed 512 characters in length,
* an other server only routing the message!), so the only
* option left is to shorten the string and to hope that the
* result is still somewhat useful ...
+ *
+ * Note:
+ * C99 states that vsnprintf() "returns the number of characters
+ * that would have been printed if the n were unlimited"; but
+ * according to the Linux manual page "glibc until 2.0.6 would
+ * return -1 when the output was truncated" -- so we have to
+ * handle both cases ...
* -alex-
*/
return true;
} /* Conn_Write */
-
/**
* Shut down a connection.
*
* connection statistics before disconnecting it.
*/
GLOBAL void
-Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient )
+Conn_Close(CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient)
{
/* Close connection. Open pipes of asynchronous resolver
* sub-processes are closed down. */
* the calculation of in_p and out_p: in_z_k and out_z_k
* are non-zero, that's guaranteed by the protocol until
* compression can be enabled. */
- if (! in_z_k)
+ if (in_z_k <= 0)
in_z_k = in_k;
- if (! out_z_k)
+ if (out_z_k <= 0)
out_z_k = out_k;
in_p = (int)(( in_k * 100 ) / in_z_k );
out_p = (int)(( out_k * 100 ) / out_z_k );
idle_t = NumConnections > 0 ? 0 : time(NULL);
} /* Conn_Close */
-
/**
* Get current number of connections.
*
return NumConnections;
} /* Conn_Count */
-
/**
* Get number of maximum simultaneous connections.
*
return NumConnectionsMax;
} /* Conn_CountMax */
-
/**
* Get number of connections accepted since the daemon startet.
*
return NumConnectionsAccepted;
} /* Conn_CountAccepted */
-
/**
* Synchronize established connections and configured server structures
* after a configuration update and store the correct connection IDs, if any.
}
} /* SyncServerStruct */
-
/**
* Get IP address string of a connection.
*
return ng_ipaddr_tostr(&My_Connections[Idx].addr);
}
-
/**
* Send out data of write buffer; connect new sockets.
*
return true;
}
-#ifdef DEBUG_BUFFER
+#if DEBUG_BUFFER
LogDebug
("Handle_Write() called for connection %d, %ld bytes pending ...",
Idx, wdatalen);
#ifdef SSL_SUPPORT
if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_SSL )) {
- len = ConnSSL_Write(&My_Connections[Idx], array_start(&My_Connections[Idx].wbuf), wdatalen);
+ len = ConnSSL_Write(&My_Connections[Idx],
+ array_start(&My_Connections[Idx].wbuf),
+ wdatalen);
} else
#endif
{
return true;
} /* Handle_Write */
-
/**
* Count established connections to a specific IP address.
*
return cnt;
} /* Count_Connections */
-
/**
* Initialize new client connection on a listening socket.
*
/* Check global connection limit */
if ((Conf_MaxConnections > 0) &&
(NumConnections >= (size_t) Conf_MaxConnections)) {
- Log(LOG_ALERT, "Can't accept connection: limit (%d) reached!",
- Conf_MaxConnections);
+ Log(LOG_ALERT, "Can't accept new connection on socket %d: Limit (%d) reached!",
+ Sock, Conf_MaxConnections);
Simple_Message(new_sock, "ERROR :Connection limit reached");
close(new_sock);
return -1;
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]");
- Simple_Message(new_sock, "ERROR: Internal error");
- close(new_sock);
- return -1;
- }
- 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 = array_start(&My_ConnArray);
- while (Pool_Size <= new_sock)
- Init_Conn_Struct(Pool_Size++);
+ if (Socket2Index(new_sock) <= NONE) {
+ Simple_Message(new_sock, "ERROR: Internal error");
+ close(new_sock);
+ return -1;
}
/* register callback */
return new_sock;
} /* New_Connection */
-
/**
* Finish connection initialization, start resolver subprocess.
*
ident_sock = My_Connections[Idx].sock;
#endif
- if (Conf_NoticeAuth) {
- /* Send "NOTICE AUTH" messages to the client */
+ if (Conf_NoticeBeforeRegistration) {
+ /* Send "NOTICE *" messages to the client */
#ifdef IDENTAUTH
if (Conf_Ident)
(void)Conn_WriteStr(Idx,
- "NOTICE AUTH :*** Looking up your hostname and checking ident");
+ "NOTICE * :*** Looking up your hostname and checking ident");
else
#endif
(void)Conn_WriteStr(Idx,
- "NOTICE AUTH :*** Looking up your hostname");
+ "NOTICE * :*** Looking up your hostname");
/* Send buffered data to the client, but break on errors
* because Handle_Write() would have closed the connection
* again in this case! */
ident_sock, cb_Read_Resolver_Result);
}
-
/**
* Update global connection counters.
*/
NumConnections, NumConnectionsMax);
} /* Account_Connection */
-
/**
- * Translate socket handle into connection index.
+ * Translate socket handle into connection index (for historical reasons, it is
+ * a 1:1 mapping today) and enlarge the "connection pool" accordingly.
*
* @param Sock Socket handle.
- * @returns Connecion index or NONE, if no connection could be found.
+ * @returns Connecion index or NONE when the pool is too small.
*/
static CONN_ID
Socket2Index( int Sock )
{
- assert( Sock >= 0 );
+ assert(Sock > 0);
+ assert(Pool_Size >= 0);
+
+ if (Sock < Pool_Size)
+ return Sock;
- if( Sock >= Pool_Size || My_Connections[Sock].sock != Sock ) {
- /* the Connection was already closed again, likely due to
- * an error. */
- LogDebug("Socket2Index: can't get connection for socket %d!", Sock);
+ /* Try to allocate more memory ... */
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Sock)) {
+ Log(LOG_EMERG,
+ "Can't allocate memory to enlarge connection pool!");
return NONE;
}
- return Sock;
-} /* Socket2Index */
+ LogDebug("Enlarged connection pool for %ld sockets (%ld items, %ld bytes)",
+ Sock, array_length(&My_ConnArray, sizeof(CONNECTION)),
+ array_bytes(&My_ConnArray));
+
+ /* Adjust pointer to new block, update size and initialize new items. */
+ My_Connections = array_start(&My_ConnArray);
+ while (Pool_Size <= Sock)
+ Init_Conn_Struct(Pool_Size++);
+ return Sock;
+}
/**
* Read data from the network to the read buffer. If an error occurs,
{
/* Read buffer is full */
Log(LOG_ERR,
- "Receive buffer space exhausted (connection %d): %d bytes",
- Idx, array_bytes(&My_Connections[Idx].rbuf));
+ "Receive buffer space exhausted (connection %d): %d/%d bytes",
+ Idx, array_bytes(&My_Connections[Idx].rbuf), READBUFFER_LEN);
Conn_Close(Idx, "Receive buffer space exhausted", NULL, false);
return;
}
if (len == 0) {
LogDebug("Client \"%s:%u\" is closing connection %d ...",
My_Connections[Idx].host,
- ng_ipaddr_tostr(&My_Connections[Idx].addr), Idx);
+ ng_ipaddr_getport(&My_Connections[Idx].addr), Idx);
Conn_Close(Idx, NULL, "Client closed connection", false);
return;
}
Log(LOG_ERR,
"Could not append received data to input buffer (connection %d): %d bytes!",
Idx, len);
- Conn_Close(Idx, "Receive buffer space exhausted", NULL, false );
+ Conn_Close(Idx, "Receive buffer space exhausted", NULL,
+ false );
}
}
/* Update connection statistics */
My_Connections[Idx].bytes_in += len;
+
+ /* Handle read buffer */
My_Connections[Idx].bps += Handle_Buffer(Idx);
/* Make sure that there is still a valid client registered */
}
/* Look at the data in the (read-) buffer of this connection */
- if (Client_Type(c) != CLIENT_SERVER
- && Client_Type(c) != CLIENT_UNKNOWNSERVER
- && Client_Type(c) != CLIENT_SERVICE
- && My_Connections[Idx].bps >= maxbps) {
- LogDebug("Throttling connection %d: BPS exceeded! (%u >= %u)",
- Idx, My_Connections[Idx].bps, maxbps);
- Conn_SetPenalty(Idx, 1);
- }
+ if (My_Connections[Idx].bps >= maxbps)
+ Throttle_Connection(Idx, c, THROTTLE_BPS, maxbps);
} /* Read_Request */
-
/**
* Handle all data in the connection read-buffer.
*
maxcmd *= 5;
break;
case CLIENT_SERVICE:
- maxcmd = MAX_COMMANDS_SERVICE; break;
+ maxcmd = MAX_COMMANDS_SERVICE;
+ break;
+ case CLIENT_USER:
+ if (Client_HasMode(c, 'F'))
+ maxcmd = MAX_COMMANDS_SERVICE;
+ break;
}
for (i=0; i < maxcmd; i++) {
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: */
+ * correct CR+LF line terminator: */
first_eol = ptr1 < ptr2 ? ptr1 : ptr2;
if (first_eol < ptr) {
/* Single CR or LF before CR+LF found */
return 0; /* error -> connection has been closed */
array_moveleft(&My_Connections[Idx].rbuf, 1, len);
-#ifdef DEBUG_BUFFER
- LogDebug("Connection %d: %d bytes left in read buffer.",
- Idx, array_bytes(&My_Connections[Idx].rbuf));
-#endif
#ifdef ZLIB
if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) &&
(array_bytes(&My_Connections[Idx].rbuf) > 0)) {
}
#endif
}
+#if DEBUG_BUFFER
+ LogDebug("Connection %d: Processed %ld commands (max=%ld), %ld bytes. %ld bytes left in read buffer.",
+ Idx, i, maxcmd, len_processed,
+ array_bytes(&My_Connections[Idx].rbuf));
+#endif
+
+ /* If data has been processed but there is still data in the read
+ * buffer, the command limit triggered. Enforce the penalty time: */
+ if (len_processed && array_bytes(&My_Connections[Idx].rbuf) > 2)
+ Throttle_Connection(Idx, c, THROTTLE_CMDS, maxcmd);
+
return len_processed;
} /* Handle_Buffer */
-
/**
* Check whether established connections are still alive or not.
* If not, play PING-PONG first; and if that doesn't help either,
}
} /* Check_Connections */
-
/**
* Check if further server links should be established.
*/
for (i = 0; i < MAX_SERVERS; i++) {
if (Conf_Server[i].conn_id != NONE)
continue; /* Already establishing or connected */
- if (!Conf_Server[i].host[0] || !Conf_Server[i].port > 0)
+ if (!Conf_Server[i].host[0] || Conf_Server[i].port <= 0)
continue; /* No host and/or port configured */
if (Conf_Server[i].flags & CONF_SFLAG_DISABLED)
continue; /* Disabled configuration entry */
Conf_Server[i].lasttry = time_now;
Conf_Server[i].conn_id = SERVER_WAIT;
assert(Proc_GetPipeFd(&Conf_Server[i].res_stat) < 0);
- Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host,
- cb_Connect_to_Server);
+
+ /* Start resolver subprocess ... */
+ if (!Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host,
+ cb_Connect_to_Server))
+ Conf_Server[i].conn_id = NONE;
}
} /* Check_Servers */
-
/**
* Establish a new outgoing server connection.
*
/* is a bind address configured? */
res = ng_ipaddr_af(&Conf_Server[Server].bind_addr);
- /* if yes, bind now. If it fails, warn and let connect() pick a source address */
+
+ /* if yes, bind now. If it fails, warn and let connect() pick a
+ * source address */
if (res && bind(new_sock, (struct sockaddr *) &Conf_Server[Server].bind_addr,
ng_ipaddr_salen(&Conf_Server[Server].bind_addr)))
{
ng_ipaddr_tostr_r(&Conf_Server[Server].bind_addr, ip_str);
- Log(LOG_WARNING, "Can't bind socket to %s: %s!", ip_str, strerror(errno));
+ Log(LOG_WARNING, "Can't bind socket to %s: %s!", ip_str,
+ strerror(errno));
}
ng_ipaddr_setport(dest, Conf_Server[Server].port);
res = connect(new_sock, (struct sockaddr *) dest, ng_ipaddr_salen(dest));
return;
}
- if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)new_sock)) {
- Log(LOG_ALERT,
- "Cannot allocate memory for server connection (socket %d)",
- new_sock);
+ if (Socket2Index(new_sock) <= NONE) {
close( new_sock );
Conf_Server[Server].conn_id = NONE;
return;
}
if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
- Log(LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
+ Log(LOG_ALERT, "io_event_create(): could not add fd %d",
+ strerror(errno));
close(new_sock);
Conf_Server[Server].conn_id = NONE;
return;
}
- My_Connections = array_start(&My_ConnArray);
-
assert(My_Connections[new_sock].sock <= 0);
Init_Conn_Struct(new_sock);
sizeof(My_Connections[new_sock].host ));
#ifdef SSL_SUPPORT
- if (Conf_Server[Server].SSLConnect && !ConnSSL_PrepareConnect( &My_Connections[new_sock],
- &Conf_Server[Server] ))
+ if (Conf_Server[Server].SSLConnect &&
+ !ConnSSL_PrepareConnect(&My_Connections[new_sock], &Conf_Server[Server]))
{
Log(LOG_ALERT, "Could not initialize SSL for outgoing connection");
- Conn_Close( new_sock, "Could not initialize SSL for outgoing connection", NULL, false );
- Init_Conn_Struct( new_sock );
+ Conn_Close(new_sock, "Could not initialize SSL for outgoing connection",
+ NULL, false);
+ Init_Conn_Struct(new_sock);
Conf_Server[Server].conn_id = NONE;
return;
}
Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );
} /* New_Server */
-
/**
* Initialize connection structure.
*
#endif
} /* Init_Conn_Struct */
-
/**
* Initialize options of a new socket.
*
int value;
if (!io_setnonblock(Sock)) {
- Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno ));
- close( Sock );
+ Log(LOG_CRIT, "Can't enable non-blocking mode for socket: %s!",
+ strerror(errno));
+ close(Sock);
return false;
}
/* Don't block this port after socket shutdown */
value = 1;
- if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &value, (socklen_t)sizeof( value )) != 0 )
- {
- Log( LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!", strerror( errno ));
+ if (setsockopt(Sock, SOL_SOCKET, SO_REUSEADDR, &value,
+ (socklen_t)sizeof(value)) != 0) {
+ Log(LOG_ERR, "Can't set socket option SO_REUSEADDR: %s!",
+ strerror(errno));
/* ignore this error */
}
return true;
} /* Init_Socket */
-
/**
* Read results of a resolver sub-process and try to initiate a new server
* connection.
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;
- ng_ipaddr_t dest_addrs[4]; /* we can handle at most 3; but we read up to
- four so we can log the 'more than we can handle'
- condition. First result is tried immediately, rest
- is saved for later if needed. */
- LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
+ /* we can handle at most 3 addresses; but we read up to 4 so we can
+ * log the 'more than we can handle' condition. First result is tried
+ * immediately, rest is saved for later if needed. */
+ ng_ipaddr_t dest_addrs[4];
+
+ LogDebug("Resolver: Got forward lookup callback on fd %d, events %d",
+ fd, events);
for (i=0; i < MAX_SERVERS; i++) {
if (Proc_GetPipeFd(&Conf_Server[i].res_stat) == fd )
assert((len % sizeof(ng_ipaddr_t)) == 0);
- LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len);
+ LogDebug("Got result from resolver: %u structs (%u bytes).",
+ len/sizeof(ng_ipaddr_t), len);
memset(&Conf_Server[i].dst_addr, 0, sizeof(Conf_Server[i].dst_addr));
if (len > sizeof(ng_ipaddr_t)) {
New_Server(i, dest_addrs);
} /* cb_Read_Forward_Lookup */
-
/**
* Read results of a resolver sub-process from the pipe and update the
* appropriate connection/client structure(s): hostname and/or IDENT user name.
strlcpy(My_Connections[i].host, readbuf,
sizeof(My_Connections[i].host));
Client_SetHostname(c, readbuf);
- if (Conf_NoticeAuth)
+ if (Conf_NoticeBeforeRegistration)
(void)Conn_WriteStr(i,
- "NOTICE AUTH :*** Found your hostname: %s",
+ "NOTICE * :*** Found your hostname: %s",
My_Connections[i].host);
#ifdef IDENTAUTH
++identptr;
i, identptr);
Client_SetUser(c, identptr, true);
}
- if (Conf_NoticeAuth) {
+ if (Conf_NoticeBeforeRegistration) {
(void)Conn_WriteStr(i,
- "NOTICE AUTH :*** Got %sident response%s%s",
+ "NOTICE * :*** Got %sident response%s%s",
*ptr ? "invalid " : "",
*ptr ? "" : ": ",
*ptr ? "" : identptr);
}
} else if(Conf_Ident) {
Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
- if (Conf_NoticeAuth)
+ if (Conf_NoticeBeforeRegistration)
(void)Conn_WriteStr(i,
- "NOTICE AUTH :*** No ident response");
+ "NOTICE * :*** No ident response");
}
#endif
- if (Conf_NoticeAuth) {
+ if (Conf_NoticeBeforeRegistration) {
/* Send buffered data to the client, but break on
* errors because Handle_Write() would have closed
* the connection again in this case! */
#endif
} /* cb_Read_Resolver_Result */
-
/**
* Write a "simple" (error) message to a socket.
*
}
} /* Simple_Error */
-
/**
* Get CLIENT structure that belongs to a local connection identified by its
* index number. Each connection belongs to a client by definition, so it is
* @returns Pointer to CLIENT structure.
*/
GLOBAL CLIENT *
-Conn_GetClient( CONN_ID Idx )
+Conn_GetClient( CONN_ID Idx )
{
CONNECTION *c;
return &c->proc_stat;
} /* Conn_GetProcStat */
-
/**
* Get CONN_ID from file descriptor associated to a subprocess structure.
*
return NONE;
} /* Conn_GetFromProc */
+/**
+ * Throttle a connection because of excessive usage.
+ *
+ * @param Reason The reason, see THROTTLE_xxx constants.
+ * @param Idx The connection index.
+ * @param Client The client of this connection.
+ * @param Value The time to delay this connection.
+ */
+static void
+Throttle_Connection(const CONN_ID Idx, CLIENT *Client, const int Reason,
+ unsigned int Value)
+{
+ assert(Idx > NONE);
+ assert(Client != NULL);
+
+ /* Never throttle servers or services, only interrupt processing */
+ if (Client_Type(Client) == CLIENT_SERVER
+ || Client_Type(Client) == CLIENT_UNKNOWNSERVER
+ || Client_Type(Client) == CLIENT_SERVICE)
+ return;
+
+ /* Don't throttle clients with user mode 'F' set */
+ if (Client_HasMode(Client, 'F'))
+ return;
+
+ LogDebug("Throttling connection %d: code %d, value %d!", Idx,
+ Reason, Value);
+ Conn_SetPenalty(Idx, 1);
+}
#ifndef STRICT_RFC
My_Connections[Idx].auth_ping = ID;
} /* Conn_SetAuthPing */
-#endif
-
+#endif /* STRICT_RFC */
#ifdef SSL_SUPPORT
+/**
+ * IO callback for new SSL-enabled client and server connections.
+ *
+ * @param sock Socket descriptor.
+ * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...).
+ */
+static void
+cb_clientserver_ssl(int sock, UNUSED short what)
+{
+ CONN_ID idx = Socket2Index(sock);
+
+ if (idx <= NONE) {
+ io_close(sock);
+ return;
+ }
+
+ switch (ConnSSL_Accept(&My_Connections[idx])) {
+ case 1:
+ break; /* OK */
+ case 0:
+ return; /* EAGAIN: callback will be invoked again by IO layer */
+ default:
+ Conn_Close(idx,
+ "SSL accept error, closing socket", "SSL accept error",
+ false);
+ return;
+ }
+
+ io_event_setcb(sock, cb_clientserver); /* SSL handshake completed */
+}
+
+/**
+ * IO callback for listening SSL sockets: handle new connections. This callback
+ * gets called when a new SSL-enabled connection should be accepted.
+ *
+ * @param sock Socket descriptor.
+ * @param irrelevant (ignored IO specification)
+ */
+static void
+cb_listen_ssl(int sock, short irrelevant)
+{
+ int fd;
+
+ (void) irrelevant;
+ fd = New_Connection(sock, true);
+ if (fd < 0)
+ return;
+ io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl);
+}
+
+/**
+ * IO callback for new outgoing SSL-enabled server connections.
+ *
+ * @param sock Socket descriptor.
+ * @param unused (ignored IO specification)
+ */
+static void
+cb_connserver_login_ssl(int sock, short unused)
+{
+ CONN_ID idx = Socket2Index(sock);
+
+ (void) unused;
+
+ if (idx <= NONE) {
+ io_close(sock);
+ return;
+ }
+
+ switch (ConnSSL_Connect( &My_Connections[idx])) {
+ case 1: break;
+ case 0: LogDebug("ConnSSL_Connect: not ready");
+ return;
+ case -1:
+ Log(LOG_ERR, "SSL connection on socket %d failed!", sock);
+ Conn_Close(idx, "Can't connect", NULL, false);
+ return;
+ }
+
+ Log( LOG_INFO, "SSL connection %d with \"%s:%d\" established.", idx,
+ My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
+
+ server_login(idx);
+}
+
+
+/**
+ * Check if SSL library needs to read SSL-protocol related data.
+ *
+ * SSL/TLS connections require extra treatment:
+ * When either CONN_SSL_WANT_WRITE or CONN_SSL_WANT_READ is set, we
+ * need to take care of that first, before checking read/write buffers.
+ * For instance, while we might have data in our write buffer, the
+ * TLS/SSL protocol might need to read internal data first for TLS/SSL
+ * writes to succeed.
+ *
+ * If this function returns true, such a condition is met and we have
+ * to reverse the condition (check for read even if we've data to write,
+ * do not check for read but writeability even if write-buffer is empty).
+ *
+ * @param c Connection to check.
+ * @returns true if SSL-library has to read protocol data.
+ */
+static bool
+SSL_WantRead(const CONNECTION *c)
+{
+ if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_READ)) {
+ io_event_add(c->sock, IO_WANTREAD);
+ return true;
+ }
+ return false;
+}
+
+/**
+ * Check if SSL library needs to write SSL-protocol related data.
+ *
+ * Please see description of SSL_WantRead() for full description!
+ *
+ * @param c Connection to check.
+ * @returns true if SSL-library has to write protocol data.
+ */
+static bool
+SSL_WantWrite(const CONNECTION *c)
+{
+ if (Conn_OPTION_ISSET(c, CONN_SSL_WANT_WRITE)) {
+ io_event_add(c->sock, IO_WANTWRITE);
+ return true;
+ }
+ return false;
+}
+
/**
* Get information about used SSL cipher.
*
return ConnSSL_GetCipherInfo(&My_Connections[Idx], buf, len);
}
-
/**
* Check if a connection is SSL-enabled or not.
*
return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL);
}
-
GLOBAL char *
Conn_GetCertFp(CONN_ID Idx)
{
return ConnSSL_GetCertFp(&My_Connections[Idx]);
}
-
GLOBAL bool
Conn_SetCertFp(CONN_ID Idx, const char *fingerprint)
{
assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION)));
return ConnSSL_SetCertFp(&My_Connections[Idx], fingerprint);
}
-#else
+
+#else /* SSL_SUPPORT */
+
GLOBAL bool
Conn_UsesSSL(UNUSED CONN_ID Idx)
{
return false;
}
-
GLOBAL char *
Conn_GetCertFp(UNUSED CONN_ID Idx)
{
return NULL;
}
-
GLOBAL bool
Conn_SetCertFp(UNUSED CONN_ID Idx, UNUSED const char *fingerprint)
{
return true;
}
-#endif
+#endif /* SSL_SUPPORT */
#ifdef DEBUG
}
} /* Conn_DumpClients */
-#endif
-
+#endif /* DEBUG */
/* -eof- */