/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton <alex@barton.de>
+ * Copyright (c)2001-2007 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"
#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.193 2006/04/29 16:19:46 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.221 2008/02/26 22:04:17 fw Exp $";
#include "imp.h"
#include <assert.h>
# include <netinet/ip.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#else
-# define PF_INET AF_INET
-#endif
-
#ifdef HAVE_STDINT_H
# include <stdint.h> /* e.g. for Mac OS X */
#endif
static bool Handle_Write PARAMS(( CONN_ID Idx ));
+static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len ));
static int New_Connection PARAMS(( int Sock ));
static CONN_ID Socket2Index PARAMS(( int Sock ));
static void Read_Request PARAMS(( CONN_ID Idx ));
static void Check_Servers PARAMS(( void ));
static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
static bool Init_Socket PARAMS(( int Sock ));
-static void New_Server PARAMS(( int Server ));
+static void New_Server PARAMS(( int Server, ng_ipaddr_t *dest ));
static void Simple_Message PARAMS(( int Sock, const char *Msg ));
-static int Count_Connections PARAMS(( struct sockaddr_in addr ));
-static int NewListener PARAMS(( const UINT16 Port ));
+static int NewListener PARAMS(( int af, const UINT16 Port ));
static array My_Listeners;
static array My_ConnArray;
{
int res, err;
socklen_t sock_len;
- CLIENT *c;
CONN_ID idx = Socket2Index( sock );
if (idx <= NONE) {
LogDebug("cb_connserver wants to write on unknown socket?!");
Conf_Server[Conf_GetServer(idx)].port,
idx, strerror(err));
- /* Clean up the CLIENT structure (to avoid silly log
- * messages) and call Conn_Close() to do the rest. */
- c = Conn_GetClient(idx);
- if (c)
- Client_DestroyNow(c);
-
- Conn_Close(idx, "Can't connect!", NULL, false);
-
+ res = Conf_GetServer(idx);
+ assert(res >= 0);
+
+ Conn_Close(idx, "Can't connect!", NULL, false);
+
+ if (res < 0)
+ return;
+ if (ng_ipaddr_af(&Conf_Server[res].dst_addr[0])) {
+ /* more addresses to try... */
+ New_Server(res, &Conf_Server[res].dst_addr[0]);
+ /* connection to dst_addr[0] in progress, remove this address... */
+ Conf_Server[res].dst_addr[0] = Conf_Server[res].dst_addr[1];
+
+ memset(&Conf_Server[res].dst_addr[1], 0, sizeof(&Conf_Server[res].dst_addr[1]));
+ }
return;
}
+ res = Conf_GetServer(idx);
+ assert(res >= 0);
+ if (res >= 0) /* connect succeeded, remove all additional addresses */
+ memset(&Conf_Server[res].dst_addr, 0, sizeof(&Conf_Server[res].dst_addr));
Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
server_login(idx);
}
if( Pool_Size > Conf_MaxConnections ) Pool_Size = Conf_MaxConnections;
}
- if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), Pool_Size)) {
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)Pool_Size)) {
Log( LOG_EMERG, "Can't allocate memory! [Conn_Init]" );
exit( 1 );
}
- /* XXX: My_Connetions/Pool_Size are needed by other parts of the code; remove them */
+ /* 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).",
static unsigned int
-ports_initlisteners(array *a, void (*func)(int,short))
+ports_initlisteners(array *a, int af, void (*func)(int,short))
{
- unsigned int created = 0, len;
+ unsigned int created = 0;
+ size_t len;
int fd;
UINT16 *port;
len = array_length(a, sizeof (UINT16));
port = array_start(a);
while(len--) {
- fd = NewListener( *port );
+ fd = NewListener(af, *port);
if (fd < 0) {
port++;
continue;
}
-GLOBAL int
+GLOBAL unsigned int
Conn_InitListeners( void )
{
/* Initialize ports on which the server should accept connections */
- unsigned int created;
+ unsigned int created = 0;
if (!io_library_init(CONNECTION_POOL)) {
Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
return -1;
}
- created = ports_initlisteners(&Conf_ListenPorts, cb_listen);
+#ifdef WANT_IPV6
+ if (Conf_ListenIPv6)
+ created = ports_initlisteners(&Conf_ListenPorts, AF_INET6, cb_listen);
+#endif
+ if (Conf_ListenIPv4)
+ created += ports_initlisteners(&Conf_ListenPorts, AF_INET, cb_listen);
return created;
} /* Conn_InitListeners */
Log( LOG_INFO, "Shutting down all listening sockets (%d total)...", arraylen );
fd = array_start(&My_Listeners);
while(arraylen--) {
- assert(fd);
+ assert(fd != NULL);
assert(*fd >= 0);
io_close(*fd);
LogDebug("Listening socket %d closed.", *fd );
} /* Conn_ExitListeners */
+static bool
+InitSinaddrListenAddr(int af, ng_ipaddr_t *addr, UINT16 Port)
+{
+ bool ret;
+ const char *listen_addrstr = NULL;
+#ifdef WANT_IPV6
+ if (af == AF_INET)
+ listen_addrstr = "0.0.0.0";
+#else
+ (void)af;
+#endif
+ if (Conf_ListenAddress[0]) /* overrides V4/V6 atm */
+ listen_addrstr = Conf_ListenAddress;
+
+ ret = ng_ipaddr_init(addr, listen_addrstr, Port);
+ if (!ret) {
+ if (!listen_addrstr)
+ listen_addrstr = "";
+ Log(LOG_CRIT, "Can't bind to %s:%u: can't convert ip address \"%s\"",
+ listen_addrstr, Port, listen_addrstr);
+ }
+ return ret;
+}
+
+
+static void
+set_v6_only(int af, int sock)
+{
+#if defined(IPV6_V6ONLY) && defined(WANT_IPV6)
+ int on = 1;
+
+ if (af != AF_INET6)
+ return;
+
+ if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)))
+ Log(LOG_ERR, "Could not set IPV6_V6ONLY: %s", strerror(errno));
+#else
+ (void)af;
+ (void)sock;
+#endif
+}
+
+
/* return new listening port file descriptor or -1 on failure */
static int
-NewListener( const UINT16 Port )
+NewListener(int af, const UINT16 Port)
{
/* Create new listening socket on specified port */
-
- struct sockaddr_in addr;
- struct in_addr inaddr;
+ ng_ipaddr_t addr;
int sock;
#ifdef ZEROCONF
char name[CLIENT_ID_LEN], *info;
#endif
+ if (!InitSinaddrListenAddr(af, &addr, Port))
+ return -1;
- /* Server-"Listen"-Socket initialisieren */
- memset( &addr, 0, sizeof( addr ));
- memset( &inaddr, 0, sizeof( inaddr ));
- addr.sin_family = AF_INET;
- addr.sin_port = htons( Port );
- if( Conf_ListenAddress[0] )
- {
-#ifdef HAVE_INET_ATON
- if( inet_aton( Conf_ListenAddress, &inaddr ) == 0 )
-#else
- inaddr.s_addr = inet_addr( Conf_ListenAddress );
- if( inaddr.s_addr == (unsigned)-1 )
-#endif
- {
- Log( LOG_CRIT, "Can't listen on %s:%u: can't convert ip address %s!",
- Conf_ListenAddress, Port, Conf_ListenAddress );
- return -1;
- }
- }
- else inaddr.s_addr = htonl( INADDR_ANY );
- addr.sin_addr = inaddr;
-
- sock = socket( PF_INET, SOCK_STREAM, 0);
+ sock = socket(ng_ipaddr_af(&addr), SOCK_STREAM, 0);
if( sock < 0 ) {
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
return -1;
}
- if( ! Init_Socket( sock )) return -1;
+ af = ng_ipaddr_af(&addr);
- if( bind( sock, (struct sockaddr *)&addr, (socklen_t)sizeof( addr )) != 0 ) {
- Log( LOG_CRIT, "Can't bind socket: %s!", strerror( errno ));
- close( sock );
+ set_v6_only(af, sock);
+
+ if (!Init_Socket(sock))
+ return -1;
+
+ if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) {
+ Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s",
+ ng_ipaddr_tostr(&addr), Port, strerror(errno));
+ close(sock);
return -1;
}
return -1;
}
- 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 WANT_IPV6
+ if (af == AF_INET6)
+ Log(LOG_INFO, "Now listening on [%s]:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
+ else
+#endif
+ Log(LOG_INFO, "Now listening on %s:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
#ifdef ZEROCONF
/* Get best server description text */
}
/* 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 ));
+ if (Port != 6667)
+ snprintf(name, sizeof name, "%s (port %u)", info,
+ (unsigned int)Port);
+ else
+ strlcpy(name, info, sizeof name);
/* Register service */
Rendezvous_Register( name, MDNS_TYPE, Port );
if ( My_Connections[i].sock <= NONE )
continue;
- wdatalen = array_bytes(&My_Connections[i].wbuf);
+ wdatalen = (unsigned int)array_bytes(&My_Connections[i].wbuf);
#ifdef ZLIB
if (( wdatalen > 0 ) || ( array_bytes(&My_Connections[i].zip.wbuf)> 0 ))
} /* Conn_WriteStr */
-GLOBAL bool
-Conn_Write( CONN_ID Idx, char *Data, unsigned int Len )
+/**
+ * Append Data to the outbound write buffer of a connection.
+ * @param Idx Index of the connection.
+ * @param Data pointer to the data.
+ * @param Len length of Data.
+ * @return true on success, false otherwise.
+ */
+static bool
+Conn_Write( CONN_ID Idx, char *Data, size_t Len )
{
- /* Daten in Socket schreiben. Bei "fatalen" Fehlern wird
- * der Client disconnectiert und false geliefert. */
-
+ CLIENT *c;
+ size_t writebuf_limit = WRITEBUFFER_LEN;
assert( Idx > NONE );
assert( Data != NULL );
assert( Len > 0 );
- /* Ist der entsprechende Socket ueberhaupt noch offen? In einem
- * "Handler-Durchlauf" kann es passieren, dass dem nicht mehr so
- * ist, wenn einer von mehreren Conn_Write()'s fehlgeschlagen ist.
- * In diesem Fall wird hier einfach ein Fehler geliefert. */
- if( My_Connections[Idx].sock <= NONE ) {
- LogDebug("Skipped write on closed socket (connection %d).", Idx );
- return false;
- }
+ c = Conn_GetClient(Idx);
+ assert( c != NULL);
- /* Pruefen, ob im Schreibpuffer genuegend Platz ist. Ziel ist es,
- * moeglichts viel im Puffer zu haben und _nicht_ gleich alles auf den
- * Socket zu schreiben (u.a. wg. Komprimierung). */
- if( array_bytes(&My_Connections[Idx].wbuf) >= WRITEBUFFER_LEN) {
- /* Der Puffer ist dummerweise voll. Jetzt versuchen, den Puffer
- * zu schreiben, wenn das nicht klappt, haben wir ein Problem ... */
- if( ! Handle_Write( Idx )) return false;
+ /* Servers do get special write buffer limits, so they can generate
+ * all the messages that are required while peering. */
+ if (Client_Type(c) == CLIENT_SERVER)
+ writebuf_limit = WRITEBUFFER_SLINK_LEN;
- /* check again: if our writebuf is twice als large as the initial limit: Kill connection */
- if( array_bytes(&My_Connections[Idx].wbuf) >= (WRITEBUFFER_LEN*2)) {
- Log( LOG_NOTICE, "Write buffer overflow (connection %d)!", Idx );
- Conn_Close( Idx, "Write buffer overflow!", NULL, false );
- return false;
- }
+ /* Is the socket still open? A previous call to Conn_Write()
+ * may have closed the connection due to a fatal error.
+ * In this case it is sufficient to return an error, as well. */
+ if( My_Connections[Idx].sock <= NONE ) {
+ LogDebug("Skipped write on closed socket (connection %d).", Idx);
+ return false;
}
#ifdef ZLIB
if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
- /* Daten komprimieren und in Puffer kopieren */
- if( ! Zip_Buffer( Idx, Data, Len )) return false;
+ /* Compressed link:
+ * Zip_Buffer() does all the dirty work for us: it flushes
+ * the (pre-)compression buffers if required and handles
+ * all error conditions. */
+ if (!Zip_Buffer(Idx, Data, Len))
+ return false;
}
else
#endif
{
- /* Daten in Puffer kopieren */
- if (!array_catb( &My_Connections[Idx].wbuf, Data, Len ))
+ /* Uncompressed link:
+ * Check if outbound buffer has enough space for the data. */
+ if (array_bytes(&My_Connections[Idx].wbuf) + Len >=
+ writebuf_limit) {
+ /* Buffer is full, flush it. Handle_Write deals with
+ * low-level errors, if any. */
+ if (!Handle_Write(Idx))
+ return false;
+ }
+
+ /* When the write buffer is still too big after flushing it,
+ * the connection will be killed. */
+ if (array_bytes(&My_Connections[Idx].wbuf) + Len >=
+ writebuf_limit) {
+ Log(LOG_NOTICE,
+ "Write buffer overflow (connection %d, size %lu byte)!",
+ Idx,
+ (unsigned long)array_bytes(&My_Connections[Idx].wbuf));
+ Conn_Close(Idx, "Write buffer overflow!", NULL, false);
+ return false;
+ }
+
+ /* Copy data to write buffer */
+ if (!array_catb(&My_Connections[Idx].wbuf, Data, Len))
return false;
My_Connections[Idx].bytes_out += Len;
CLIENT *c;
char *txt;
double in_k, out_k;
+ UINT16 port;
#ifdef ZLIB
double in_z_k, out_z_k;
int in_p, out_p;
/* Mark link as "closing" */
Conn_OPTION_ADD( &My_Connections[Idx], 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 ));
+ if (LogMsg)
+ txt = LogMsg;
+ else
+ txt = FwdMsg;
+ if (! txt)
+ txt = "Reason unknown";
+
+ port = ng_ipaddr_getport(&My_Connections[Idx].addr);
+ Log(LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx,
+ LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, port);
/* Search client, if any */
c = Conn_GetClient( Idx );
(double)My_Connections[Idx].bytes_out / 1024);
}
#endif
-
/* Send ERROR to client (see RFC!) */
if (FwdMsg)
Conn_WriteStr(Idx, "ERROR :%s", FwdMsg);
c = Conn_GetClient( Idx );
/* Shut down socket */
- if( ! io_close( My_Connections[Idx].sock ))
- {
+ if (! io_close(My_Connections[Idx].sock)) {
/* Oops, we can't close the socket!? This is ... ugly! */
- Log( LOG_CRIT, "Error closing connection %d (socket %d) with %s:%d - %s! (ignored)", Idx, My_Connections[Idx].sock, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port), strerror( errno ));
+ Log(LOG_CRIT,
+ "Error closing connection %d (socket %d) with %s:%d - %s! (ignored)",
+ Idx, My_Connections[Idx].sock, My_Connections[Idx].host,
+ port, strerror(errno));
}
/* Mark socket as invalid: */
My_Connections[Idx].sock = NONE;
/* If there is still a client, unregister it now */
- if( c ) Client_Destroy( c, LogMsg, FwdMsg, true );
+ if (c)
+ Client_Destroy(c, LogMsg, FwdMsg, true);
/* Calculate statistics and log information */
in_k = (double)My_Connections[Idx].bytes_in / 1024;
out_k = (double)My_Connections[Idx].bytes_out / 1024;
#ifdef ZLIB
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
+ if (Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP)) {
in_z_k = (double)My_Connections[Idx].zip.bytes_in / 1024;
out_z_k = (double)My_Connections[Idx].zip.bytes_out / 1024;
+ /* Make sure that no division by zero can occur during
+ * 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)
+ in_z_k = in_k;
+ if (! out_z_k)
+ out_z_k = out_k;
in_p = (int)(( in_k * 100 ) / in_z_k );
out_p = (int)(( out_k * 100 ) / out_z_k );
- Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, in_z_k, in_p, out_k, out_z_k, out_p );
+ Log(LOG_INFO,
+ "Connection %d with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).",
+ Idx, My_Connections[Idx].host, port,
+ in_k, in_z_k, in_p, out_k, out_z_k, out_p);
}
else
#endif
{
- Log( LOG_INFO, "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).", Idx, My_Connections[Idx].host, ntohs( My_Connections[Idx].addr.sin_port ), in_k, out_k );
+ Log(LOG_INFO,
+ "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).",
+ Idx, My_Connections[Idx].host, port,
+ in_k, out_k);
}
/* cancel running resolver */
- if (Resolve_INPROGRESS(&My_Connections[Idx].res_stat)) {
+ if (Resolve_INPROGRESS(&My_Connections[Idx].res_stat))
Resolve_Shutdown(&My_Connections[Idx].res_stat);
- }
/* Servers: Modify time of next connect attempt? */
Conf_UnsetServer( Idx );
array_free(&My_Connections[Idx].rbuf);
array_free(&My_Connections[Idx].wbuf);
+
/* Clean up connection structure (=free it) */
Init_Conn_Struct( Idx );
} /* SyncServerStruct */
+/**
+ * Send out data of write buffer; connect new sockets.
+ */
static bool
Handle_Write( CONN_ID Idx )
{
- /* Daten aus Schreibpuffer versenden bzw. Connection aufbauen */
-
- int len;
- unsigned int wdatalen;
+ ssize_t len;
+ size_t wdatalen;
assert( Idx > NONE );
if ( My_Connections[Idx].sock < 0 ) {
}
assert( My_Connections[Idx].sock > NONE );
- LogDebug("Handle_Write() called for connection %d ...", Idx);
-
wdatalen = array_bytes(&My_Connections[Idx].wbuf );
+
#ifdef ZLIB
- if (wdatalen == 0 && !array_bytes(&My_Connections[Idx].zip.wbuf)) {
- io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
- return true;
+ if (wdatalen == 0) {
+ /* Write buffer is empty, so we try to flush the compression
+ * buffer and get some data to work with from there :-) */
+ if (!Zip_Flush(Idx))
+ return false;
+
+ /* Now the write buffer most probably has changed: */
+ wdatalen = array_bytes(&My_Connections[Idx].wbuf);
}
+#endif
- /* write buffer empty, but not compression buffer?
- * -> flush compression buffer! */
- if (wdatalen == 0)
- Zip_Flush(Idx);
-#else
if (wdatalen == 0) {
+ /* Still no data, fine. */
io_event_del(My_Connections[Idx].sock, IO_WANTWRITE );
return true;
}
-#endif
- /* Zip_Flush() may have changed the write buffer ... */
- wdatalen = array_bytes(&My_Connections[Idx].wbuf);
+ LogDebug
+ ("Handle_Write() called for connection %d, %ld bytes pending ...",
+ Idx, wdatalen);
len = write(My_Connections[Idx].sock,
array_start(&My_Connections[Idx].wbuf), wdatalen );
}
/* move any data not yet written to beginning */
- array_moveleft(&My_Connections[Idx].wbuf, 1, len);
+ array_moveleft(&My_Connections[Idx].wbuf, 1, (size_t)len);
return true;
} /* Handle_Write */
+static int
+Count_Connections(ng_ipaddr_t *a)
+{
+ int i, cnt;
+
+ cnt = 0;
+ for (i = 0; i < Pool_Size; i++) {
+ if (My_Connections[i].sock <= NONE)
+ continue;
+ if (ng_ipaddr_ipequal(&My_Connections[i].addr, a))
+ cnt++;
+ }
+ return cnt;
+} /* Count_Connections */
+
+
static int
New_Connection( int Sock )
{
#ifdef TCPWRAP
struct request_info req;
#endif
- struct sockaddr_in new_addr;
+ ng_ipaddr_t new_addr;
+ char ip_str[NG_INET_ADDRSTRLEN];
int new_sock, new_sock_len, new_Pool_Size;
CLIENT *c;
long cnt;
assert( Sock > NONE );
/* Connection auf Listen-Socket annehmen */
- new_sock_len = sizeof( new_addr );
- new_sock = accept( Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len );
- if( new_sock < 0 )
- {
- Log( LOG_CRIT, "Can't accept connection: %s!", strerror( errno ));
+ new_sock_len = (int)sizeof(new_addr);
+
+ new_sock = accept(Sock, (struct sockaddr *)&new_addr,
+ (socklen_t *)&new_sock_len);
+ if (new_sock < 0) {
+ Log(LOG_CRIT, "Can't accept connection: %s!", strerror(errno));
return -1;
}
+ if (!ng_ipaddr_tostr_r(&new_addr, ip_str)) {
+ Log(LOG_CRIT, "fd %d: Can't convert IP address!", new_sock);
+ Simple_Message(new_sock, "ERROR :Internal Server Error");
+ close(new_sock);
+ }
+
#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! */
- Log( deny_severity, "Refused connection from %s (by TCP Wrappers)!", inet_ntoa( new_addr.sin_addr ));
+ if (!hosts_access(&req)) {
+ Log (deny_severity, "Refused connection from %s (by TCP Wrappers)!", ip_str);
Simple_Message( new_sock, "ERROR :Connection refused" );
close( new_sock );
return -1;
/* Socket initialisieren */
if (!Init_Socket( new_sock ))
return -1;
-
+
/* Check IP-based connection limit */
- cnt = Count_Connections( new_addr );
- if(( Conf_MaxConnectionsIP > 0 ) && ( cnt >= Conf_MaxConnectionsIP ))
- {
+ cnt = Count_Connections(&new_addr);
+ if ((Conf_MaxConnectionsIP > 0) && (cnt >= Conf_MaxConnectionsIP)) {
/* Access denied, too many connections from this IP address! */
- Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", inet_ntoa( new_addr.sin_addr ), cnt);
+ Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", ip_str, cnt);
Simple_Message( new_sock, "ERROR :Connection refused, too many connections from your IP address!" );
close( new_sock );
return -1;
return -1;
}
- if (!array_alloc(&My_ConnArray, sizeof( CONNECTION ), new_sock)) {
+ 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 );
Init_Conn_Struct(Pool_Size++);
}
- c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
+ /* register callback */
+ if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
+ Log(LOG_ALERT, "Can't accept connection: io_event_create failed!");
+ Simple_Message(new_sock, "ERROR :Internal error");
+ close(new_sock);
+ return -1;
+ }
+
+ c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false );
if( ! c ) {
- Log( LOG_ALERT, "Can't accept connection: can't create client structure!" );
- Simple_Message( new_sock, "ERROR :Internal error" );
- close( new_sock );
+ Log(LOG_ALERT, "Can't accept connection: can't create client structure!");
+ Simple_Message(new_sock, "ERROR :Internal error");
+ io_close(new_sock);
return -1;
}
My_Connections[new_sock].addr = new_addr;
My_Connections[new_sock].client = c;
- /* register callback */
- if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) {
- Simple_Message( new_sock, "ERROR :Internal error" );
- Conn_Close( new_sock, "io_event_create() failed", NULL, false );
- return -1;
- }
-
Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock,
- inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
+ ip_str, ng_ipaddr_getport(&new_addr), Sock);
/* Hostnamen ermitteln */
- strlcpy( My_Connections[new_sock].host, inet_ntoa( new_addr.sin_addr ),
- sizeof( My_Connections[new_sock].host ));
+ strlcpy(My_Connections[new_sock].host, ip_str, sizeof(My_Connections[new_sock].host));
- Client_SetHostname( c, My_Connections[new_sock].host );
+ Client_SetHostname(c, My_Connections[new_sock].host);
- Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
- My_Connections[new_sock].sock, cb_Read_Resolver_Result);
+ if (!Conf_NoDNS)
+ Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
+ My_Connections[new_sock].sock, cb_Read_Resolver_Result);
- /* Penalty-Zeit setzen */
- Conn_SetPenalty( new_sock, 4 );
+ Conn_SetPenalty(new_sock, 4);
return new_sock;
} /* New_Connection */
} /* Socket2Index */
+/**
+ * Read data from the network to the read buffer. If an error occures,
+ * the socket of this connection will be shut down.
+ */
static void
Read_Request( CONN_ID Idx )
{
- /* Daten von Socket einlesen und entsprechend behandeln.
- * Tritt ein Fehler auf, so wird der Socket geschlossen. */
-
- int len;
- char readbuf[1024];
+ ssize_t len;
+ char readbuf[READBUFFER_LEN];
CLIENT *c;
-
assert( Idx > NONE );
assert( My_Connections[Idx].sock > NONE );
#ifdef ZLIB
- if (( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN ) ||
- ( array_bytes(&My_Connections[Idx].zip.rbuf) >= ZREADBUFFER_LEN ))
+ if ((array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN) ||
+ (array_bytes(&My_Connections[Idx].zip.rbuf) >= READBUFFER_LEN))
#else
- if ( array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN )
+ if (array_bytes(&My_Connections[Idx].rbuf) >= READBUFFER_LEN)
#endif
{
- /* Der Lesepuffer ist voll */
- Log( LOG_ERR, "Receive buffer overflow (connection %d): %d bytes!", Idx,
- array_bytes(&My_Connections[Idx].rbuf));
+ /* Read buffer is full */
+ Log(LOG_ERR,
+ "Receive buffer overflow (connection %d): %d bytes!",
+ Idx, array_bytes(&My_Connections[Idx].rbuf));
Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
return;
}
- 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 ));
- Conn_Close( Idx, "Socket closed!", "Client closed connection", false );
+ len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf));
+ if (len == 0) {
+ Log(LOG_INFO, "%s:%u (%s) is closing the connection ...",
+ My_Connections[Idx].host,
+ (unsigned int) ng_ipaddr_getport(&My_Connections[Idx].addr),
+ ng_ipaddr_tostr(&My_Connections[Idx].addr));
+ Conn_Close(Idx,
+ "Socket closed!", "Client closed connection",
+ false);
return;
}
- if( len < 0 ) {
+ if (len < 0) {
if( errno == EAGAIN ) return;
- Log( LOG_ERR, "Read error on connection %d (socket %d): %s!", Idx,
- My_Connections[Idx].sock, strerror( errno ));
- Conn_Close( Idx, "Read error!", "Client closed connection", false );
+ Log(LOG_ERR, "Read error on connection %d (socket %d): %s!",
+ Idx, My_Connections[Idx].sock, strerror(errno));
+ Conn_Close(Idx, "Read error!", "Client closed connection",
+ false);
return;
}
#ifdef ZLIB
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
- if (!array_catb( &My_Connections[Idx].zip.rbuf, readbuf, len)) {
- Log( LOG_ERR, "Could not append recieved data to zip input buffer (connn %d): %d bytes!", Idx, len );
- Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
+ if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) {
+ if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf,
+ (size_t) len)) {
+ Log(LOG_ERR,
+ "Could not append recieved data to zip input buffer (connn %d): %d bytes!",
+ Idx, len);
+ Conn_Close(Idx, "Receive buffer overflow!", NULL,
+ false);
return;
}
} else
#endif
{
- readbuf[len] = 0;
- if (!array_cats( &My_Connections[Idx].rbuf, readbuf )) {
+ if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) {
Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len );
Conn_Close( Idx, "Receive buffer overflow!", NULL, false );
}
/* Update timestamp of last data received if this connection is
* registered as a user, server or service connection. Don't update
* otherwise, so users have at least Conf_PongTimeout seconds time to
- * register with the IRC server -- see Check_Connections(). */
+ * register with the IRC server -- see Check_Connections().
+ * Set "lastping", too, so we can handle time shifts backwards ... */
c = Conn_GetClient(Idx);
if (c && (Client_Type(c) == CLIENT_USER
|| Client_Type(c) == CLIENT_SERVER
- || Client_Type(c) == CLIENT_SERVICE))
+ || Client_Type(c) == CLIENT_SERVICE)) {
My_Connections[Idx].lastdata = time(NULL);
+ My_Connections[Idx].lastping = My_Connections[Idx].lastdata;
+ }
/* Look at the data in the (read-) buffer of this connection */
Handle_Buffer(Idx);
} /* Read_Request */
+/**
+ * Handle data in connection read-buffer.
+ * @return true if a reuqest was handled, false otherwise (and on errors).
+ */
static bool
-Handle_Buffer( CONN_ID Idx )
+Handle_Buffer(CONN_ID Idx)
{
- /* Handle Data in Connections Read-Buffer.
- * Return true if a reuqest was handled, false otherwise (also returned on errors). */
#ifndef STRICT_RFC
char *ptr1, *ptr2;
#endif
char *ptr;
- int len, delta;
+ size_t len, delta;
bool result;
time_t starttime;
#ifdef ZLIB
result = false;
for (;;) {
/* Check penalty */
- if( My_Connections[Idx].delaytime > starttime) return result;
+ if (My_Connections[Idx].delaytime > starttime)
+ return result;
#ifdef ZLIB
- /* unpack compressed data */
- if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP ))
- if( ! Unzip_Buffer( Idx )) return false;
+ /* Unpack compressed data, if compression is in use */
+ if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) {
+ if (!Unzip_Buffer(Idx))
+ return false;
+ }
#endif
if (0 == array_bytes(&My_Connections[Idx].rbuf))
break;
- if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
+ /* Make sure that the buffer is NULL terminated */
+ if (!array_cat0_temporary(&My_Connections[Idx].rbuf))
return false;
- /* A Complete Request end with CR+LF, see RFC 2812. */
- ptr = strstr( array_start(&My_Connections[Idx].rbuf), "\r\n" );
+ /* RFC 2812, section "2.3 Messages", 5th paragraph:
+ * "IRC messages are always lines of characters terminated
+ * with a CR-LF (Carriage Return - Line Feed) pair [...]". */
+ delta = 2;
+ ptr = strstr(array_start(&My_Connections[Idx].rbuf), "\r\n");
- if( ptr ) delta = 2; /* complete request */
#ifndef STRICT_RFC
- else {
- /* Check for non-RFC-compliant request (only CR or LF)? Unfortunately,
- * there are quite a few clients that do this (incl. "mIRC" :-( */
- ptr1 = strchr( array_start(&My_Connections[Idx].rbuf), '\r' );
- ptr2 = strchr( array_start(&My_Connections[Idx].rbuf), '\n' );
+ if (!ptr) {
+ /* Check for non-RFC-compliant request (only CR or
+ * LF)? Unfortunately, there are quite a few clients
+ * out there that do this -- incl. "mIRC" :-( */
delta = 1;
- if( ptr1 && ptr2 ) ptr = ptr1 > ptr2 ? ptr2 : ptr1;
- else if( ptr1 ) ptr = ptr1;
- else if( ptr2 ) ptr = ptr2;
+ ptr1 = strchr(array_start(&My_Connections[Idx].rbuf), '\r');
+ ptr2 = strchr(array_start(&My_Connections[Idx].rbuf), '\n');
+ if (ptr1 && ptr2)
+ ptr = ptr1 > ptr2 ? ptr2 : ptr1;
+ else if (ptr1)
+ ptr = ptr1;
+ else if (ptr2)
+ ptr = ptr2;
}
#endif
- if( ! ptr )
+ if (!ptr)
break;
- /* End of request found */
+ /* Complete (=line terminated) request found, handle it! */
*ptr = '\0';
- len = ( ptr - (char*) array_start(&My_Connections[Idx].rbuf)) + delta;
+ len = ptr - (char *)array_start(&My_Connections[Idx].rbuf) + delta;
- if( len < 0 || len > ( COMMAND_LEN - 1 )) {
- /* Request must not exceed 512 chars (incl. CR+LF!), see
- * RFC 2812. Disconnect Client if this happens. */
- Log( LOG_ERR, "Request too long (connection %d): %d bytes (max. %d expected)!",
- Idx, array_bytes(&My_Connections[Idx].rbuf), COMMAND_LEN - 1 );
- Conn_Close( Idx, NULL, "Request too long", true );
+ if (len > (COMMAND_LEN - 1)) {
+ /* Request must not exceed 512 chars (incl. CR+LF!),
+ * see RFC 2812. Disconnect Client if this happens. */
+ Log(LOG_ERR,
+ "Request too long (connection %d): %d bytes (max. %d expected)!",
+ Idx, array_bytes(&My_Connections[Idx].rbuf),
+ COMMAND_LEN - 1);
+ Conn_Close(Idx, NULL, "Request too long", true);
return false;
}
- if (len <= 2) { /* request was empty (only '\r\n') */
- array_moveleft(&My_Connections[Idx].rbuf, 1, delta); /* delta is either 1 or 2 */
+ if (len <= delta) {
+ /* Request is empty (only '\r\n', '\r' or '\n');
+ * delta is 2 ('\r\n') or 1 ('\r' or '\n'), see above */
+ array_moveleft(&My_Connections[Idx].rbuf, 1, len);
break;
}
+
#ifdef ZLIB
/* remember if stream is already compressed */
old_z = My_Connections[Idx].options & CONN_ZIP;
#endif
My_Connections[Idx].msg_in++;
- if (!Parse_Request(Idx, (char*)array_start(&My_Connections[Idx].rbuf) ))
+ if (!Parse_Request
+ (Idx, (char *)array_start(&My_Connections[Idx].rbuf)))
return false;
result = true;
array_moveleft(&My_Connections[Idx].rbuf, 1, len);
LogDebug("Connection %d: %d bytes left in read buffer.",
- Idx, array_bytes(&My_Connections[Idx].rbuf));
+ Idx, array_bytes(&My_Connections[Idx].rbuf));
#ifdef ZLIB
- if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) &&
- ( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
- {
- /* The last Command activated Socket-Compression.
- * Data that was read after that needs to be copied to Unzip-buf
- * for decompression */
- if( array_bytes(&My_Connections[Idx].rbuf)> ZREADBUFFER_LEN ) {
- Log( LOG_ALERT, "Connection %d: No space left in unzip buf (need %u bytes)!",
- Idx, array_bytes(&My_Connections[Idx].rbuf ));
- return false;
- }
- if (!array_copy( &My_Connections[Idx].zip.rbuf, &My_Connections[Idx].rbuf ))
+ if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) &&
+ (array_bytes(&My_Connections[Idx].rbuf) > 0)) {
+ /* The last command activated socket compression.
+ * Data that was read after that needs to be copied
+ * to the unzip buffer for decompression: */
+ if (!array_copy
+ (&My_Connections[Idx].zip.rbuf,
+ &My_Connections[Idx].rbuf))
return false;
array_trunc(&My_Connections[Idx].rbuf);
- LogDebug("Moved already received data (%u bytes) to uncompression buffer.",
- array_bytes(&My_Connections[Idx].zip.rbuf));
+ LogDebug
+ ("Moved already received data (%u bytes) to uncompression buffer.",
+ array_bytes(&My_Connections[Idx].zip.rbuf));
}
-#endif /* ZLIB */
+#endif
}
return result;
} /* Handle_Buffer */
static void
-Check_Connections( void )
+Check_Connections(void)
{
/* 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 < 0)
continue;
- c = Conn_GetClient( i );
- if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE )))
- {
+ c = Conn_GetClient(i);
+ if (c && ((Client_Type(c) == CLIENT_USER)
+ || (Client_Type(c) == CLIENT_SERVER)
+ || (Client_Type(c) == CLIENT_SERVICE))) {
/* 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 ) {
+ if (My_Connections[i].lastping >
+ My_Connections[i].lastdata) {
+ /* We already sent a ping */
+ if (My_Connections[i].lastping <
+ time(NULL) - Conf_PongTimeout) {
/* Timeout */
- LogDebug("Connection %d: Ping timeout: %d seconds.",
- i, Conf_PongTimeout );
- Conn_Close( i, NULL, "Ping timeout", true );
+ LogDebug
+ ("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) {
+ /* We need to send a PING ... */
+ LogDebug("Connection %d: sending PING ...", i);
+ My_Connections[i].lastping = time(NULL);
+ Conn_WriteStr(i, "PING :%s",
+ Client_ID(Client_ThisServer()));
}
- else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) {
- /* we need to sent a PING */
- LogDebug("Connection %d: sending PING ...", i );
- My_Connections[i].lastping = time( NULL );
- Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( )));
- }
- }
- else
- {
+ } else {
/* The connection is not fully established yet, so
* we don't do the PING-PONG game here but instead
* disconnect the client after "a short time" if it's
if (My_Connections[i].lastdata <
time(NULL) - Conf_PongTimeout) {
- LogDebug("Unregistered connection %d timed out ...", i);
+ LogDebug
+ ("Unregistered connection %d timed out ...",
+ i);
Conn_Close(i, NULL, "Timeout", false);
}
}
if( Conf_Server[i].group > NONE ) {
for (n = 0; n < MAX_SERVERS; n++) {
if (n == i) continue;
- if ((Conf_Server[n].conn_id > NONE) &&
+ if ((Conf_Server[n].conn_id != NONE) &&
(Conf_Server[n].group == Conf_Server[i].group))
break;
}
/* Okay, try to connect now */
Conf_Server[i].lasttry = time_now;
+ Conf_Server[i].conn_id = SERVER_WAIT;
assert(Resolve_Getfd(&Conf_Server[i].res_stat) < 0);
Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server);
}
static void
-New_Server( int Server )
+New_Server( int Server , ng_ipaddr_t *dest)
{
/* Establish new server link */
-
- struct sockaddr_in new_addr;
- struct in_addr inaddr;
- int res, new_sock;
+ char ip_str[NG_INET_ADDRSTRLEN];
+ int af_dest, res, new_sock;
CLIENT *c;
assert( Server > NONE );
- Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ", Conf_Server[Server].host,
- Conf_Server[Server].ip, Conf_Server[Server].port );
-
-#ifdef HAVE_INET_ATON
- if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 )
-#else
- memset( &inaddr, 0, sizeof( inaddr ));
- inaddr.s_addr = inet_addr( Conf_Server[Server].ip );
- if( inaddr.s_addr == (unsigned)-1 )
-#endif
- {
- Log( LOG_ERR, "Can't connect to \"%s\": can't convert ip address %s!",
- Conf_Server[Server].host, Conf_Server[Server].ip );
+ if (!ng_ipaddr_tostr_r(dest, ip_str)) {
+ Log(LOG_WARNING, "New_Server: Could not convert IP to string");
return;
}
- memset( &new_addr, 0, sizeof( new_addr ));
- new_addr.sin_family = AF_INET;
- new_addr.sin_addr = inaddr;
- new_addr.sin_port = htons( Conf_Server[Server].port );
+ Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ",
+ Conf_Server[Server].host, ip_str, Conf_Server[Server].port );
- new_sock = socket( PF_INET, SOCK_STREAM, 0 );
- if ( new_sock < 0 ) {
+ af_dest = ng_ipaddr_af(dest);
+ new_sock = socket(af_dest, SOCK_STREAM, 0);
+ if (new_sock < 0) {
Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
return;
}
- if( ! Init_Socket( new_sock )) return;
+ if (!Init_Socket(new_sock))
+ return;
- res = connect( new_sock, (struct sockaddr *)&new_addr, sizeof( new_addr ));
+ /* 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 (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));
+ }
+ ng_ipaddr_setport(dest, Conf_Server[Server].port);
+ res = connect(new_sock, (struct sockaddr *) dest, ng_ipaddr_salen(dest));
if(( res != 0 ) && ( errno != EINPROGRESS )) {
Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
close( new_sock );
return;
}
-
- if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), new_sock)) {
- Log( LOG_ALERT, "Cannot allocate memory for server connection (socket %d)", new_sock);
+
+ if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), (size_t)new_sock)) {
+ Log(LOG_ALERT,
+ "Cannot allocate memory for server connection (socket %d)",
+ new_sock);
close( new_sock );
return;
}
Init_Conn_Struct(new_sock);
- c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
- if( ! c ) {
+ ng_ipaddr_tostr_r(dest, ip_str);
+ c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWNSERVER, false);
+ if (!c) {
Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
close( new_sock );
return;
/* Register connection */
Conf_Server[Server].conn_id = new_sock;
My_Connections[new_sock].sock = new_sock;
- My_Connections[new_sock].addr = new_addr;
+ My_Connections[new_sock].addr = *dest;
My_Connections[new_sock].client = c;
strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host,
sizeof(My_Connections[new_sock].host ));
} /* New_Server */
+/**
+ * Initialize connection structure.
+ */
static void
-Init_Conn_Struct( CONN_ID Idx )
+Init_Conn_Struct(CONN_ID Idx)
{
- time_t now = time( NULL );
- /* Connection-Struktur initialisieren */
+ time_t now = time(NULL);
- memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
+ memset(&My_Connections[Idx], 0, sizeof(CONNECTION));
My_Connections[Idx].sock = -1;
+ My_Connections[Idx].signon = now;
My_Connections[Idx].lastdata = now;
My_Connections[Idx].lastprivmsg = now;
Resolve_Init(&My_Connections[Idx].res_stat);
/* Read result of resolver sub-process from pipe and start connection */
int i;
size_t len;
- char readbuf[HOST_LEN + 1];
+ 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 */
LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
if (Resolve_Getfd(&Conf_Server[i].res_stat) == fd )
break;
}
-
+
if( i >= MAX_SERVERS) {
/* Ops, no matching server found?! */
io_close( fd );
}
/* Read result from pipe */
- len = Resolve_Read(&Conf_Server[i].res_stat, readbuf, sizeof readbuf -1);
+ len = Resolve_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
if (len == 0)
return;
-
- readbuf[len] = '\0';
- LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
- strlcpy( Conf_Server[i].ip, readbuf, sizeof( Conf_Server[i].ip ));
+ assert((len % sizeof(ng_ipaddr_t)) == 0);
+
+ 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)) {
+ /* more than one address for this hostname, remember them
+ * in case first address is unreachable/not available */
+ len -= sizeof(ng_ipaddr_t);
+ if (len > sizeof(&Conf_Server[i].dst_addr)) {
+ len = sizeof(&Conf_Server[i].dst_addr);
+ Log(LOG_NOTICE, "Notice: Resolver returned more IP Addresses for host than we can handle,"
+ " additional addresses dropped");
+ }
+ memcpy(&Conf_Server[i].dst_addr, &dest_addrs[1], len);
+ }
/* connect() */
- New_Server(i);
+ New_Server(i, dest_addrs);
} /* cb_Read_Forward_Lookup */
#ifdef IDENTAUTH
++identptr;
if (*identptr) {
- Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, identptr);
- Client_SetUser( c, identptr, true );
+ Log(LOG_INFO, "IDENT lookup for connection %d: \"%s\".", i, identptr);
+ Client_SetUser(c, identptr, true);
} else {
- Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+ Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
}
#endif
}
} /* Simple_Error */
-static int
-Count_Connections( struct sockaddr_in addr_in )
-{
- int i, cnt;
-
- cnt = 0;
- for( i = 0; i < Pool_Size; i++ ) {
- if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++;
- }
- return cnt;
-} /* Count_Connections */
-
-
GLOBAL CLIENT *
Conn_GetClient( CONN_ID Idx )
{
CONNECTION *c;
assert( Idx >= 0 );
- c = array_get(&My_ConnArray, sizeof (CONNECTION), Idx);
-
+ c = array_get(&My_ConnArray, sizeof (CONNECTION), (size_t)Idx);
+
assert(c != NULL);
-
+
return c ? c->client : NULL;
}
projects / ngircd-alex.git / blobdiff