commit - 2bb917f05aafaf526736d0b7ade2f330835bbbe1
commit + 879d5504081e09600464f503db8282e47f79abaa
blob - 4a028ac7794b0fc7eeb9be7c825c0d94e506ff97
blob + 16cf13cf0ef6478e1932688e8da82baed6e1bdb7
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
CONN_ID idx = Socket2Index( sock );
if (idx <= NONE) {
- LogDebug("cb_connserver wants to write on unknown socket?!");
io_close(sock);
return;
}
cb_clientserver(int sock, short what)
{
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))) {
GLOBAL void
Conn_Init( void )
{
- CONN_ID i;
+ int size;
- Pool_Size = CONNECTION_POOL;
- 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]");
+ /* 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 */
/**
/* 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 */
} /* 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 || 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);
+ if (Sock < Pool_Size)
+ return 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;
}
+ 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;
-} /* Socket2Index */
+}
/**
* Read data from the network to the read buffer. If an error occurs,
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;
return;
}
- My_Connections = array_start(&My_ConnArray);
-
assert(My_Connections[new_sock].sock <= 0);
Init_Conn_Struct(new_sock);
{
CONN_ID idx = Socket2Index(sock);
- assert(idx >= 0);
-
- if (idx < 0) {
+ if (idx <= NONE) {
io_close(sock);
return;
}
{
CONN_ID idx = Socket2Index(sock);
- assert(idx >= 0);
- if (idx < 0) {
+ (void) unused;
+
+ if (idx <= NONE) {
io_close(sock);
return;
}
- (void) unused;
+
switch (ConnSSL_Connect( &My_Connections[idx])) {
case 1: break;
case 0: LogDebug("ConnSSL_Connect: not ready");
