#include "portab.h"
#include "io.h"
-static char UNUSED id[] = "$Id: conn.c,v 1.217 2007/11/25 18:42:37 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>
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, struct in_addr *dest));
+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(( const char *listen_addr, UINT16 Port ));
static array My_Listeners;
static array My_ConnArray;
Conf_Server[Conf_GetServer(idx)].port,
idx, strerror(err));
+ 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);
}
static unsigned int
-ports_initlisteners(array *a, void (*func)(int,short))
+ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short))
{
unsigned int created = 0;
size_t len;
len = array_length(a, sizeof (UINT16));
port = array_start(a);
- while(len--) {
- fd = NewListener( *port );
+ while (len--) {
+ fd = NewListener(listen_addr, *port);
if (fd < 0) {
port++;
continue;
}
if (!io_event_create( fd, IO_WANTREAD, func )) {
Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!",
- fd, (unsigned int) *port, strerror(errno));
+ fd, (unsigned int) *port, strerror(errno));
close(fd);
port++;
continue;
created++;
port++;
}
-
return created;
}
Conn_InitListeners( void )
{
/* Initialize ports on which the server should accept connections */
-
- unsigned int created;
+ unsigned int created = 0;
+ char *copy, *listen_addr;
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);
+ assert(Conf_ListenAddress);
+
+ /* can't use Conf_ListenAddress directly, see below */
+ copy = strdup(Conf_ListenAddress);
+ if (!copy) {
+ Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, strerror(errno));
+ return 0;
+ }
+ listen_addr = strtok(copy, ",");
+
+ while (listen_addr) {
+ ngt_TrimStr(listen_addr);
+ if (*listen_addr)
+ created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen);
+
+ listen_addr = strtok(NULL, ",");
+ }
+ /*
+ * can't free() Conf_ListenAddress here. On /REHASH, if the config file
+ * cannot be re-loaded, we'd end up with a NULL Conf_ListenAddress.
+ * Instead, free() takes place in conf.c, before the config file
+ * is being parsed.
+ */
+ free(copy);
return created;
} /* Conn_InitListeners */
} /* Conn_ExitListeners */
-static void
-InitSinaddr(struct sockaddr_in *addr, UINT16 Port)
+static bool
+InitSinaddrListenAddr(ng_ipaddr_t *addr, const char *listen_addrstr, UINT16 Port)
{
- struct in_addr inaddr;
-
- memset(addr, 0, sizeof(*addr));
- memset( &inaddr, 0, sizeof(inaddr));
+ bool ret;
- addr->sin_family = AF_INET;
- addr->sin_port = htons(Port);
- inaddr.s_addr = htonl(INADDR_ANY);
- addr->sin_addr = inaddr;
+ ret = ng_ipaddr_init(addr, listen_addrstr, Port);
+ if (!ret) {
+ assert(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 bool
-InitSinaddrListenAddr(struct sockaddr_in *addr, UINT16 Port)
+static void
+set_v6_only(int af, int sock)
{
- struct in_addr inaddr;
-
- InitSinaddr(addr, Port);
+#if defined(IPV6_V6ONLY) && defined(WANT_IPV6)
+ int on = 1;
- if (!Conf_ListenAddress[0])
- return true;
-
- if (!ngt_IPStrToBin(Conf_ListenAddress, &inaddr)) {
- Log( LOG_CRIT, "Can't bind to %s:%u: can't convert ip address \"%s\"",
- Conf_ListenAddress, Port, Conf_ListenAddress);
- return false;
- }
+ if (af != AF_INET6)
+ return;
- addr->sin_addr = inaddr;
- return true;
+ 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(const char *listen_addr, UINT16 Port)
{
/* Create new listening socket on specified port */
-
- struct sockaddr_in addr;
- int sock;
+ ng_ipaddr_t addr;
+ int sock, af;
#ifdef ZEROCONF
char name[CLIENT_ID_LEN], *info;
#endif
+ if (!InitSinaddrListenAddr(&addr, listen_addr, Port))
+ return -1;
- InitSinaddrListenAddr(&addr, Port);
-
- addr.sin_family = AF_INET;
- addr.sin_port = htons( Port );
-
- sock = socket( PF_INET, SOCK_STREAM, 0);
+ af = ng_ipaddr_af(&addr);
+ sock = socket(af, SOCK_STREAM, 0);
if( sock < 0 ) {
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+ Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno));
return -1;
}
- if( ! Init_Socket( sock )) return -1;
+ set_v6_only(af, sock);
- if (bind(sock, (struct sockaddr *)&addr, (socklen_t)sizeof(addr)) != 0) {
- Log( LOG_CRIT, "Can't bind socket (port %d) : %s!", Port, strerror( errno ));
- close( 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 );
+ Log(LOG_INFO, "Now listening on [%s]:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
#ifdef ZEROCONF
/* Get best server description text */
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;
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,
- ntohs(My_Connections[Idx].addr.sin_port));
+ LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, port);
/* Search client, if any */
c = Conn_GetClient( Idx );
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));
+ port, strerror(errno));
}
/* Mark socket as invalid: */
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),
+ Idx, My_Connections[Idx].host, port,
in_k, in_z_k, in_p, out_k, out_z_k, out_p);
}
else
{
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),
+ Idx, My_Connections[Idx].host, port,
in_k, out_k);
}
} /* 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 = (int)sizeof new_addr;
+ new_sock_len = (int)sizeof(new_addr);
+
new_sock = accept(Sock, (struct sockaddr *)&new_addr,
(socklen_t *)&new_sock_len);
if (new_sock < 0) {
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;
}
- c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
+ 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");
My_Connections[new_sock].client = c;
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);
if (!Conf_NoDNS)
Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf));
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));
+ 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);
} /* 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
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 > ( 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_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
-New_Server( int Server , struct in_addr *dest)
+New_Server( int Server , ng_ipaddr_t *dest)
{
/* Establish new server link */
- struct sockaddr_in local_addr;
- struct sockaddr_in new_addr;
- int res, new_sock;
+ char ip_str[NG_INET_ADDRSTRLEN];
+ int af_dest, res, new_sock;
CLIENT *c;
assert( Server > NONE );
- memset(&new_addr, 0, sizeof( new_addr ));
- new_addr.sin_family = AF_INET;
- new_addr.sin_addr = *dest;
- new_addr.sin_port = htons( Conf_Server[Server].port );
-
- new_sock = socket( PF_INET, SOCK_STREAM, 0 );
- if ( new_sock < 0 ) {
- Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
+ if (!ng_ipaddr_tostr_r(dest, ip_str)) {
+ Log(LOG_WARNING, "New_Server: Could not convert IP to string");
return;
}
- if( ! Init_Socket( new_sock )) return;
+ Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ",
+ Conf_Server[Server].host, ip_str, Conf_Server[Server].port );
+
+ 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 (af %d) : %s!", af_dest, strerror( errno ));
+ return;
+ }
- /* if we fail to bind, just continue and let connect() pick a source address */
- InitSinaddr(&local_addr, 0);
- local_addr.sin_addr = Conf_Server[Server].bind_addr;
- if (bind(new_sock, (struct sockaddr *)&local_addr, (socklen_t)sizeof(local_addr)))
- Log(LOG_WARNING, "Can't bind socket to %s!", Conf_ListenAddress, strerror( errno ));
+ if (!Init_Socket(new_sock))
+ return;
- res = connect(new_sock, (struct sockaddr *)&new_addr,
- (socklen_t)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 );
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 ));
/* Read result of resolver sub-process from pipe and start connection */
int i;
size_t len;
- struct in_addr dest_addr;
- 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);
}
/* 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);
+ assert((len % sizeof(ng_ipaddr_t)) == 0);
- if (!ngt_IPStrToBin(readbuf, &dest_addr)) {
- Log(LOG_ERR, "Can't connect to \"%s\": can't convert ip address %s!",
- Conf_Server[i].host, readbuf);
- return;
- }
+ LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len);
- Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ",
- Conf_Server[i].host, readbuf, Conf_Server[i].port );
+ 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, &dest_addr);
+ 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 )
{
projects / ngircd-alex.git / blobdiff