/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2004 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.127 2003/11/05 23:24:48 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.133 2004/03/11 22:16:31 alex Exp $";
#include "imp.h"
#include <assert.h>
#include <time.h>
#include <netinet/in.h>
+#ifdef HAVE_NETINET_IP_H
+# include <netinet/ip.h>
+#endif
+
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
#else
-#define PF_INET AF_INET
+# define PF_INET AF_INET
#endif
#ifdef HAVE_STDINT_H
-#include <stdint.h> /* e.g. for Mac OS X */
+# include <stdint.h> /* e.g. for Mac OS X */
#endif
-#ifdef USE_TCPWRAP
-#include <tcpd.h> /* for TCP Wrappers */
+#ifdef TCPWRAP
+# include <tcpd.h> /* for TCP Wrappers */
#endif
#include "defines.h"
#include "tool.h"
#ifdef RENDEZVOUS
-#include "rendezvous.h"
+# include "rendezvous.h"
#endif
#include "exp.h"
LOCAL fd_set My_Sockets;
LOCAL fd_set My_Connects;
-#ifdef USE_TCPWRAP
+#ifdef TCPWRAP
INT allow_severity = LOG_INFO;
INT deny_severity = LOG_ERR;
#endif
/* konfiguriertes Limit beachten */
if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
}
- My_Connections = malloc( sizeof( CONNECTION ) * Pool_Size );
+ My_Connections = (CONNECTION *)malloc( sizeof( CONNECTION ) * Pool_Size );
if( ! My_Connections )
{
/* Speicher konnte nicht alloziert werden! */
FD_ZERO( &write_sockets );
for( i = 0; i < Pool_Size; i++ )
{
-#ifdef USE_ZLIB
+#ifdef ZLIB
if(( My_Connections[i].sock > NONE ) && (( My_Connections[i].wdatalen > 0 ) || ( My_Connections[i].zip.wdatalen > 0 )))
#else
if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].wdatalen > 0 ))
}
}
-#ifdef USE_ZLIB
+#ifdef ZLIB
if( My_Connections[Idx].options & CONN_ZIP )
{
/* Daten komprimieren und in Puffer kopieren */
* sub-processes are closed down. */
CLIENT *c;
+ CHAR *txt;
DOUBLE in_k, out_k;
-#ifdef USE_ZLIB
+#ifdef ZLIB
DOUBLE in_z_k, out_z_k;
INT in_p, out_p;
#endif
/* Mark link as "closing" */
My_Connections[Idx].options |= CONN_ISCLOSING;
+
+ if( LogMsg ) txt = LogMsg;
+ else txt = FwdMsg;
+ if( ! txt ) txt = "Reason unknown";
+
+ Log( LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx, LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ));
/* Search client, if any */
c = Client_GetFromConn( Idx );
/* Send ERROR to client (see RFC!) */
if( FwdMsg ) Conn_WriteStr( Idx, "ERROR :%s", FwdMsg );
else Conn_WriteStr( Idx, "ERROR :Closing connection." );
- if( My_Connections[Idx].sock == NONE ) return;
}
/* Try to write out the write buffer */
/* Calculate statistics and log information */
in_k = (DOUBLE)My_Connections[Idx].bytes_in / 1024;
out_k = (DOUBLE)My_Connections[Idx].bytes_out / 1024;
-#ifdef USE_ZLIB
+#ifdef ZLIB
if( My_Connections[Idx].options & CONN_ZIP )
{
in_z_k = (DOUBLE)My_Connections[Idx].zip.bytes_in / 1024;
/* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx );
-#ifdef USE_ZLIB
+#ifdef ZLIB
/* Clean up zlib, if link was compressed */
if( Conn_Options( Idx ) & CONN_ZIP )
{
assert( My_Connections[Idx].sock > NONE );
/* sind ueberhaupt Daten vorhanden? */
-#ifdef USE_ZLIB
+#ifdef ZLIB
if(( ! My_Connections[Idx].wdatalen > 0 ) && ( ! My_Connections[Idx].zip.wdatalen )) return TRUE;
#else
if( ! My_Connections[Idx].wdatalen > 0 ) return TRUE;
return FALSE;
}
-#ifdef DEBUG
- Log( LOG_DEBUG, "Connection %d with \"%s:%d\" established, now sendig PASS and SERVER ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port );
-#endif
+ Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", Idx, My_Connections[Idx].host, Conf_Server[Conf_GetServer( Idx )].port );
- /* PASS und SERVER verschicken */
+ /* Send PASS and SERVER command to peer */
Conn_WriteStr( Idx, "PASS %s %s", Conf_Server[Conf_GetServer( Idx )].pwd_out, NGIRCd_ProtoID );
return Conn_WriteStr( Idx, "SERVER %s :%s", Conf_ServerName, Conf_ServerInfo );
}
-#ifdef USE_ZLIB
+#ifdef ZLIB
/* Schreibpuffer leer, aber noch Daten im Kompressionsbuffer?
* Dann muss dieser nun geflushed werden! */
if( My_Connections[Idx].wdatalen == 0 ) Zip_Flush( Idx );
/* Neue Client-Verbindung von Listen-Socket annehmen und
* CLIENT-Struktur anlegen. */
-#ifdef USE_TCPWRAP
+#ifdef TCPWRAP
struct request_info req;
#endif
struct sockaddr_in new_addr;
return;
}
-#ifdef USE_TCPWRAP
+#ifdef TCPWRAP
/* Validate socket using TCP Wrappers */
request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
+ fromhost(&req);
if( ! hosts_access( &req ))
{
/* Access denied! */
/* zunaechst realloc() versuchen; wenn das scheitert, malloc() versuchen
* und Daten ggf. "haendisch" umkopieren. (Haesslich! Eine wirklich
* dynamische Verwaltung waere wohl _deutlich_ besser ...) */
- ptr = realloc( My_Connections, sizeof( CONNECTION ) * new_size );
+ ptr = (POINTER *)realloc( My_Connections, sizeof( CONNECTION ) * new_size );
if( ! ptr )
{
/* realloc() ist fehlgeschlagen. Nun malloc() probieren: */
- ptr = malloc( sizeof( CONNECTION ) * new_size );
+ ptr = (POINTER *)malloc( sizeof( CONNECTION ) * new_size );
if( ! ptr )
{
/* Offenbar steht kein weiterer Sepeicher zur Verfuegung :-( */
#endif
/* Adjust pointer to new block */
- My_Connections = ptr;
+ My_Connections = (CONNECTION *)ptr;
/* Initialize new items */
for( idx = Pool_Size; idx < new_size; idx++ ) Init_Conn_Struct( idx );
/* Hostnamen ermitteln */
strlcpy( My_Connections[idx].host, inet_ntoa( new_addr.sin_addr ), sizeof( My_Connections[idx].host ));
Client_SetHostname( c, My_Connections[idx].host );
+#ifdef IDENTAUTH
+ s = Resolve_Addr( &new_addr, My_Connections[idx].sock );
+#else
s = Resolve_Addr( &new_addr );
+#endif
if( s )
{
/* Sub-Prozess wurde asyncron gestartet */
* Tritt ein Fehler auf, so wird der Socket geschlossen. */
INT len, bsize;
-#ifdef USE_ZLIB
+#ifdef ZLIB
CLIENT *c;
#endif
/* wenn noch nicht registriert: maximal mit ZREADBUFFER_LEN arbeiten,
* ansonsten koennen Daten ggf. nicht umkopiert werden. */
bsize = READBUFFER_LEN;
-#ifdef USE_ZLIB
+#ifdef ZLIB
c = Client_GetFromConn( Idx );
if(( Client_Type( c ) != CLIENT_USER ) && ( Client_Type( c ) != CLIENT_SERVER ) && ( Client_Type( c ) != CLIENT_SERVICE ) && ( bsize > ZREADBUFFER_LEN )) bsize = ZREADBUFFER_LEN;
#endif
-#ifdef USE_ZLIB
+#ifdef ZLIB
if(( bsize - My_Connections[Idx].rdatalen - 1 < 1 ) || ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen < 1 ))
#else
if( bsize - My_Connections[Idx].rdatalen - 1 < 1 )
return;
}
-#ifdef USE_ZLIB
+#ifdef ZLIB
if( My_Connections[Idx].options & CONN_ZIP )
{
len = recv( My_Connections[Idx].sock, My_Connections[Idx].zip.rbuf + My_Connections[Idx].zip.rdatalen, ( ZREADBUFFER_LEN - My_Connections[Idx].zip.rdatalen ), 0 );
CHAR *ptr;
INT len, delta;
BOOLEAN action, result;
-#ifdef USE_ZLIB
+#ifdef ZLIB
BOOLEAN old_z;
#endif
/* Check penalty */
if( My_Connections[Idx].delaytime > time( NULL )) return result;
-#ifdef USE_ZLIB
+#ifdef ZLIB
/* ggf. noch unkomprimiete Daten weiter entpacken */
if( My_Connections[Idx].options & CONN_ZIP )
{
return FALSE;
}
-#ifdef USE_ZLIB
+#ifdef ZLIB
/* merken, ob Stream bereits komprimiert wird */
old_z = My_Connections[Idx].options & CONN_ZIP;
#endif
My_Connections[Idx].rdatalen -= len;
memmove( My_Connections[Idx].rbuf, My_Connections[Idx].rbuf + len, My_Connections[Idx].rdatalen );
-#ifdef USE_ZLIB
+#ifdef ZLIB
if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) && ( My_Connections[Idx].rdatalen > 0 ))
{
/* Mit dem letzten Befehl wurde Socket-Kompression aktiviert.
My_Connections[Idx].flag = 0;
My_Connections[Idx].options = 0;
-#ifdef USE_ZLIB
+#ifdef ZLIB
My_Connections[Idx].zip.rbuf[0] = '\0';
My_Connections[Idx].zip.rdatalen = 0;
My_Connections[Idx].zip.wbuf[0] = '\0';
LOCAL BOOLEAN
Init_Socket( INT Sock )
{
- /* Socket-Optionen setzen */
+ /* Initialize socket (set options) */
- INT on = 1;
+ INT value;
-#ifdef O_NONBLOCK /* A/UX kennt das nicht? */
+#ifdef O_NONBLOCK /* unknown on A/UX */
if( fcntl( Sock, F_SETFL, O_NONBLOCK ) != 0 )
{
- Log( LOG_CRIT, "Can't enable non-blocking mode: %s!", strerror( errno ));
+ Log( LOG_CRIT, "Can't enable non-blocking mode for socket: %s!", strerror( errno ));
close( Sock );
return FALSE;
}
#endif
- if( setsockopt( Sock, SOL_SOCKET, SO_REUSEADDR, &on, (socklen_t)sizeof( on )) != 0)
+
+ /* 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 ));
+ /* ignore this error */
+ }
+
+ /* Set type of service (TOS) */
+#if defined(IP_TOS) && defined(IPTOS_LOWDELAY)
+ value = IPTOS_LOWDELAY;
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value );
+#endif
+ if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 )
{
- Log( LOG_ERR, "Can't set socket options: %s!", strerror( errno ));
- /* dieser Fehler kann ignoriert werden. */
+ Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno ));
+ /* ignore this error */
}
+#endif
return TRUE;
} /* Init_Socket */
FD_CLR( r_fd, &Resolver_FDs );
- /* Anfrage vom Parent lesen */
+ /* Read result from pipe */
len = read( r_fd, result, HOST_LEN - 1 );
if( len < 0 )
{
- /* Fehler beim Lesen aus der Pipe */
+ /* Error! */
close( r_fd );
Log( LOG_CRIT, "Resolver: Can't read result: %s!", strerror( errno ));
return;
}
result[len] = '\0';
- /* zugehoerige Connection suchen */
+ /* Search associated connection ... */
for( i = 0; i < Pool_Size; i++ )
{
if(( My_Connections[i].sock != NONE ) && ( My_Connections[i].res_stat ) && ( My_Connections[i].res_stat->pipe[0] == r_fd )) break;
}
if( i >= Pool_Size )
{
- /* Opsa! Keine passende Connection gefunden!? Vermutlich
- * wurde sie schon wieder geschlossen. */
+ /* Ops, none found? Probably the connection has already
+ * been closed. */
close( r_fd );
#ifdef DEBUG
Log( LOG_DEBUG, "Resolver: Got result for unknown connection!?" );
Log( LOG_DEBUG, "Resolver: %s is \"%s\".", My_Connections[i].host, result );
#endif
- /* Aufraeumen */
+ /* Clean up ... */
close( My_Connections[i].res_stat->pipe[0] );
close( My_Connections[i].res_stat->pipe[1] );
free( My_Connections[i].res_stat );
if( My_Connections[i].sock > NONE )
{
- /* Eingehende Verbindung: Hostnamen setzen */
+ /* Incoming connection */
+#ifdef IDENTAUTH
+ CHAR *ident;
+#endif
+
+ /* Search client ... */
c = Client_GetFromConn( i );
assert( c != NULL );
+
+ /* Only update client information of unregistered clients */
+ if( Client_Type( c ) != CLIENT_UNKNOWN )
+ {
+#ifdef DEBUG
+ Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
+#endif
+ return;
+ }
+
+ /* Set hostname */
strlcpy( My_Connections[i].host, result, sizeof( My_Connections[i].host ));
Client_SetHostname( c, result );
+
+#ifdef IDENTAUTH
+ ident = strchr( result, 0 );
+ ident++;
+
+ /* Do we have a result of the IDENT lookup? If so, set it as the user name */
+ if( *ident )
+ {
+ Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, ident );
+ Client_SetUser( c, ident, TRUE );
+ }
+ else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+#endif
}
else
{
- /* Ausgehende Verbindung (=Server): IP setzen */
+ /* Outgoing connection (server link!): set IP address */
n = Conf_GetServer( i );
- if( n > NONE ) strlcpy( Conf_Server[n].ip, result, sizeof( Conf_Server[n].ip ));
- else Log( LOG_ERR, "Got resolver result for non-configured server!?" );
+ assert( n > NONE );
+ strlcpy( Conf_Server[n].ip, result, sizeof( Conf_Server[n].ip ));
}
- /* Penalty-Zeit zurueck setzen */
+ /* Reset penalty time */
Conn_ResetPenalty( i );
} /* Read_Resolver_Result */
projects / ngircd.git / blobdiff