#include "hostmask.h"
#include "sslproc.h"
#include "hash.h"
+#include "s_assert.h"
+#include "logger.h"
#ifndef INADDR_NONE
#define INADDR_NONE ((unsigned int) 0xffffffff)
#if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
static const struct in6_addr in6addr_any =
{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
-#endif
+#endif
-static listener_t *ListenerPollList = NULL;
+static struct Listener *ListenerPollList = NULL;
static int accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, void *data);
static void accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data);
-static listener_t *
+static struct Listener *
make_listener(struct rb_sockaddr_storage *addr)
{
- listener_t *listener = (listener_t *) rb_malloc(sizeof(listener_t));
+ struct Listener *listener = (struct Listener *) rb_malloc(sizeof(struct Listener));
s_assert(0 != listener);
listener->name = me.name;
listener->F = NULL;
}
void
-free_listener(listener_t *listener)
+free_listener(struct Listener *listener)
{
s_assert(NULL != listener);
if(listener == NULL)
ListenerPollList = listener->next;
else
{
- listener_t *prev = ListenerPollList;
+ struct Listener *prev = ListenerPollList;
for (; prev; prev = prev->next)
{
if(listener == prev->next)
#define PORTNAMELEN 6 /* ":31337" */
+/*
+ * get_listener_port - return displayable listener port
+ */
+static uint16_t
+get_listener_port(const struct Listener *listener)
+{
+#ifdef RB_IPV6
+ if(listener->addr.ss_family == AF_INET6)
+ return ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
+ else
+#endif
+ return ntohs(((const struct sockaddr_in *)&listener->addr)->sin_port);
+}
+
/*
* get_listener_name - return displayable listener name and port
* returns "host.foo.org:6667" for a given listener
*/
const char *
-get_listener_name(const listener_t *listener)
+get_listener_name(const struct Listener *listener)
{
static char buf[HOSTLEN + HOSTLEN + PORTNAMELEN + 4];
- int port = 0;
s_assert(NULL != listener);
if(listener == NULL)
return NULL;
-#ifdef RB_IPV6
- if(listener->addr.ss_family == AF_INET6)
- port = ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
- else
-#endif
- port = ntohs(((const struct sockaddr_in *)&listener->addr)->sin_port);
-
- rb_snprintf(buf, sizeof(buf), "%s[%s/%u]", me.name, listener->name, port);
+ rb_snprintf(buf, sizeof(buf), "%s[%s/%u]",
+ me.name, listener->name, get_listener_port(listener));
return buf;
}
void
show_ports(struct Client *source_p)
{
- listener_t *listener = 0;
+ struct Listener *listener = 0;
for (listener = ListenerPollList; listener; listener = listener->next)
{
- sendto_one_numeric(source_p, RPL_STATSPLINE,
- form_str(RPL_STATSPLINE), 'P',
-#ifdef RB_IPV6
- ntohs(listener->addr.ss_family == AF_INET ? ((struct sockaddr_in *)&listener->addr)->sin_port :
- ((struct sockaddr_in6 *)&listener->addr)->sin6_port),
-#else
- ntohs(((struct sockaddr_in *)&listener->addr)->sin_port),
-#endif
+ sendto_one_numeric(source_p, RPL_STATSPLINE,
+ form_str(RPL_STATSPLINE), 'P',
+ get_listener_port(listener),
IsOperAdmin(source_p) ? listener->name : me.name,
listener->ref_count, (listener->active) ? "active" : "disabled",
listener->ssl ? " ssl" : "");
#endif
static int
-inetport(listener_t *listener)
+inetport(struct Listener *listener)
{
rb_fde_t *F;
- int ret;
int opt = 1;
+ const char *errstr;
/*
* At first, open a new socket
*/
-
+
F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
#ifdef RB_IPV6
{
rb_inet_ntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
listener->name = listener->vhost;
- }
+ }
}
if(F == NULL)
{
- ilog_error("opening listener socket");
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Cannot open socket for listener on port %d",
+ get_listener_port(listener));
+ ilog(L_MAIN, "Cannot open socket for listener %s",
+ get_listener_name(listener));
return 0;
}
else if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus*/
{
ilog_error("no more connections left for listener");
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "No more connections left for listener on port %d",
+ get_listener_port(listener));
+ ilog(L_MAIN, "No more connections left for listener %s",
+ get_listener_name(listener));
rb_close(F);
return 0;
}
*/
if(setsockopt(rb_get_fd(F), SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
{
- ilog_error("setting SO_REUSEADDR for listener");
+ errstr = strerror(rb_get_sockerr(F));
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Cannot set SO_REUSEADDR for listener on port %d: %s",
+ get_listener_port(listener), errstr);
+ ilog(L_MAIN, "Cannot set SO_REUSEADDR for listener %s: %s",
+ get_listener_name(listener), errstr);
rb_close(F);
return 0;
}
if(bind(rb_get_fd(F), (struct sockaddr *) &listener->addr, GET_SS_LEN(&listener->addr)))
{
- ilog_error("binding listener socket");
+ errstr = strerror(rb_get_sockerr(F));
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Cannot bind for listener on port %d: %s",
+ get_listener_port(listener), errstr);
+ ilog(L_MAIN, "Cannot bind for listener %s: %s",
+ get_listener_name(listener), errstr);
rb_close(F);
return 0;
}
- if((ret = rb_listen(F, RATBOX_SOMAXCONN)))
+ if(rb_listen(F, RATBOX_SOMAXCONN, listener->defer_accept))
{
- ilog_error("listen()");
+ errstr = strerror(rb_get_sockerr(F));
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Cannot listen() for listener on port %d: %s",
+ get_listener_port(listener), errstr);
+ ilog(L_MAIN, "Cannot listen() for listener %s: %s",
+ get_listener_name(listener), errstr);
rb_close(F);
return 0;
}
return 1;
}
-static listener_t *
+static struct Listener *
find_listener(struct rb_sockaddr_storage *addr)
{
- listener_t *listener = NULL;
- listener_t *last_closed = NULL;
+ struct Listener *listener = NULL;
+ struct Listener *last_closed = NULL;
for (listener = ListenerPollList; listener; listener = listener->next)
{
if(addr->ss_family != listener->addr.ss_family)
continue;
-
+
switch(addr->ss_family)
{
case AF_INET:
{
struct sockaddr_in *in4 = (struct sockaddr_in *)addr;
struct sockaddr_in *lin4 = (struct sockaddr_in *)&listener->addr;
- if(in4->sin_addr.s_addr == lin4->sin_addr.s_addr &&
+ if(in4->sin_addr.s_addr == lin4->sin_addr.s_addr &&
in4->sin_port == lin4->sin_port )
{
if(listener->F == NULL)
return(listener);
}
break;
-
+
}
#endif
* the format "255.255.255.255"
*/
void
-add_listener(int port, const char *vhost_ip, int family, int ssl)
+add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_accept)
{
- listener_t *listener;
+ struct Listener *listener;
struct rb_sockaddr_storage vaddr;
/*
{
if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
return;
- }
+ }
#ifdef RB_IPV6
else
{
if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
return;
-
+
}
#endif
} else
default:
return;
#endif
- }
+ }
}
switch(family)
{
listener->F = NULL;
listener->ssl = ssl;
+ listener->defer_accept = defer_accept;
if(inetport(listener))
listener->active = 1;
* close_listener - close a single listener
*/
void
-close_listener(listener_t *listener)
+close_listener(struct Listener *listener)
{
s_assert(listener != NULL);
if(listener == NULL)
void
close_listeners()
{
- listener_t *listener;
- listener_t *listener_next = 0;
+ struct Listener *listener;
+ struct Listener *listener_next = 0;
/*
* close all 'extra' listening ports we have
*/
#define DLINE_WARNING "ERROR :You have been D-lined.\r\n"
/*
- * add_connection - creates a client which has just connected to us on
+ * add_connection - creates a client which has just connected to us on
* the given fd. The sockhost field is initialized with the ip# of the host.
* The client is sent to the auth module for verification, and not put in
* any client list yet.
*/
static void
-add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl)
+add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, struct sockaddr *lai, void *ssl_ctl)
{
struct Client *new_client;
s_assert(NULL != listener);
- /*
+ /*
* get the client socket name from the socket
* the client has already been checked out in accept_connection
*/
new_client = make_client(NULL);
memcpy(&new_client->localClient->ip, sai, sizeof(struct rb_sockaddr_storage));
+ memcpy(&new_client->preClient->lip, lai, sizeof(struct rb_sockaddr_storage));
- /*
+ /*
* copy address to 'sockhost' as a string, copy it to host too
* so we have something valid to put into error messages...
*/
- rb_inet_ntop_sock((struct sockaddr *)&new_client->localClient->ip, new_client->sockhost,
+ rb_inet_ntop_sock((struct sockaddr *)&new_client->localClient->ip, new_client->sockhost,
sizeof(new_client->sockhost));
char buf[BUFSIZE];
struct ConfItem *aconf;
static time_t last_oper_notice = 0;
+ int len;
if(listener->ssl && (!ssl_ok || !get_ssld_count()))
{
get_listener_name(listener));
last_oper_notice = rb_current_time();
}
-
- rb_write(F, "ERROR :All connections in use\r\n", 32);
+
+ rb_write(F, "ERROR :All connections in use\r\n", 31);
rb_close(F);
- /* Re-register a new IO request for the next accept .. */
return 0;
}
aconf = find_dline(addr, addr->sa_family);
if(aconf != NULL && (aconf->status & CONF_EXEMPTDLINE))
return 1;
-
+
/* Do an initial check we aren't connecting too fast or with too many
* from this IP... */
if(aconf != NULL)
{
ServerStats.is_ref++;
-
+
if(ConfigFileEntry.dline_with_reason)
{
- if (rb_snprintf(buf, sizeof(buf), "ERROR :*** Banned: %s\r\n", aconf->passwd) >= (int)(sizeof(buf)-1))
+ len = rb_snprintf(buf, sizeof(buf), "ERROR :*** Banned: %s\r\n", get_user_ban_reason(aconf));
+ if (len >= (int)(sizeof(buf)-1))
{
buf[sizeof(buf) - 3] = '\r';
buf[sizeof(buf) - 2] = '\n';
}
else
strcpy(buf, "ERROR :You have been D-lined.\r\n");
-
+
rb_write(F, buf, strlen(buf));
rb_close(F);
return 0;
if(check_reject(F, addr))
return 0;
-
+
if(throttle_add(addr))
{
rb_write(F, toofast, strlen(toofast));
{
ssl_ctl_t *ctl;
rb_fde_t *xF[2];
- rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection");
+ if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection") == -1)
+ {
+ ilog_error("creating SSL/TLS socket pairs");
+ rb_close(F);
+ return;
+ }
ctl = start_ssld_accept(F, xF[1], rb_get_fd(xF[0])); /* this will close F for us */
- add_connection(listener, xF[0], addr, ctl);
+ add_connection(listener, xF[0], addr, laddr, ctl);
}
static void
struct Listener *listener = data;
struct rb_sockaddr_storage lip;
unsigned int locallen = sizeof(struct rb_sockaddr_storage);
-
+
ServerStats.is_ac++;
if(getsockname(rb_get_fd(F), (struct sockaddr *) &lip, &locallen) < 0)
{
- /* this shouldn't fail so... */
- /* XXX add logging of this */
+ /* this can fail if the connection disappeared in the meantime */
rb_close(F);
+ return;
}
-
+
if(listener->ssl)
accept_ssld(F, addr, (struct sockaddr *)&lip, listener);
else
- add_connection(listener, F, addr, NULL);
+ add_connection(listener, F, addr, (struct sockaddr *)&lip, NULL);
}
projects / solanum.git / blobdiff