#include "portab.h"
#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.157 2005/07/07 18:49:04 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.163 2005/07/12 20:44:46 fw Exp $";
#include "imp.h"
#include <assert.h>
#include "parse.h"
#include "tool.h"
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
# include "rendezvous.h"
#endif
LOCAL void New_Server PARAMS(( int Server, CONN_ID Idx ));
LOCAL void Simple_Message PARAMS(( int Sock, char *Msg ));
LOCAL int Count_Connections PARAMS(( struct sockaddr_in addr ));
+LOCAL int NewListener PARAMS(( const UINT16 Port ));
static array My_Listeners;
#endif
io_close(sock);
return;
- }
+ }
if (what & IO_WANTREAD)
Read_Request( idx );
{
/* Initialize ports on which the server should accept connections */
- int created, i;
+ int created, fd;
+ unsigned int i;
if (!io_library_init(CONNECTION_POOL)) {
Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
}
created = 0;
- for( i = 0; i < Conf_ListenPorts_Count; i++ )
- {
- if( Conn_NewListener( Conf_ListenPorts[i] )) created++;
- else Log( LOG_ERR, "Can't listen on port %u!", (unsigned int) Conf_ListenPorts[i] );
+ for( i = 0; i < Conf_ListenPorts_Count; i++ ) {
+ fd = NewListener( Conf_ListenPorts[i] );
+ if (fd < 0) {
+ Log( LOG_ERR, "Can't listen on port %u!", (unsigned int) Conf_ListenPorts[i] );
+ continue;
+ }
+ if (!io_event_create( fd, IO_WANTREAD, cb_listen )) {
+ Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!",
+ fd, (unsigned int) Conf_ListenPorts[i], strerror(errno));
+ close(fd);
+ continue;
+ }
+ created++;
}
return created;
} /* Conn_InitListeners */
/* Close down all listening sockets */
int *fd;
unsigned int arraylen;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
Rendezvous_UnregisterListeners( );
#endif
fd = (int*) array_get(&My_Listeners, sizeof (int), arraylen);
if (fd) {
close(*fd);
- Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
#ifdef DEBUG
+ Log( LOG_DEBUG, "Listening socket %d closed.", *fd );
} else {
Log( LOG_DEBUG, "array_get pos %d returned NULL", arraylen );
#endif
} /* Conn_ExitListeners */
-GLOBAL bool
-Conn_NewListener( const UINT16 Port )
+/* return new listening port file descriptor or -1 on failure */
+LOCAL int
+NewListener( const UINT16 Port )
{
/* Create new listening socket on specified port */
struct sockaddr_in addr;
struct in_addr inaddr;
int sock;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
char name[CLIENT_ID_LEN], *info;
#endif
#endif
{
Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!", Conf_ListenAddress, Port, Conf_ListenAddress );
- return false;
+ return -1;
}
}
else inaddr.s_addr = htonl( INADDR_ANY );
if( sock < 0 )
{
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
- return false;
+ return -1;
}
- if( ! Init_Socket( sock )) return false;
+ if( ! Init_Socket( sock )) return -1;
/* an Port binden */
if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 )
{
Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
close( sock );
- return false;
+ return -1;
}
/* in "listen mode" gehen :-) */
{
Log( LOG_CRIT, "Can't listen on soecket: %s!", strerror( errno ));
close( sock );
- return false;
+ return -1;
}
/* Neuen Listener in Strukturen einfuegen */
if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) {
Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno ));
close( sock );
- return false;
+ return -1;
}
- io_event_create( sock, IO_WANTREAD, cb_listen );
if( Conf_ListenAddress[0]) Log( LOG_INFO, "Now listening on %s:%d (socket %d).", Conf_ListenAddress, Port, sock );
else Log( LOG_INFO, "Now listening on 0.0.0.0:%d (socket %d).", Port, sock );
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
/* Get best server description text */
if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
else
else strlcpy( name, info, sizeof( name ));
/* Register service */
- Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
+ Rendezvous_Register( name, MDNS_TYPE, Port );
#endif
- return true;
-} /* Conn_NewListener */
+ return sock;
+} /* NewListener */
GLOBAL void
Conn_Handler( void )
{
- /* "Hauptschleife": Aktive Verbindungen ueberwachen. Folgende Aktionen
- * werden dabei durchgefuehrt, bis der Server terminieren oder neu
- * starten soll:
- *
- * - neue Verbindungen annehmen,
- * - Server-Verbindungen aufbauen,
- * - geschlossene Verbindungen loeschen,
- * - volle Schreibpuffer versuchen zu schreiben,
- * - volle Lesepuffer versuchen zu verarbeiten,
- * - Antworten von Resolver Sub-Prozessen annehmen.
+ /* "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;
{
timeout = true;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
Rendezvous_Handler( );
#endif
for( i = 0; i < Pool_Size; i++ ) {
if ( My_Connections[i].sock <= NONE )
continue;
-
+
wdatalen = array_bytes(&My_Connections[i].wbuf);
#ifdef ZLIB
/* Socket der Verbindung in Set aufnehmen */
io_event_add( My_Connections[i].sock, IO_WANTWRITE );
}
-
}
/* von welchen Sockets koennte gelesen werden? */
/* Try to write out the write buffer */
(void)Handle_Write( Idx );
-
+
/* Shut down socket */
if( ! io_close( My_Connections[Idx].sock ))
{
}
ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
- if( ! ptr )
- {
+ if( ! ptr ) {
Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" );
Simple_Message( new_sock, "ERROR: Internal error" );
close( new_sock );
/* Client-Struktur initialisieren */
c = Client_NewLocal( idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
- if( ! c )
- {
+ if( ! c ) {
Log( LOG_ALERT, "Can't accept connection: can't create client structure!" );
Simple_Message( new_sock, "ERROR :Internal error" );
close( new_sock );
My_Connections[idx].addr = new_addr;
/* Neuen Socket registrieren */
- io_event_create( new_sock, IO_WANTREAD, cb_clientserver);
+ if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
+ Simple_Message( new_sock, "ERROR :Internal error" );
+ Conn_Close( idx, "io_event_create() failed", NULL, false );
+ return;
+ }
Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", idx, inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
if(( Client_Type( c ) != CLIENT_USER ) && ( Client_Type( c ) != CLIENT_SERVER ) &&
( Client_Type( c ) != CLIENT_SERVICE ) && ( bsize > ZREADBUFFER_LEN ))
bsize = ZREADBUFFER_LEN;
-#endif
-#ifdef ZLIB
if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
#else
return;
}
- len = read( My_Connections[Idx].sock, readbuf, sizeof readbuf );
+ len = read( My_Connections[Idx].sock, readbuf, sizeof readbuf -1 );
if( len == 0 ) {
Log( LOG_INFO, "%s:%d (%s) is closing the connection ...",
- My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port),
- inet_ntoa( My_Connections[Idx].addr.sin_addr ));
+ My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port),
+ inet_ntoa( My_Connections[Idx].addr.sin_addr ));
Conn_Close( Idx, "Socket closed!", "Client closed connection", false );
return;
}
+
if( len < 0 ) {
if( errno == EAGAIN ) return;
Log( LOG_ERR, "Read error on connection %d (socket %d): %s!", Idx,
#endif
result = false;
- do
- {
+ do {
/* Check penalty */
if( My_Connections[Idx].delaytime > time( NULL )) return result;
#ifdef ZLIB
My_Connections[Idx].msg_in++;
if( ! Parse_Request( Idx, (char*)array_start(&My_Connections[Idx].rbuf) )) return false;
else action = true;
-
+
array_moveleft(&My_Connections[Idx].rbuf, 1, len);
#ifdef DEBUG
Log(LOG_DEBUG, "%d byte left in rbuf", array_bytes(&My_Connections[Idx].rbuf));
LOCAL void
Check_Connections( void )
{
- /* Pruefen, ob Verbindungen noch "alive" sind. Ist dies
- * nicht der Fall, zunaechst PING-PONG spielen und, wenn
- * auch das nicht "hilft", Client disconnectieren. */
-
+ /* check if connections are alive. if not, play PING-PONG first.
+ * if this doesn't help either, disconnect client. */
CLIENT *c;
CONN_ID i;
- for( i = 0; i < Pool_Size; i++ )
- {
+ for( i = 0; i < Pool_Size; i++ ) {
if( My_Connections[i].sock == NONE ) continue;
c = Client_GetFromConn( i );
if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE )))
{
- /* verbundener User, Server oder Service */
- if( My_Connections[i].lastping > My_Connections[i].lastdata )
- {
- /* es wurde bereits ein PING gesendet */
- if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout )
- {
+ /* connected User, Server or Service */
+ if( My_Connections[i].lastping > My_Connections[i].lastdata ) {
+ /* we already sent a ping */
+ if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) {
/* Timeout */
#ifdef DEBUG
Log( LOG_DEBUG, "Connection %d: Ping timeout: %d seconds.", i, Conf_PongTimeout );
Conn_Close( i, NULL, "Ping timeout", true );
}
}
- else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
- {
- /* es muss ein PING gesendet werden */
+ else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) {
+ /* we need to sent a PING */
#ifdef DEBUG
Log( LOG_DEBUG, "Connection %d: sending PING ...", i );
#endif
}
else
{
- /* noch nicht vollstaendig aufgebaute Verbindung */
+ /* connection is not fully established yet */
if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout )
{
/* Timeout */
assert( Idx > NONE );
/* Did we get a valid IP address? */
- if( ! Conf_Server[Server].ip[0] )
- {
+ if( ! Conf_Server[Server].ip[0] ) {
/* No. Free connection structure and abort: */
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): ip address unknown!", Conf_Server[Server].host, Idx );
- return;
+ goto out;
}
Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d (connection %d) ... ", Conf_Server[Server].host, Conf_Server[Server].ip, Conf_Server[Server].port, Idx );
#endif
{
/* Can't convert IP address */
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
Log( LOG_ERR, "Can't connect to \"%s\" (connection %d): can't convert ip address %s!", Conf_Server[Server].host, Idx, Conf_Server[Server].ip );
- return;
+ goto out;
}
memset( &new_addr, 0, sizeof( new_addr ));
new_addr.sin_port = htons( Conf_Server[Server].port );
new_sock = socket( PF_INET, SOCK_STREAM, 0 );
- if ( new_sock < 0 )
- {
+ if ( new_sock < 0 ) {
/* Can't create socket */
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
- return;
+ goto out;
}
if( ! Init_Socket( new_sock )) return;
res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
- if(( res != 0 ) && ( errno != EINPROGRESS ))
- {
+ if(( res != 0 ) && ( errno != EINPROGRESS )) {
/* Can't connect socket */
Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
close( new_sock );
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
- return;
+ goto out;
}
/* Client-Struktur initialisieren */
c = Client_NewLocal( Idx, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
- if( ! c )
- {
+ if( ! c ) {
/* Can't create new client structure */
- close( new_sock );
- Init_Conn_Struct( Idx );
- Conf_Server[Server].conn_id = NONE;
Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
- return;
+ close( new_sock );
+ goto out;
}
+
Client_SetIntroducer( c, c );
Client_SetToken( c, TOKEN_OUTBOUND );
strlcpy( My_Connections[Idx].host, Conf_Server[Server].host, sizeof( My_Connections[Idx].host ));
/* Register new socket */
- io_event_create( new_sock, IO_WANTWRITE, cb_connserver);
- Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
+ if (!io_event_create( new_sock, IO_WANTWRITE, cb_connserver)) {
+ Log( LOG_ALERT, "io_event_create(): could not add fd %d", strerror(errno));
+ Conn_Close( Idx, "io_event_create() failed", NULL, false );
+ goto out;
+ }
#ifdef DEBUG
Log( LOG_DEBUG, "Registered new connection %d on socket %d.", Idx, My_Connections[Idx].sock );
#endif
+ Conn_OPTION_ADD( &My_Connections[Idx], CONN_ISCONNECTING );
+ return;
+out:
+ Init_Conn_Struct( Idx );
+ Conf_Server[Server].conn_id = NONE;
} /* New_Server */
projects / ngircd-alex.git / blobdiff