X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/965dfbd38aa28911e067c6b3afbb1cf7bb9036cc..b717a466d06010bfd93e5a71c734c6461733cf69:/src/listener.c diff --git a/src/listener.c b/src/listener.c index ec676e8..4147bfa 100644 --- a/src/listener.c +++ b/src/listener.c @@ -33,39 +33,39 @@ #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" #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; - static listener_t *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) +make_listener(struct rb_sockaddr_storage *addr) { - listener_t *listener = (listener_t *) MyMalloc(sizeof(listener_t)); + listener_t *listener = (listener_t *) rb_malloc(sizeof(listener_t)); 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; } @@ -95,7 +95,7 @@ free_listener(listener_t *listener) } /* free */ - MyFree(listener); + rb_free(listener); } #define PORTNAMELEN 6 /* ":31337" */ @@ -114,14 +114,14 @@ get_listener_name(const listener_t *listener) if(listener == NULL) return NULL; -#ifdef IPV6 +#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); - ircsnprintf(buf, sizeof(buf), "%s[%s/%u]", me.name, listener->name, port); + rb_snprintf(buf, sizeof(buf), "%s[%s/%u]", me.name, listener->name, port); return buf; } @@ -140,14 +140,15 @@ show_ports(struct Client *source_p) { sendto_one_numeric(source_p, RPL_STATSPLINE, form_str(RPL_STATSPLINE), 'P', -#ifdef IPV6 +#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 IsOperAdmin(source_p) ? listener->name : me.name, - listener->ref_count, (listener->active) ? "active" : "disabled"); + listener->ref_count, (listener->active) ? "active" : "disabled", + listener->ssl ? " ssl" : ""); } } @@ -167,16 +168,17 @@ show_ports(struct Client *source_p) static int inetport(listener_t *listener) { - int fd; + rb_fde_t *F; + int ret; int opt = 1; /* * At first, open a new socket */ - fd = comm_socket(listener->addr.ss_family, SOCK_STREAM, 0, "Listener socket"); + F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket"); -#ifdef IPV6 +#ifdef RB_IPV6 if(listener->addr.ss_family == AF_INET6) { struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr; @@ -196,16 +198,15 @@ inetport(listener_t *listener) } } - /* - * 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) + { + ilog_error("opening listener socket"); + return 0; + } + else if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus*/ { - report_error("opening listener socket %s:%s", - get_listener_name(listener), - get_listener_name(listener), errno); + ilog_error("no more connections left for listener"); + rb_close(F); return 0; } @@ -213,12 +214,10 @@ inetport(listener_t *listener) * 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); + ilog_error("setting SO_REUSEADDR for listener"); + rb_close(F); return 0; } @@ -227,34 +226,28 @@ inetport(listener_t *listener) * 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); + ilog_error("binding listener socket"); + rb_close(F); return 0; } - if(listen(fd, RATBOX_SOMAXCONN)) + if((ret = rb_listen(F, RATBOX_SOMAXCONN))) { - report_error("listen failed for %s:%s", - get_listener_name(listener), - get_listener_name(listener), errno); - comm_close(fd); + ilog_error("listen()"); + rb_close(F); return 0; } - listener->fd = fd; - - /* Listen completion events are READ events .. */ + listener->F = F; - 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) +find_listener(struct rb_sockaddr_storage *addr) { listener_t *listener = NULL; listener_t *last_closed = NULL; @@ -273,14 +266,14 @@ find_listener(struct irc_sockaddr_storage *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; @@ -288,7 +281,7 @@ find_listener(struct irc_sockaddr_storage *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); @@ -313,10 +306,10 @@ find_listener(struct irc_sockaddr_storage *addr) * 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) { listener_t *listener; - struct irc_sockaddr_storage vaddr; + struct rb_sockaddr_storage vaddr; /* * if no port in conf line, don't bother @@ -333,7 +326,7 @@ add_listener(int port, const char *vhost_ip, int family) if(inetpton(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) @@ -348,7 +341,7 @@ add_listener(int port, const char *vhost_ip, int family) 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; @@ -360,12 +353,12 @@ add_listener(int port, const char *vhost_ip, int family) 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 @@ -374,7 +367,7 @@ add_listener(int port, const char *vhost_ip, int family) } if((listener = find_listener(&vaddr))) { - if(listener->fd > -1) + if(listener->F != NULL) return; } else @@ -384,7 +377,8 @@ add_listener(int port, const char *vhost_ip, int family) ListenerPollList = listener; } - listener->fd = -1; + listener->F = NULL; + listener->ssl = ssl; if(inetport(listener)) listener->active = 1; @@ -401,10 +395,10 @@ close_listener(listener_t *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; @@ -442,7 +436,7 @@ close_listeners() * 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, void *ssl_ctl, int exempt) { struct Client *new_client; s_assert(NULL != listener); @@ -453,7 +447,7 @@ add_connection(listener_t *listener, int fd, struct sockaddr *sai, int exempt) */ 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)); /* * copy address to 'sockhost' as a string, copy it to host too @@ -465,9 +459,13 @@ add_connection(listener_t *listener, int fd, struct sockaddr *sai, int exempt) strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host)); - new_client->localClient->fd = fd; - + new_client->localClient->F = F; + add_to_cli_fd_hash(new_client); new_client->localClient->listener = listener; + new_client->localClient->ssl_ctl = ssl_ctl; + if(ssl_ctl != NULL || rb_fd_ssl(F)) + SetSSL(new_client); + ++listener->ref_count; if(!exempt) @@ -481,82 +479,53 @@ add_connection(listener_t *listener, int fd, struct sockaddr *sai, int exempt) start_auth(new_client); } - -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; - 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); + + rb_write(F, "ERROR :All connections in use\r\n", 32); + rb_close(F); /* Re-register a new IO request for the next accept .. */ - comm_setselect(listener->fd, FDLIST_SERVICE, - COMM_SELECT_READ, accept_connection, listener, 0); - return; + return 0; } + aconf = find_dline(addr, AF_INET); + 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)) + if (rb_snprintf(buf, sizeof(buf), "ERROR :*** Banned: %s\r\n", aconf->passwd) >= (int)(sizeof(buf)-1)) { buf[sizeof(buf) - 3] = '\r'; buf[sizeof(buf) - 2] = '\n'; @@ -564,21 +533,44 @@ accept_connection(int pfd, void *data) } } 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); - return; + strcpy(buf, "ERROR :You have been D-lined.\r\n"); + + rb_write(F, buf, strlen(buf)); + rb_close(F); + return 0; } - ServerStats->is_ac++; - add_connection(listener, fd, (struct sockaddr *)&sai, aconf ? 1 : 0); + return 1; +} - /* Re-register a new IO request for the next accept .. */ - comm_setselect(listener->fd, FDLIST_SERVICE, COMM_SELECT_READ, - accept_connection, listener, 0); +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]; + rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection"); + 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, 1); +} + +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++; + + if(getsockname(rb_get_fd(F), (struct sockaddr *) &lip, &locallen) < 0) + { + /* this shouldn't fail so... */ + /* XXX add logging of this */ + rb_close(F); + } + + if(listener->ssl) + accept_ssld(F, addr, (struct sockaddr *)&lip, listener); + else + add_connection(listener, F, addr, NULL, 1); }