#include "setup.h"
#include "listener.h"
#include "client.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
#include "ircd_defs.h"
#include "numeric.h"
-#include "commio.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "s_stats.h"
#include "send.h"
-#include "memory.h"
#include "s_auth.h"
#include "reject.h"
#include "s_conf.h"
#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)
#endif
-#if defined(NO_IN6ADDR_ANY) && defined(IPV6)
+#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
-
-static PF accept_connection;
+#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 *
-make_listener(struct irc_sockaddr_storage *addr)
+static struct Listener *
+make_listener(struct rb_sockaddr_storage *addr)
{
- listener_t *listener = (listener_t *) MyMalloc(sizeof(listener_t));
+ struct Listener *listener = (struct Listener *) rb_malloc(sizeof(struct Listener));
s_assert(0 != listener);
-
listener->name = me.name;
- listener->fd = -1;
- memcpy(&listener->addr, addr, sizeof(struct irc_sockaddr_storage));
+ listener->F = NULL;
+
+ memcpy(&listener->addr, addr, sizeof(struct rb_sockaddr_storage));
listener->next = NULL;
return listener;
}
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)
}
/* free */
- MyFree(listener);
+ rb_free(listener);
}
#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 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);
-
- ircsnprintf(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 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->ref_count, (listener->active) ? "active" : "disabled",
+ listener->ssl ? " ssl" : "");
}
}
#endif
static int
-inetport(listener_t *listener)
+inetport(struct Listener *listener)
{
- int fd;
+ rb_fde_t *F;
int opt = 1;
+ const char *errstr;
/*
* At first, open a new socket
*/
-
- fd = comm_socket(listener->addr.ss_family, SOCK_STREAM, 0, "Listener socket");
-#ifdef IPV6
+ F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
+
+#ifdef RB_IPV6
if(listener->addr.ss_family == AF_INET6)
{
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
if(!IN6_ARE_ADDR_EQUAL(&in6->sin6_addr, &in6addr_any))
{
- inetntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
+ rb_inet_ntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
listener->name = listener->vhost;
}
} else
struct sockaddr_in *in = (struct sockaddr_in *)&listener->addr;
if(in->sin_addr.s_addr != INADDR_ANY)
{
- inetntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
+ rb_inet_ntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
listener->name = listener->vhost;
- }
+ }
}
- /*
- * At one point, we enforced a strange arbitrary limit here.
- * We no longer do this, and just check if the fd is valid or not.
- * -nenolod
- */
- if(fd == -1)
+ if(F == NULL)
{
- report_error("opening listener socket %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
+ 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;
}
* XXX - we don't want to do all this crap for a listener
* set_sock_opts(listener);
*/
- if(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
+ if(setsockopt(rb_get_fd(F), SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
{
- report_error("setting SO_REUSEADDR for listener %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
- comm_close(fd);
+ 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;
}
* else assume it is already open and try get something from it.
*/
- if(bind(fd, (struct sockaddr *) &listener->addr, GET_SS_LEN(listener->addr)))
+ if(bind(rb_get_fd(F), (struct sockaddr *) &listener->addr, GET_SS_LEN(&listener->addr)))
{
- report_error("binding listener socket %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
- comm_close(fd);
+ 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(listen(fd, RATBOX_SOMAXCONN))
+ if(rb_listen(F, RATBOX_SOMAXCONN, listener->defer_accept))
{
- report_error("listen failed for %s:%s",
- get_listener_name(listener),
- get_listener_name(listener), errno);
- comm_close(fd);
+ 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;
}
- listener->fd = fd;
+ listener->F = F;
- /* Listen completion events are READ events .. */
-
- accept_connection(fd, listener);
+ rb_accept_tcp(listener->F, accept_precallback, accept_callback, listener);
return 1;
}
-static listener_t *
-find_listener(struct irc_sockaddr_storage *addr)
+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->fd == -1)
+ if(listener->F == NULL)
last_closed = listener;
else
return(listener);
}
break;
}
-#ifdef IPV6
+#ifdef RB_IPV6
case AF_INET6:
{
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
if(IN6_ARE_ADDR_EQUAL(&in6->sin6_addr, &lin6->sin6_addr) &&
in6->sin6_port == lin6->sin6_port)
{
- if(listener->fd == -1)
+ if(listener->F == NULL)
last_closed = listener;
else
return(listener);
}
break;
-
+
}
#endif
* the format "255.255.255.255"
*/
void
-add_listener(int port, const char *vhost_ip, int family)
+add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_accept)
{
- listener_t *listener;
- struct irc_sockaddr_storage vaddr;
+ struct Listener *listener;
+ struct rb_sockaddr_storage vaddr;
/*
* if no port in conf line, don't bother
{
if(family == AF_INET)
{
- if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
+ if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
return;
- }
-#ifdef IPV6
+ }
+#ifdef RB_IPV6
else
{
- if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
+ if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
return;
-
+
}
#endif
} else
case AF_INET:
((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY;
break;
-#ifdef IPV6
+#ifdef RB_IPV6
case AF_INET6:
memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr));
break;
default:
return;
#endif
- }
+ }
}
switch(family)
{
case AF_INET:
- SET_SS_LEN(vaddr, sizeof(struct sockaddr_in));
+ SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in));
((struct sockaddr_in *)&vaddr)->sin_port = htons(port);
break;
-#ifdef IPV6
+#ifdef RB_IPV6
case AF_INET6:
- SET_SS_LEN(vaddr, sizeof(struct sockaddr_in6));
+ SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6));
((struct sockaddr_in6 *)&vaddr)->sin6_port = htons(port);
break;
#endif
}
if((listener = find_listener(&vaddr)))
{
- if(listener->fd > -1)
+ if(listener->F != NULL)
return;
}
else
ListenerPollList = listener;
}
- listener->fd = -1;
+ 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)
return;
- if(listener->fd >= 0)
+ if(listener->F != NULL)
{
- comm_close(listener->fd);
- listener->fd = -1;
+ rb_close(listener->F);
+ listener->F = NULL;
}
listener->active = 0;
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(listener_t *listener, int fd, struct sockaddr *sai, int exempt)
+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 irc_sockaddr_storage));
+ 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...
*/
- inetntop_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));
- strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
-
- new_client->localClient->F = comm_add_fd(fd);
+ rb_strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
+ new_client->localClient->F = F;
+ add_to_cli_fd_hash(new_client);
new_client->localClient->listener = listener;
- ++listener->ref_count;
+ new_client->localClient->ssl_ctl = ssl_ctl;
+ if(ssl_ctl != NULL || rb_fd_ssl(F))
+ SetSSL(new_client);
- if(!exempt)
- {
- if(check_reject(new_client))
- return;
- if(add_unknown_ip(new_client))
- return;
- }
+ ++listener->ref_count;
start_auth(new_client);
}
+static const char *toofast = "ERROR :Reconnecting too fast, throttled.\r\n";
-static void
-accept_connection(int pfd, void *data)
+static int
+accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
{
- static time_t last_oper_notice = 0;
- struct irc_sockaddr_storage sai;
- socklen_t addrlen = sizeof(sai);
- int fd;
- listener_t *listener = data;
- struct ConfItem *aconf;
+ struct Listener *listener = (struct Listener *)data;
char buf[BUFSIZE];
+ struct ConfItem *aconf;
+ static time_t last_oper_notice = 0;
+ int len;
- s_assert(listener != NULL);
- if(listener == NULL)
- return;
- /*
- * There may be many reasons for error return, but
- * in otherwise correctly working environment the
- * probable cause is running out of file descriptors
- * (EMFILE, ENFILE or others?). The man pages for
- * accept don't seem to list these as possible,
- * although it's obvious that it may happen here.
- * Thus no specific errors are tested at this
- * point, just assume that connections cannot
- * be accepted until some old is closed first.
- */
-
- fd = comm_accept(listener->fd, (struct sockaddr *)&sai, &addrlen);
- if(fd < 0)
+ if(listener->ssl && (!ssl_ok || !get_ssld_count()))
{
- /* Re-register a new IO request for the next accept .. */
- comm_setselect(listener->fd, FDLIST_SERVICE,
- COMM_SELECT_READ, accept_connection, listener, 0);
- return;
+ rb_close(F);
+ return 0;
}
- /* This needs to be done here, otherwise we break dlines */
- mangle_mapped_sockaddr((struct sockaddr *)&sai);
-
- /*
- * check for connection limit
- * TBD: this is stupid... either we have a socket or we don't. -nenolod
- */
- if((comm_get_maxconnections() - 10) < fd)
+ if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */
{
- ++ServerStats->is_ref;
+ ++ServerStats.is_ref;
/*
* slow down the whining to opers bit
*/
- if((last_oper_notice + 20) <= CurrentTime)
+ if((last_oper_notice + 20) <= rb_current_time())
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"All connections in use. (%s)",
get_listener_name(listener));
- last_oper_notice = CurrentTime;
+ last_oper_notice = rb_current_time();
}
- write(fd, "ERROR :All connections in use\r\n", 32);
- comm_close(fd);
- /* Re-register a new IO request for the next accept .. */
- comm_setselect(listener->fd, FDLIST_SERVICE,
- COMM_SELECT_READ, accept_connection, listener, 0);
- return;
+ rb_write(F, "ERROR :All connections in use\r\n", 31);
+ rb_close(F);
+ 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... */
- aconf = find_dline((struct sockaddr *) &sai, sai.ss_family);
- /* check it wasn't an exempt */
- if (aconf != NULL && (aconf->status & CONF_EXEMPTDLINE) == 0)
+ if(aconf != NULL)
{
- ServerStats->is_ref++;
+ ServerStats.is_ref++;
if(ConfigFileEntry.dline_with_reason)
{
- if (ircsnprintf(buf, sizeof(buf), "ERROR :*** Banned: %s\r\n", aconf->passwd) >= (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
- ircsprintf(buf, "ERROR :You have been D-lined.\r\n");
-
- write(fd, buf, strlen(buf));
- comm_close(fd);
-
- /* Re-register a new IO request for the next accept .. */
- comm_setselect(listener->fd, FDLIST_SERVICE,
- COMM_SELECT_READ, accept_connection, listener, 0);
+ 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));
+ rb_close(F);
+ return 0;
+ }
+
+ return 1;
+}
+
+static void
+accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct Listener *listener)
+{
+ ssl_ctl_t *ctl;
+ rb_fde_t *xF[2];
+ 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, laddr, ctl);
+}
+
+static void
+accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
+{
+ struct Listener *listener = data;
+ struct rb_sockaddr_storage lip;
+ unsigned int locallen = sizeof(struct rb_sockaddr_storage);
- ServerStats->is_ac++;
- add_connection(listener, fd, (struct sockaddr *)&sai, aconf ? 1 : 0);
+ ServerStats.is_ac++;
- /* Re-register a new IO request for the next accept .. */
- comm_setselect(listener->fd, FDLIST_SERVICE, COMM_SELECT_READ,
- accept_connection, listener, 0);
+ if(getsockname(rb_get_fd(F), (struct sockaddr *) &lip, &locallen) < 0)
+ {
+ /* 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, (struct sockaddr *)&lip, NULL);
}
projects / solanum.git / blobdiff