/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
*
* 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
#include "portab.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.116 2003/02/21 19:19:27 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.122 2003/04/21 10:52:26 alex Exp $";
#include "imp.h"
#include <assert.h>
#endif
#ifdef HAVE_STDINT_H
-#include <stdint.h> /* u.a. fuer Mac OS X */
+#include <stdint.h> /* e.g. for Mac OS X */
+#endif
+
+#ifdef USE_TCPWRAP
+#include <tcpd.h> /* for TCP Wrappers */
#endif
#include "defines.h"
#include "parse.h"
#include "tool.h"
+#ifdef RENDEZVOUS
+#include "rendezvous.h"
+#endif
+
#include "exp.h"
LOCAL BOOLEAN Init_Socket PARAMS(( INT Sock ));
LOCAL VOID New_Server PARAMS(( INT Server, CONN_ID Idx ));
LOCAL VOID Read_Resolver_Result PARAMS(( INT r_fd ));
+LOCAL VOID Simple_Message PARAMS(( INT Sock, CHAR *Msg ));
LOCAL fd_set My_Listeners;
LOCAL fd_set My_Sockets;
LOCAL fd_set My_Connects;
+#ifdef USE_TCPWRAP
+INT allow_severity = LOG_INFO;
+INT deny_severity = LOG_ERR;
+#endif
+
GLOBAL VOID
Conn_Init( VOID )
CONN_ID idx;
INT i;
- /* Sockets schliessen */
Log( LOG_DEBUG, "Shutting down all connections ..." );
+
+#ifdef RENDEZVOUS
+ Rendezvous_UnregisterListeners( );
+#endif
+
+ /* Sockets schliessen */
for( i = 0; i < Conn_MaxFD + 1; i++ )
{
if( FD_ISSET( i, &My_Sockets ))
INT i;
+#ifdef RENDEZVOUS
+ Rendezvous_UnregisterListeners( );
+#endif
+
Log( LOG_INFO, "Shutting down all listening sockets ..." );
for( i = 0; i < Conn_MaxFD + 1; i++ )
{
struct sockaddr_in addr;
INT sock;
-
+#ifdef RENDEZVOUS
+ CHAR name[CLIENT_ID_LEN], *info;
+#endif
+
/* Server-"Listen"-Socket initialisieren */
memset( &addr, 0, sizeof( addr ));
addr.sin_family = AF_INET;
Log( LOG_INFO, "Now listening on port %d (socket %d).", Port, sock );
+#ifdef RENDEZVOUS
+ /* Get best server description text */
+ if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
+ else
+ {
+ /* Use server info string */
+ info = NULL;
+ if( Conf_ServerInfo[0] == '[' )
+ {
+ /* Cut off leading hostname part in "[]" */
+ info = strchr( Conf_ServerInfo, ']' );
+ if( info )
+ {
+ info++;
+ while( *info == ' ' ) info++;
+ }
+ }
+ if( ! info ) info = Conf_ServerInfo;
+ }
+
+ /* Add port number to description if non-standard */
+ if( Port != 6667 ) snprintf( name, sizeof( name ), "%s (port %u)", info, Port );
+ else strlcpy( name, info, sizeof( name ));
+
+ /* Register service */
+ Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
+#endif
+
return TRUE;
} /* Conn_NewListener */
{
timeout = TRUE;
+#ifdef RENDEZVOUS
+ Rendezvous_Handler( );
+#endif
+
/* Should the configuration be reloaded? */
if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
if( errno != EINTR )
{
Log( LOG_EMERG, "Conn_Handler(): select(): %s!", strerror( errno ));
- Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+ Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
exit( 1 );
}
continue;
{
/* Oops, we can't close the socket!? This is fatal! */
Log( LOG_EMERG, "Error closing connection %d (socket %d) with %s:%d - %s!", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
- Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+ Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
exit( 1 );
}
} /* Conn_Close */
+GLOBAL VOID
+Conn_SyncServerStruct( VOID )
+{
+ /* Synchronize server structures (connection IDs):
+ * connections <-> configuration */
+
+ CLIENT *client;
+ CONN_ID i;
+ INT c;
+
+ for( i = 0; i < Pool_Size; i++ )
+ {
+ /* Established connection? */
+ if( My_Connections[i].sock <= NONE ) continue;
+
+ /* Server connection? */
+ client = Client_GetFromConn( i );
+ if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
+
+ for( c = 0; c < MAX_SERVERS; c++ )
+ {
+ /* Configured server? */
+ if( ! Conf_Server[c].host[0] ) continue;
+
+ /* Duplicate? */
+ if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 ) Conf_Server[c].conn_id = i;
+ }
+ }
+} /* SyncServerStruct */
+
+
LOCAL BOOLEAN
Try_Write( CONN_ID Idx )
{
/* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
INT len, res, err;
+ socklen_t sock_len;
CLIENT *c;
assert( Idx > NONE );
FD_CLR( My_Connections[Idx].sock, &My_Connects );
/* Ergebnis des connect() ermitteln */
- len = sizeof( err );
- res = getsockopt( My_Connections[Idx].sock, SOL_SOCKET, SO_ERROR, &err, &len );
- assert( len == sizeof( err ));
+ sock_len = sizeof( err );
+ 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 ))
/* Neue Client-Verbindung von Listen-Socket annehmen und
* CLIENT-Struktur anlegen. */
+#ifdef USE_TCPWRAP
+ struct request_info req;
+#endif
struct sockaddr_in new_addr;
INT new_sock, new_sock_len;
RES_STAT *s;
Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
return;
}
+
+#ifdef USE_TCPWRAP
+ /* Validate socket using TCP Wrappers */
+ request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
+ if( ! hosts_access( &req ))
+ {
+ /* Access denied! */
+ Log( deny_severity, "Refused connection from %s (by TCP Wrappers)!", inet_ntoa( new_addr.sin_addr ));
+ Simple_Message( new_sock, "ERROR :Connection refused" );
+ close( new_sock );
+ return;
+ }
+#endif
/* Socket initialisieren */
Init_Socket( new_sock );
{
/* 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;
}
if( new_size < Pool_Size )
{
Log( LOG_ALERT, "Can't accespt connection: limit (%d) reached -- overflow!", Pool_Size );
+ Simple_Message( new_sock, "ERROR :Connection limit reached" );
close( new_sock );
return;
}
{
/* Offenbar steht kein weiterer Sepeicher zur Verfuegung :-( */
Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
+ Simple_Message( new_sock, "ERROR: Internal error" );
close( new_sock );
return;
}
if( ! c )
{
Log( LOG_ALERT, "Can't accept connection: can't create client structure!" );
+ Simple_Message( new_sock, "ERROR :Internal error" );
close( new_sock );
return;
}
} /* Read_Resolver_Result */
+LOCAL VOID
+Simple_Message( INT Sock, CHAR *Msg )
+{
+ /* Write "simple" message to socket, without using compression
+ * or even the connection write buffers. Used e.g. for error
+ * messages by New_Connection(). */
+
+ assert( Sock > NONE );
+ assert( Msg != NULL );
+
+ (VOID)send( Sock, Msg, strlen( Msg ), 0 );
+ (VOID)send( Sock, "\r\n", 2, 0 );
+} /* Simple_Error */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff