X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fs_bsd.c;h=5fd6d9193eb1ed0e1d55fd2727754abfcb05ee4a;hb=7fbfc390d32f9acc3192d011b813f66f35370faa;hp=36cb7dcfac930933a31ebbd94329185e75a2c8e5;hpb=87076072135f04bcd4d068af96368f4939c5404e;p=ircu2.10.12-pk.git diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c index 36cb7dc..5fd6d91 100644 --- a/ircd/s_bsd.c +++ b/ircd/s_bsd.c @@ -16,18 +16,25 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ */ +/** @file + * @brief Functions that now (or in the past) relied on BSD APIs. + * @version $Id$ + */ +#include "config.h" + #include "s_bsd.h" #include "client.h" #include "IPcheck.h" #include "channel.h" #include "class.h" #include "hash.h" +#include "ircd_alloc.h" #include "ircd_log.h" +#include "ircd_features.h" #include "ircd_osdep.h" #include "ircd_reply.h" +#include "ircd_snprintf.h" #include "ircd_string.h" #include "ircd.h" #include "list.h" @@ -46,20 +53,16 @@ #include "s_misc.h" #include "s_user.h" #include "send.h" -#include "sprintf_irc.h" +#include "ssl.h" #include "struct.h" -#include "support.h" #include "sys.h" #include "uping.h" #include "version.h" -#include -#include -#include +/* #include -- Now using assert in ircd_log.h */ #include #include #include -#include #include #include #include @@ -69,17 +72,15 @@ #include #include -#ifdef USE_POLL -#include -#endif /* USE_POLL */ - -#ifndef INADDR_NONE -#define INADDR_NONE 0xffffffff -#endif - +/** Array of my own clients, indexed by file descriptor. */ struct Client* LocalClientArray[MAXCONNECTIONS]; +/** Maximum file descriptor in current use. */ int HighestFd = -1; -struct sockaddr_in VirtualHost; +/** Default local address for outbound IPv4 connections. */ +struct irc_sockaddr VirtualHost_v4; +/** Default local address for outbound IPv6 connections. */ +struct irc_sockaddr VirtualHost_v6; +/** Temporary buffer for reading data from a peer. */ static char readbuf[SERVER_TCP_WINDOW]; /* @@ -93,38 +94,16 @@ const char* const LISTEN_ERROR_MSG = "listen error for %s: %s"; const char* const NONB_ERROR_MSG = "error setting non-blocking for %s: %s"; const char* const PEERNAME_ERROR_MSG = "getpeername failed for %s: %s"; const char* const POLL_ERROR_MSG = "poll error for %s: %s"; +const char* const REGISTER_ERROR_MSG = "registering %s: %s"; const char* const REUSEADDR_ERROR_MSG = "error setting SO_REUSEADDR for %s: %s"; const char* const SELECT_ERROR_MSG = "select error for %s: %s"; const char* const SETBUFS_ERROR_MSG = "error setting buffer size for %s: %s"; const char* const SOCKET_ERROR_MSG = "error creating socket for %s: %s"; +const char* const TOS_ERROR_MSG = "error setting TOS for %s: %s"; -#ifdef GODMODE -#ifndef NODNS -#define NODNS -#endif -#ifndef NOFLOODCONTROL -#define NOFLOODCONTROL -#endif -#endif - -#if !defined(USE_POLL) -#if FD_SETSIZE < (MAXCONNECTIONS + 4) -/* - * Sanity check - * - * All operating systems work when MAXCONNECTIONS <= 252. - * Most operating systems work when MAXCONNECTIONS <= 1020 and FD_SETSIZE is - * updated correctly in the system headers (on BSD systems our sys.h has - * defined FD_SETSIZE to MAXCONNECTIONS+4 before including the system's headers - * but sys/types.h might have abruptly redefined it so the check is still - * done), you might already need to recompile your kernel. - * For larger FD_SETSIZE your milage may vary (kernel patches may be needed). - * The check is _NOT_ done if we will not use FD_SETS at all (USE_POLL) - */ -#error "FD_SETSIZE is too small or MAXCONNECTIONS too large." -#endif -#endif +static void client_sock_callback(struct Event* ev); +static void client_timer_callback(struct Event* ev); /* @@ -133,19 +112,14 @@ const char* const SOCKET_ERROR_MSG = "error creating socket for %s: %s"; * been reassigned to a normal connection... */ -/* - * report_error - * - * This a replacement for perror(). Record error to log and - * also send a copy to all *LOCAL* opers online. - * - * text is a *format* string for outputting error. It must - * contain only two '%s', the first will be replaced - * by the sockhost from the cptr, and the latter will - * be taken from sys_errlist[errno]. - * - * cptr if not NULL, is the *LOCAL* client associated with - * the error. +/** Replacement for perror(). Record error to log. Send a copy to all + * *LOCAL* opers, but only if no errors were sent to them in the last + * 20 seconds. + * @param text A *format* string for outputting error. It must contain + * only two '%s', the first will be replaced by the sockhost from the + * cptr, and the latter will be taken from sys_errlist[errno]. + * @param who The client associated with the error. + * @param err The errno value to display. */ void report_error(const char* text, const char* who, int err) { @@ -159,55 +133,49 @@ void report_error(const char* text, const char* who, int err) if (EmptyString(who)) who = "unknown"; - if (last_notice + 20 < CurrentTime) { - /* - * pace error messages so opers don't get flooded by transients - */ - sendto_opmask_butone(0, SNO_OLDSNO, text, who, errmsg); - last_notice = CurrentTime; - } + sendto_opmask_butone_ratelimited(0, SNO_OLDSNO, &last_notice, text, who, errmsg); log_write(LS_SOCKET, L_ERROR, 0, text, who, errmsg); errno = errtmp; } -/* - * connect_dns_callback - called when resolver query finishes - * if the query resulted in a successful search, reply will contain - * a non-null pointer, otherwise reply will be null. - * if successful start the connection, otherwise notify opers +/** Called when resolver query finishes. If the DNS lookup was + * successful, start the connection; otherwise notify opers of the + * failure. + * @param vptr The struct ConfItem representing the Connect block. + * @param hp A pointer to the DNS lookup results (NULL on failure). */ -static void connect_dns_callback(void* vptr, struct DNSReply* reply) +static void connect_dns_callback(void* vptr, const struct irc_in_addr *addr, const char *h_name) { struct ConfItem* aconf = (struct ConfItem*) vptr; + assert(aconf); aconf->dns_pending = 0; - if (reply) { - memcpy(&aconf->ipnum, reply->hp->h_addr, sizeof(struct in_addr)); - connect_server(aconf, 0, reply); + if (addr) { + memcpy(&aconf->address, addr, sizeof(aconf->address)); + connect_server(aconf, 0); } else sendto_opmask_butone(0, SNO_OLDSNO, "Connect to %s failed: host lookup", aconf->name); } -/* - * close_connections - closes all connections - * close stderr if specified +/** Closes all file descriptors. + * @param close_stderr If non-zero, also close stderr. */ void close_connections(int close_stderr) { int i; - close(0); - close(1); if (close_stderr) + { + close(0); + close(1); close(2); + } for (i = 3; i < MAXCONNECTIONS; ++i) close(i); } -/* - * init_connection_limits - initialize process fd limit to - * MAXCONNECTIONS +/** Initialize process fd limit to MAXCONNECTIONS. */ int init_connection_limits(void) { @@ -215,7 +183,7 @@ int init_connection_limits(void) if (0 == limit) return 1; if (limit < 0) { - fprintf(stderr, "error setting max fd's to %d\n", limit); + fprintf(stderr, "error setting max fds to %d: %s\n", limit, strerror(errno)); } else if (limit > 0) { fprintf(stderr, "ircd fd table too big\nHard Limit: %d IRC max: %d\n", @@ -225,170 +193,140 @@ int init_connection_limits(void) return 0; } -/* - * connect_inet - set up address and port and make a connection +/** Set up address and port and make a connection. + * @param aconf Provides the connection information. + * @param cptr Client structure for the peer. + * @return Non-zero on success; zero on failure. */ static int connect_inet(struct ConfItem* aconf, struct Client* cptr) { - static struct sockaddr_in sin; + const struct irc_sockaddr *local; + IOResult result; + int family = 0; + assert(0 != aconf); assert(0 != cptr); /* * Might as well get sockhost from here, the connection is attempted * with it so if it fails its useless. */ - cptr->fd = socket(AF_INET, SOCK_STREAM, 0); - if (-1 == cptr->fd) { - cptr->error = errno; - report_error(SOCKET_ERROR_MSG, cptr->name, errno); - return 0; - } - if (cptr->fd >= MAXCLIENTS) { - report_error(CONNLIMIT_ERROR_MSG, cptr->name, 0); - close(cptr->fd); - cptr->fd = -1; - return 0; - } - /* - * Bind to a local IP# (with unknown port - let unix decide) so - * we have some chance of knowing the IP# that gets used for a host - * with more than one IP#. - * - * No we don't bind it, not all OS's can handle connecting with - * an already bound socket, different ip# might occur anyway - * leading to a freezing select() on this side for some time. - * I had this on my Linux 1.1.88 --Run - */ -#ifdef VIRTUAL_HOST - /* - * No, we do bind it if we have virtual host support. If we don't - * explicitly bind it, it will default to IN_ADDR_ANY and we lose - * due to the other server not allowing our base IP --smg - */ - if (bind(cptr->fd, (struct sockaddr*) &VirtualHost, sizeof(VirtualHost))) { - report_error(BIND_ERROR_MSG, cptr->name, errno); + if (irc_in_addr_valid(&aconf->origin.addr)) + local = &aconf->origin; + else if (irc_in_addr_is_ipv4(&aconf->address.addr)) { + local = &VirtualHost_v4; + family = AF_INET; + } else + local = &VirtualHost_v6; + cli_fd(cptr) = os_socket(local, SOCK_STREAM, cli_name(cptr), family); + if (cli_fd(cptr) < 0) return 0; - } -#endif - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = aconf->ipnum.s_addr; - sin.sin_port = htons(aconf->port); /* * save connection info in client */ - cptr->ip.s_addr = aconf->ipnum.s_addr; - cptr->port = aconf->port; - ircd_ntoa_r(cptr->sock_ip, (const char*) &cptr->ip); + memcpy(&cli_ip(cptr), &aconf->address.addr, sizeof(cli_ip(cptr))); + ircd_ntoa_r(cli_sock_ip(cptr), &cli_ip(cptr)); /* * we want a big buffer for server connections */ - if (!os_set_sockbufs(cptr->fd, SERVER_TCP_WINDOW)) { - cptr->error = errno; - report_error(SETBUFS_ERROR_MSG, cptr->name, errno); + if (!os_set_sockbufs(cli_fd(cptr), feature_int(FEAT_SOCKSENDBUF), feature_int(FEAT_SOCKRECVBUF))) { + cli_error(cptr) = errno; + report_error(SETBUFS_ERROR_MSG, cli_name(cptr), errno); + close(cli_fd(cptr)); + cli_fd(cptr) = -1; return 0; } /* - * ALWAYS set sockets non-blocking + * Set the TOS bits - this is nonfatal if it doesn't stick. */ - if (!os_set_nonblocking(cptr->fd)) { - cptr->error = errno; - report_error(NONB_ERROR_MSG, cptr->name, errno); + if (!os_set_tos(cli_fd(cptr), feature_int(FEAT_TOS_SERVER))) { + report_error(TOS_ERROR_MSG, cli_name(cptr), errno); + } + if ((result = os_connect_nonb(cli_fd(cptr), &aconf->address)) == IO_FAILURE) { + cli_error(cptr) = errno; + report_error(CONNECT_ERROR_MSG, cli_name(cptr), errno); + close(cli_fd(cptr)); + cli_fd(cptr) = -1; return 0; } - if (!os_connect_nonb(cptr->fd, &sin)) { - cptr->error = errno; - report_error(CONNECT_ERROR_MSG, cptr->name, errno); + + if (!socket_add(&(cli_socket(cptr)), client_sock_callback, + (void*) cli_connect(cptr), + (result == IO_SUCCESS) ? SS_CONNECTED : SS_CONNECTING, + SOCK_EVENT_READABLE, cli_fd(cptr))) { + cli_error(cptr) = ENFILE; + report_error(REGISTER_ERROR_MSG, cli_name(cptr), ENFILE); + close(cli_fd(cptr)); + cli_fd(cptr) = -1; return 0; } + + if(aconf->usessl) { + struct SSLConnection *ssl = ssl_create_connect(cli_fd(cptr), cptr, SSLData_Client); + cli_connect(cptr)->con_ssl = ssl; + if(ssl_handshake(ssl)) { + unsigned int events = 0; + if(ssl_wantread(ssl)) + events |= SOCK_EVENT_READABLE; + if(ssl_wantwrite(ssl)) + events |= SOCK_EVENT_WRITABLE; + socket_events(&(cli_socket(cptr)), SOCK_ACTION_SET | events); + result = IO_BLOCKED; + } + } + + cli_freeflag(cptr) |= FREEFLAG_SOCKET; return 1; } -/* - * deliver_it - * Attempt to send a sequence of bytes to the connection. - * Returns - * - * < 0 Some fatal error occurred, (but not EWOULDBLOCK). - * This return is a request to close the socket and - * clean up the link. - * - * >= 0 No real error occurred, returns the number of - * bytes actually transferred. EWOULDBLOCK and other - * possibly similar conditions should be mapped to - * zero return. Upper level routine will have to - * decide what to do with those unwritten bytes... - * - * *NOTE* alarm calls have been preserved, so this should - * work equally well whether blocking or non-blocking - * mode is used... - * - * We don't use blocking anymore, that is impossible with the - * net.loads today anyway. Commented out the alarms to save cpu. - * --Run +/** Attempt to send a sequence of bytes to the connection. + * As a side effect, updates \a cptr's FLAG_BLOCKED setting + * and sendB/sendK fields. + * @param cptr Client that should receive data. + * @param buf Message buffer to send to client. + * @return Negative on connection-fatal error; otherwise + * number of bytes sent. */ unsigned int deliver_it(struct Client *cptr, struct MsgQ *buf) { unsigned int bytes_written = 0; unsigned int bytes_count = 0; + IOResult result; assert(0 != cptr); - switch (os_sendv_nonb(cptr->fd, buf, &bytes_count, &bytes_written)) { + if(cli_connect(cptr)->con_ssl) { + result = ssl_send_encrypt(cli_connect(cptr)->con_ssl, buf, &bytes_count, &bytes_written); + } else { + result = os_sendv_nonb(cli_fd(cptr), buf, &bytes_count, &bytes_written); + } + + switch (result) { case IO_SUCCESS: - cptr->flags &= ~FLAGS_BLOCKED; + ClrFlag(cptr, FLAG_BLOCKED); - cptr->sendB += bytes_written; - me.sendB += bytes_written; - if (cptr->sendB > 1023) { - cptr->sendK += (cptr->sendB >> 10); - cptr->sendB &= 0x03ff; /* 2^10 = 1024, 3ff = 1023 */ - } - if (me.sendB > 1023) { - me.sendK += (me.sendB >> 10); - me.sendB &= 0x03ff; - } - /* - * XXX - hrmm.. set blocked here? the socket didn't - * say it was blocked - */ + cli_sendB(cptr) += bytes_written; + cli_sendB(&me) += bytes_written; + /* A partial write implies that future writes will block. */ if (bytes_written < bytes_count) - cptr->flags |= FLAGS_BLOCKED; + SetFlag(cptr, FLAG_BLOCKED); break; case IO_BLOCKED: - cptr->flags |= FLAGS_BLOCKED; + SetFlag(cptr, FLAG_BLOCKED); break; case IO_FAILURE: - cptr->error = errno; - cptr->flags |= FLAGS_DEADSOCKET; + cli_error(cptr) = errno; + SetFlag(cptr, FLAG_DEADSOCKET); break; } return bytes_written; } - -void release_dns_reply(struct Client* cptr) -{ - assert(0 != cptr); - assert(MyConnect(cptr)); - - if (cptr->dns_reply) { - assert(0 < cptr->dns_reply->ref_count); - --cptr->dns_reply->ref_count; - cptr->dns_reply = 0; - } -} - -/* - * completed_connection - * - * Complete non-blocking connect()-sequence. Check access and +/** Complete non-blocking connect()-sequence. Check access and * terminate connection, if trouble detected. - * - * Return TRUE, if successfully completed - * FALSE, if failed and ClientExit + * @param cptr Client to which we have connected, with all ConfItem structs attached. + * @return Zero on failure (caller should exit_client()), non-zero on success. */ -static int completed_connection(struct Client* cptr) +int completed_connection(struct Client* cptr) { struct ConfItem *aconf; time_t newts; @@ -401,26 +339,24 @@ static int completed_connection(struct Client* cptr) * get the socket status from the fd first to check if * connection actually succeeded */ - if ((cptr->error = os_get_sockerr(cptr->fd))) { - const char* msg = strerror(cptr->error); + if ((cli_error(cptr) = os_get_sockerr(cli_fd(cptr)))) { + const char* msg = strerror(cli_error(cptr)); if (!msg) msg = "Unknown error"; sendto_opmask_butone(0, SNO_OLDSNO, "Connection failed to %s: %s", - cptr->name, msg); + cli_name(cptr), msg); return 0; } - if (!(aconf = find_conf_byname(cptr->confs, cptr->name, CONF_SERVER))) { - sendto_opmask_butone(0, SNO_OLDSNO, "Lost Server Line for %s", cptr->name); + if (!(aconf = find_conf_byname(cli_confs(cptr), cli_name(cptr), CONF_SERVER))) { + sendto_opmask_butone(0, SNO_OLDSNO, "Lost Server Line for %s", cli_name(cptr)); return 0; } + if (s_state(&(cli_socket(cptr))) == SS_CONNECTING) + socket_state(&(cli_socket(cptr)), SS_CONNECTED); if (!EmptyString(aconf->passwd)) sendrawto_one(cptr, MSG_PASS " :%s", aconf->passwd); -#if 0 - /* dead code, already done in connect_server */ - make_server(cptr); -#endif /* * Create a unique timestamp */ @@ -428,32 +364,31 @@ static int completed_connection(struct Client* cptr) for (i = HighestFd; i > -1; --i) { if ((acptr = LocalClientArray[i]) && (IsServer(acptr) || IsHandshake(acptr))) { - if (acptr->serv->timestamp >= newts) - newts = acptr->serv->timestamp + 1; + if (cli_serv(acptr)->timestamp >= newts) + newts = cli_serv(acptr)->timestamp + 1; } } - assert(0 != cptr->serv); + assert(0 != cli_serv(cptr)); - cptr->serv->timestamp = newts; + cli_serv(cptr)->timestamp = newts; SetHandshake(cptr); /* * Make us timeout after twice the timeout for DNS look ups */ - cptr->lasttime = CurrentTime; - cptr->flags |= FLAGS_PINGSENT; + cli_lasttime(cptr) = CurrentTime; + ClearPingSent(cptr); - sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s :%s", - me.name, me.serv->timestamp, newts, MAJOR_PROTOCOL, - NumServCap(&me), me.info); + sendrawto_one(cptr, MSG_SERVER " %s 1 %Tu %Tu J%s %s%s +%s6 :%s", + cli_name(&me), cli_serv(&me)->timestamp, newts, + MAJOR_PROTOCOL, NumServCap(&me), + feature_bool(FEAT_HUB) ? "h" : "", cli_info(&me)); return (IsDead(cptr)) ? 0 : 1; } -/* - * close_connection - * - * Close the physical connection. This function must make - * MyConnect(cptr) == FALSE, and set cptr->from == NULL. +/** Close the physical connection. Side effects: MyConnect(cptr) + * becomes false and cptr->from becomes NULL. + * @param cptr Client to disconnect. */ void close_connection(struct Client *cptr) { @@ -461,74 +396,62 @@ void close_connection(struct Client *cptr) if (IsServer(cptr)) { ServerStats->is_sv++; - ServerStats->is_sbs += cptr->sendB; - ServerStats->is_sbr += cptr->receiveB; - ServerStats->is_sks += cptr->sendK; - ServerStats->is_skr += cptr->receiveK; - ServerStats->is_sti += CurrentTime - cptr->firsttime; - if (ServerStats->is_sbs > 1023) { - ServerStats->is_sks += (ServerStats->is_sbs >> 10); - ServerStats->is_sbs &= 0x3ff; - } - if (ServerStats->is_sbr > 1023) { - ServerStats->is_skr += (ServerStats->is_sbr >> 10); - ServerStats->is_sbr &= 0x3ff; - } + ServerStats->is_sbs += cli_sendB(cptr); + ServerStats->is_sbr += cli_receiveB(cptr); + ServerStats->is_sti += CurrentTime - cli_firsttime(cptr); /* * If the connection has been up for a long amount of time, schedule * a 'quick' reconnect, else reset the next-connect cycle. */ - if ((aconf = find_conf_exact(cptr->name, 0, cptr->sockhost, CONF_SERVER))) { + if ((aconf = find_conf_exact(cli_name(cptr), cptr, CONF_SERVER))) { /* - * Reschedule a faster reconnect, if this was a automaticly + * Reschedule a faster reconnect, if this was a automatically * connected configuration entry. (Note that if we have had * a rehash in between, the status has been changed to * CONF_ILLEGAL). But only do this if it was a "good" link. */ aconf->hold = CurrentTime; - aconf->hold += (aconf->hold - cptr->since > HANGONGOODLINK) ? - HANGONRETRYDELAY : ConfConFreq(aconf); - if (nextconnect > aconf->hold) - nextconnect = aconf->hold; + aconf->hold += ((aconf->hold - cli_since(cptr) > + feature_int(FEAT_HANGONGOODLINK)) ? + feature_int(FEAT_HANGONRETRYDELAY) : ConfConFreq(aconf)); +/* if (nextconnect > aconf->hold) */ +/* nextconnect = aconf->hold; */ } } else if (IsUser(cptr)) { ServerStats->is_cl++; - ServerStats->is_cbs += cptr->sendB; - ServerStats->is_cbr += cptr->receiveB; - ServerStats->is_cks += cptr->sendK; - ServerStats->is_ckr += cptr->receiveK; - ServerStats->is_cti += CurrentTime - cptr->firsttime; - if (ServerStats->is_cbs > 1023) { - ServerStats->is_cks += (ServerStats->is_cbs >> 10); - ServerStats->is_cbs &= 0x3ff; - } - if (ServerStats->is_cbr > 1023) { - ServerStats->is_ckr += (ServerStats->is_cbr >> 10); - ServerStats->is_cbr &= 0x3ff; - } + ServerStats->is_cbs += cli_sendB(cptr); + ServerStats->is_cbr += cli_receiveB(cptr); + ServerStats->is_cti += CurrentTime - cli_firsttime(cptr); } else ServerStats->is_ni++; - if (-1 < cptr->fd) { + if(cli_connect(cptr)->con_ssl) { + ssl_free_connection(cli_connect(cptr)->con_ssl); + cli_connect(cptr)->con_ssl = NULL; + } + + if (-1 < cli_fd(cptr)) { flush_connections(cptr); - LocalClientArray[cptr->fd] = 0; - close(cptr->fd); - cptr->fd = -1; + LocalClientArray[cli_fd(cptr)] = 0; + close(cli_fd(cptr)); + socket_del(&(cli_socket(cptr))); /* queue a socket delete */ + cli_fd(cptr) = -1; } - cptr->flags |= FLAGS_DEADSOCKET; + SetFlag(cptr, FLAG_DEADSOCKET); - MsgQClear(&cptr->sendQ); - DBufClear(&cptr->recvQ); - memset(cptr->passwd, 0, sizeof(cptr->passwd)); + MsgQClear(&(cli_sendQ(cptr))); + client_drop_sendq(cli_connect(cptr)); + DBufClear(&(cli_recvQ(cptr))); + memset(cli_passwd(cptr), 0, sizeof(cli_passwd(cptr))); set_snomask(cptr, 0, SNO_SET); det_confs_butmask(cptr, 0); - if (cptr->listener) { - release_listener(cptr->listener); - cptr->listener = 0; + if (cli_listener(cptr)) { + release_listener(cli_listener(cptr)); + cli_listener(cptr) = 0; } for ( ; HighestFd > 0; --HighestFd) { @@ -537,6 +460,10 @@ void close_connection(struct Client *cptr) } } +/** Close all unregistered connections. + * @param source Oper who requested the close. + * @return Number of closed connections. + */ int net_close_unregistered_connections(struct Client* source) { int i; @@ -554,144 +481,197 @@ int net_close_unregistered_connections(struct Client* source) return count; } -/*---------------------------------------------------------------------------- - * add_connection - * - * Creates a client which has just connected to us on the given fd. +/** 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 not added to the linked list of clients, it is * passed off to the auth handler for dns and ident queries. - *--------------------------------------------------------------------------*/ + * @param listener Listening socket that received the connection. + * @param fd File descriptor of new connection. + */ void add_connection(struct Listener* listener, int fd) { - struct sockaddr_in addr; + struct irc_sockaddr addr; struct Client *new_client; time_t next_target = 0; const char* const throttle_message = "ERROR :Your host is trying to (re)connect too fast -- throttled\r\n"; /* 12345678901234567890123456789012345679012345678901234567890123456 */ - + const char* const register_message = + "ERROR :Unable to complete your registration\r\n"; + assert(0 != listener); - /* * Removed preliminary access check. Full check is performed in m_server and * m_user instead. Also connection time out help to get rid of unwanted - * connections. + * connections. */ if (!os_get_peername(fd, &addr) || !os_set_nonblocking(fd)) { ++ServerStats->is_ref; close(fd); return; } - /* - * Add this local client to the IPcheck registry. - * - * If they're throttled, murder them, but tell them why first. + * Disable IP (*not* TCP) options. In particular, this makes it impossible + * to use source routing to connect to the server. If we didn't do this + * (and if intermediate networks didn't drop source-routed packets), an + * attacker could successfully IP spoof us...and even return the anti-spoof + * ping, because the options would cause the packet to be routed back to + * the spoofer's machine. When we disable the IP options, we delete the + * source route, and the normal routing takes over. */ - if (!IPcheck_local_connect(addr.sin_addr, &next_target) && !listener->server) { - ++ServerStats->is_ref; - write(fd, throttle_message, strlen(throttle_message)); - close(fd); - return; - } + os_disable_options(fd); - new_client = make_client(0, ((listener->server) ? - STAT_UNKNOWN_SERVER : STAT_UNKNOWN_USER)); + if (listener_server(listener)) + { + new_client = make_client(0, STAT_UNKNOWN_SERVER); + } + else + { + /* + * Add this local client to the IPcheck registry. + * + * If they're throttled, murder them, but tell them why first. + */ + if (!IPcheck_local_connect(&addr.addr, &next_target)) + { + ++ServerStats->is_ref; + write(fd, throttle_message, strlen(throttle_message)); + close(fd); + return; + } + new_client = make_client(0, STAT_UNKNOWN_USER); + SetIPChecked(new_client); + } /* * Copy ascii address to 'sockhost' just in case. Then we have something - * valid to put into error messages... + * valid to put into error messages... */ - ircd_ntoa_r(new_client->sock_ip, (const char*) &addr.sin_addr); - strcpy(new_client->sockhost, new_client->sock_ip); - new_client->ip.s_addr = addr.sin_addr.s_addr; - new_client->port = ntohs(addr.sin_port); + ircd_ntoa_r(cli_sock_ip(new_client), &addr.addr); + strcpy(cli_sockhost(new_client), cli_sock_ip(new_client)); + memcpy(&cli_ip(new_client), &addr.addr, sizeof(cli_ip(new_client))); if (next_target) - new_client->nexttarget = next_target; + cli_nexttarget(new_client) = next_target; - new_client->fd = fd; - new_client->listener = listener; + cli_fd(new_client) = fd; + if (!socket_add(&(cli_socket(new_client)), client_sock_callback, + (void*) cli_connect(new_client), SS_CONNECTED, 0, fd)) { + ++ServerStats->is_ref; + write(fd, register_message, strlen(register_message)); + close(fd); + cli_fd(new_client) = -1; + return; + } + cli_freeflag(new_client) |= FREEFLAG_SOCKET; + cli_listener(new_client) = listener; ++listener->ref_count; Count_newunknown(UserStats); - /* if we've made it this far we can put the client on the auth query pile */ - start_auth(new_client); + + if(listener_ssl(listener)) { + struct Connection* con = cli_connect(new_client); + con->con_ssl = ssl_start_handshake_listener(listener->ssl_listener, fd, new_client, SSLData_Client); + unsigned int events = 0; + if(ssl_wantread(con->con_ssl)) + events |= SOCK_EVENT_READABLE; + if(ssl_wantwrite(con->con_ssl)) + events |= SOCK_EVENT_WRITABLE; + socket_events(&(cli_socket(new_client)), SOCK_ACTION_SET | events); + } else { + /* if we've made it this far we can put the client on the auth query pile */ + start_auth(new_client); + } } +/** Determines whether to tell the events engine we're interested in + * writable events. + * @param cptr Client for which to decide this. + */ +void update_write(struct Client* cptr) +{ + /* If there are messages that need to be sent along, or if the client + * is in the middle of a /list, then we need to tell the engine that + * we're interested in writable events--otherwise, we need to drop + * that interest. + */ + socket_events(&(cli_socket(cptr)), + ((MsgQLength(&cli_sendQ(cptr)) || cli_listing(cptr)) ? + SOCK_ACTION_ADD : SOCK_ACTION_DEL) | SOCK_EVENT_WRITABLE); +} -/* - * read_packet - * - * Read a 'packet' of data from a connection and process it. Read in 8k - * chunks to give a better performance rating (for server connections). - * Do some tricky stuff for client connections to make sure they don't do - * any flooding >:-) -avalon +/** Read a 'packet' of data from a connection and process it. Read in + * 8k chunks to give a better performance rating (for server + * connections). Do some tricky stuff for client connections to make + * sure they don't do any flooding >:-) -avalon + * @param cptr Client from which to read data. + * @param socket_ready If non-zero, more data can be read from the client's socket. + * @return Positive number on success, zero on connection-fatal failure, negative + * if user is killed. */ static int read_packet(struct Client *cptr, int socket_ready) { unsigned int dolen = 0; unsigned int length = 0; - if (socket_ready && !(IsUser(cptr) && DBufLength(&cptr->recvQ) > CLIENT_FLOOD)) { - switch (os_recv_nonb(cptr->fd, readbuf, sizeof(readbuf), &length)) { + if (socket_ready && + !(IsUser(cptr) && + DBufLength(&(cli_recvQ(cptr))) > feature_int(FEAT_CLIENT_FLOOD))) { + + /* Handle SSL Sockets + */ + int recvret; + if(cli_connect(cptr)->con_ssl) { + recvret = ssl_recv_decrypt(cli_connect(cptr)->con_ssl, readbuf, sizeof(readbuf), &length); + } else { + recvret = os_recv_nonb(cli_fd(cptr), readbuf, sizeof(readbuf), &length); + } + switch (recvret) { case IO_SUCCESS: - if (length) { - cptr->lasttime = CurrentTime; - if (cptr->lasttime > cptr->since) - cptr->since = cptr->lasttime; - cptr->flags &= ~(FLAGS_PINGSENT | FLAGS_NONL); + if (length) + { + cli_lasttime(cptr) = CurrentTime; + ClearPingSent(cptr); + ClrFlag(cptr, FLAG_NONL); + if (cli_lasttime(cptr) > cli_since(cptr)) + cli_since(cptr) = cli_lasttime(cptr); } break; case IO_BLOCKED: break; case IO_FAILURE: - cptr->error = errno; - /* cptr->flags |= FLAGS_DEADSOCKET; */ + cli_error(cptr) = errno; + /* SetFlag(cptr, FLAG_DEADSOCKET); */ return 0; } } - + /* * For server connections, we process as many as we can without * worrying about the time of day or anything :) */ - if (length > 0 && IsServer(cptr)) { + if (length > 0 && IsServer(cptr)) return server_dopacket(cptr, readbuf, length); - } - else { + else if (length > 0 && (IsHandshake(cptr) || IsConnecting(cptr))) + return connect_dopacket(cptr, readbuf, length); + else + { /* * Before we even think of parsing what we just read, stick * it on the end of the receive queue and do it when its * turn comes around. */ - if (length > 0 && 0 == dbuf_put(&cptr->recvQ, readbuf, length)) { + if (length > 0 && dbuf_put(&(cli_recvQ(cptr)), readbuf, length) == 0) return exit_client(cptr, cptr, &me, "dbuf_put fail"); - } -#ifndef NOFLOODCONTROL - /* - * XXX - cptr will always be a user or unregistered - */ - if (IsUser(cptr) && DBufLength(&cptr->recvQ) > CLIENT_FLOOD) + + if (DBufLength(&(cli_recvQ(cptr))) > feature_int(FEAT_CLIENT_FLOOD)) return exit_client(cptr, cptr, &me, "Excess Flood"); - while (DBufLength(&cptr->recvQ) && !NoNewLine(cptr) && - (IsTrusted(cptr) || cptr->since - CurrentTime < 10)) -#else - while (DBufLength(&cptr->recvQ) && !NoNewLine(cptr)) -#endif + while (DBufLength(&(cli_recvQ(cptr))) && !NoNewLine(cptr) && + (IsTrusted(cptr) || cli_since(cptr) - CurrentTime < 10)) { - /* - * If it has become registered as a Server - * then skip the per-message parsing below. - */ - if (IsServer(cptr)) { - dolen = dbuf_get(&cptr->recvQ, readbuf, sizeof(readbuf)); - return (dolen) ? server_dopacket(cptr, readbuf, dolen) : 1; - } - dolen = dbuf_getmsg(&cptr->recvQ, cptr->buffer, BUFSIZE); + dolen = dbuf_getmsg(&(cli_recvQ(cptr)), cli_buffer(cptr), BUFSIZE); /* * Devious looking...whats it do ? well..if a client * sends a *long* message without any CR or LF, then @@ -700,604 +680,67 @@ static int read_packet(struct Client *cptr, int socket_ready) * deletes the rest of the buffer contents. * -avalon */ - if (0 == dolen) { - if (DBufLength(&cptr->recvQ) < 510) - cptr->flags |= FLAGS_NONL; + if (dolen == 0) + { + if (DBufLength(&(cli_recvQ(cptr))) < 510) + SetFlag(cptr, FLAG_NONL); else - DBufClear(&cptr->recvQ); - } - else if (CPTR_KILLED == client_dopacket(cptr, dolen)) - return CPTR_KILLED; - } - } - return 1; -} - -static int on_write_unblocked(struct Client* cptr) -{ - /* - * ...room for writing, empty some queue then... - */ - cptr->flags &= ~FLAGS_BLOCKED; - if (IsConnecting(cptr)) { - if (!completed_connection(cptr)) - return 0; - } - else if (cptr->listing && MsgQLength(&cptr->sendQ) < 2048) - list_next_channels(cptr, 64); - send_queued(cptr); - return 1; -} - -/* - * Select / Poll Read Algorithm for ircd - * - * We need to check the file descriptors for all the different types - * of things that use them, so check for reads on everything but connects - * and writes on connects and descriptors that are blocked - * - * for each (client in local) { - * if (not connecting) - * check for read; - * if (connecting or blocked) - * check for write; - * } - * wait for activity; - * - * for each (client in local) { - * if (there are descriptors to check) { - * if (write activity) - * send data; - * if (read activity) - * read data; - * } - * process data read; - * } - * Note we must always process data read whether or not there has been - * read activity or file descriptors set, since data is buffered by the client. - */ - - -#ifdef USE_POLL - -/* - * poll macros - */ -#if defined(POLLMSG) && defined(POLLIN) && defined(POLLRDNORM) -# define POLLREADFLAGS (POLLMSG|POLLIN|POLLRDNORM) -#else -# if defined(POLLIN) && defined(POLLRDNORM) -# define POLLREADFLAGS (POLLIN|POLLRDNORM) -# else -# if defined(POLLIN) -# define POLLREADFLAGS POLLIN -# else -# if defined(POLLRDNORM) -# define POLLREADFLAGS POLLRDNORM -# endif -# endif -# endif -#endif - -#if defined(POLLOUT) && defined(POLLWRNORM) -#define POLLWRITEFLAGS (POLLOUT|POLLWRNORM) -#else -# if defined(POLLOUT) -# define POLLWRITEFLAGS POLLOUT -# else -# if defined(POLLWRNORM) -# define POLLWRITEFLAGS POLLWRNORM -# endif -# endif -#endif - -#ifdef POLLHUP -#define POLLERRORS (POLLHUP|POLLERR) -#else -#define POLLERRORS POLLERR -#endif - -/* - * NOTE: pfd and pfd_count are local variable names in read_message - */ -#define PFD_SETR(xfd) \ - do { CHECK_ADD_PFD(xfd) pfd->events |= POLLREADFLAGS; } while(0) -#define PFD_SETW(xfd) \ - do { CHECK_ADD_PFD(xfd) pfd->events |= POLLWRITEFLAGS; } while(0) - -#define CHECK_ADD_PFD(xfd) \ - if (pfd->fd != xfd) { \ - pfd = &poll_fds[pfd_count++]; \ - poll_fds[pfd_count].fd = -1; \ - pfd->fd = xfd; \ - pfd->events = 0; \ - } - -/* - * Check all connections for new connections and input data that is to be - * processed. Also check for connections with data queued and whether we can - * write it out. - * - * Don't ever use ZERO for `delay', unless you mean to poll and then - * you have to have sleep/wait somewhere else in the code.--msa - */ -int read_message(time_t delay) -{ - struct pollfd poll_fds[MAXCONNECTIONS + 1]; - struct Client* cptr; - struct Listener* listener = 0; - struct AuthRequest* auth = 0; - struct AuthRequest* auth_next = 0; - struct UPing* uping = 0; - struct UPing* uping_next = 0; - time_t delay2 = delay; - int nfds; - int length; - int i; - int res = 0; - int pfd_count; - struct pollfd* pfd; - struct pollfd* res_pfd; - struct pollfd* uping_pfd; - int read_ready; - int write_ready; - - unsigned int timeout; - - for ( ; ; ) { - pfd_count = 0; - pfd = poll_fds; - res_pfd = 0; - uping_pfd = 0; - pfd->fd = -1; - - if (-1 < ResolverFileDescriptor) { - PFD_SETR(ResolverFileDescriptor); - res_pfd = pfd; - } - if (-1 < UPingFileDescriptor) { - PFD_SETR(UPingFileDescriptor); - uping_pfd = pfd; - } - /* - * add uping descriptors - */ - for (uping = uping_begin(); uping; uping = uping_next) { - uping_next = uping->next; - if (uping->active) { - delay2 = 1; - if (uping->lastsent && CurrentTime > uping->timeout) { - uping_end(uping); - continue; + { + /* More than 512 bytes in the line - drop the input and yell + * at the client. + */ + DBufClear(&(cli_recvQ(cptr))); + send_reply(cptr, ERR_INPUTTOOLONG); } - uping->index = pfd_count; - PFD_SETR(uping->fd); } - } - /* - * add auth file descriptors - */ - for (auth = AuthPollList; auth; auth = auth->next) { - assert(-1 < auth->fd); - auth->index = pfd_count; - if (IsAuthConnect(auth)) - PFD_SETW(auth->fd); - else - PFD_SETR(auth->fd); - } - /* - * add listener file descriptors - */ - for (listener = ListenerPollList; listener; listener = listener->next) { - assert(-1 < listener->fd); + else if (client_dopacket(cptr, dolen) == CPTR_KILLED) + return CPTR_KILLED; /* - * pfd_count is incremented by PFD_SETR so we need to save the - * index first + * If it has become registered as a Server + * then skip the per-message parsing below. */ - listener->index = pfd_count; - PFD_SETR(listener->fd); - } - - for (i = HighestFd; -1 < i; --i) { - if ((cptr = LocalClientArray[i])) { - - if (DBufLength(&cptr->recvQ)) - delay2 = 1; - if (DBufLength(&cptr->recvQ) < 4088 || IsServer(cptr)) { - PFD_SETR(i); - } - if (MsgQLength(&cptr->sendQ) || IsConnecting(cptr) || - (cptr->listing && MsgQLength(&cptr->sendQ) < 2048)) { - PFD_SETW(i); + if (IsHandshake(cptr) || IsServer(cptr)) + { + while (-1) + { + dolen = dbuf_get(&(cli_recvQ(cptr)), readbuf, sizeof(readbuf)); + if (dolen <= 0) + return 1; + else if (dolen == 0) + { + if (DBufLength(&(cli_recvQ(cptr))) < 510) + SetFlag(cptr, FLAG_NONL); + else + DBufClear(&(cli_recvQ(cptr))); + } + else if ((IsServer(cptr) && + server_dopacket(cptr, readbuf, dolen) == CPTR_KILLED) || + (!IsServer(cptr) && + connect_dopacket(cptr, readbuf, dolen) == CPTR_KILLED)) + return CPTR_KILLED; } } } - Debug((DEBUG_INFO, "poll: %d %d", delay, delay2)); - - timeout = (IRCD_MIN(delay2, delay)) * 1000; - - nfds = poll(poll_fds, pfd_count, timeout); - - CurrentTime = time(0); - if (-1 < nfds) - break; - - if (EINTR == errno) - return -1; - report_error(POLL_ERROR_MSG, me.name, errno); - ++res; - if (res > 5) - server_restart("too many poll errors"); - sleep(1); - CurrentTime = time(0); - } - - if (uping_pfd && (uping_pfd->revents & (POLLREADFLAGS | POLLERRORS))) { - uping_echo(); - --nfds; - } - /* - * check uping replies - */ - for (uping = uping_begin(); uping; uping = uping_next) { - uping_next = uping->next; - if (uping->active) { - assert(-1 < uping->index); - if (poll_fds[uping->index].revents) { - uping_read(uping); - if (0 == --nfds) - break; - } - else if (CurrentTime > uping->lastsent) { - uping->lastsent = CurrentTime; - uping_send(uping); - } - } - } - - if (res_pfd && (res_pfd->revents & (POLLREADFLAGS | POLLERRORS))) { - resolver_read(); - --nfds; - } - /* - * check auth queries - */ - for (auth = AuthPollList; auth; auth = auth_next) { - auth_next = auth->next; - i = auth->index; - /* - * check for any event, we only ask for one at a time - */ - if (poll_fds[i].revents) { - if (IsAuthConnect(auth)) - send_auth_query(auth); - else - read_auth_reply(auth); - if (0 == --nfds) - break; - } - } - /* - * check listeners - */ - for (listener = ListenerPollList; listener; listener = listener->next) { - i = listener->index; - if (poll_fds[i].revents) { - accept_connection(listener); - if (0 == --nfds) - break; - } - } - /* - * i contains the next non-auth/non-listener index, since we put the - * resolver, auth and listener, file descriptors in poll_fds first, - * the very next one should be the start of the clients - */ - pfd = &poll_fds[++i]; - - for ( ; (i < pfd_count); ++i, ++pfd) { - if (!(cptr = LocalClientArray[pfd->fd])) - continue; - read_ready = write_ready = 0; - - if (0 < nfds && pfd->revents) { - --nfds; - - read_ready = pfd->revents & POLLREADFLAGS; - write_ready = pfd->revents & POLLWRITEFLAGS; - - if (pfd->revents & POLLERRORS) { - if (pfd->events & POLLREADFLAGS) - ++read_ready; - if (pfd->events & POLLWRITEFLAGS) - ++write_ready; - } - } - if (write_ready) { - if (!on_write_unblocked(cptr) || IsDead(cptr)) { - const char* msg = (cptr->error) ? strerror(cptr->error) : cptr->info; - if (!msg) - msg = "Unknown error"; - exit_client(cptr, cptr, &me, msg); - continue; - } - } - length = 1; /* for fall through case */ - if ((!NoNewLine(cptr) || read_ready) && !IsDead(cptr)) { - if (CPTR_KILLED == (length = read_packet(cptr, read_ready))) - continue; - } -#if 0 - /* Bullshit, why would we want to flush sockets while using non-blocking? - * This uses > 4% cpu! --Run */ - if (length > 0) - flush_connections(poll_cptr[i]); -#endif - if (IsDead(cptr)) { - const char* msg = (cptr->error) ? strerror(cptr->error) : cptr->info; - if (!msg) - msg = "Unknown error"; - exit_client(cptr, cptr, &me, (char*) msg); - continue; - } - if (length > 0) - continue; - cptr->flags |= FLAGS_DEADSOCKET; - /* - * ...hmm, with non-blocking sockets we might get - * here from quite valid reasons, although.. why - * would select report "data available" when there - * wasn't... So, this must be an error anyway... --msa - * actually, EOF occurs when read() returns 0 and - * in due course, select() returns that fd as ready - * for reading even though it ends up being an EOF. -avalon - */ - Debug((DEBUG_ERROR, "READ ERROR: fd = %d %d %d", pfd->fd, errno, length)); - - if ((IsServer(cptr) || IsHandshake(cptr)) && cptr->error == 0 && length == 0) - exit_client_msg(cptr, cptr, &me, "Server %s closed the connection (%s)", - cptr->name, cptr->serv->last_error_msg); - else { - const char* msg = (cptr->error) ? strerror(cptr->error) : "EOF from client"; - if (!msg) - msg = "Unknown error"; - exit_client_msg(cptr, cptr, &me, "Read error: %s", msg); - } - } - return 0; -} -#else /* USE_SELECT */ - -/* - * Check all connections for new connections and input data that is to be - * processed. Also check for connections with data queued and whether we can - * write it out. - * - * Don't ever use ZERO for `delay', unless you mean to poll and then - * you have to have sleep/wait somewhere else in the code.--msa - */ -int read_message(time_t delay) -{ - struct Client* cptr; - struct Listener* listener; - struct AuthRequest* auth = 0; - struct AuthRequest* auth_next = 0; - struct UPing* uping; - struct UPing* uping_next; - int nfds; - struct timeval wait; - time_t delay2 = delay; - unsigned int usec = 0; - int res = 0; - int length; - int i; - int read_ready; - fd_set read_set; - fd_set write_set; - - for ( ; ; ) - { - FD_ZERO(&read_set); - FD_ZERO(&write_set); - - if (-1 < ResolverFileDescriptor) - FD_SET(ResolverFileDescriptor, &read_set); - if (-1 < UPingFileDescriptor) - FD_SET(UPingFileDescriptor, &read_set); - /* - * set up uping file descriptors - */ - for (uping = uping_begin(); uping; uping = uping_next) { - uping_next = uping->next; - if (uping->active) { - delay2 = 1; - if (uping->lastsent && CurrentTime > uping->timeout) { - uping_end(uping); - continue; - } - assert(-1 < uping->fd); - FD_SET(uping->fd, &read_set); - } - } - /* - * set auth file descriptors - */ - for (auth = AuthPollList; auth; auth = auth->next) { - assert(-1 < auth->fd); - if (IsAuthConnect(auth)) - FD_SET(auth->fd, &write_set); - else /* if (IsAuthPending(auth)) */ - FD_SET(auth->fd, &read_set); - } - /* - * set listener file descriptors - */ - for (listener = ListenerPollList; listener; listener = listener->next) { - assert(-1 < listener->fd); - FD_SET(listener->fd, &read_set); - } - - for (i = HighestFd; i > -1; --i) { - if ((cptr = LocalClientArray[i])) { - if (DBufLength(&cptr->recvQ)) - delay2 = 1; - if (DBufLength(&cptr->recvQ) < 4088 || IsServer(cptr)) - FD_SET(i, &read_set); - if (MsgQLength(&cptr->sendQ) || IsConnecting(cptr) || - (cptr->listing && MsgQLength(&cptr->sendQ) < 2048)) - FD_SET(i, &write_set); - } - } - - wait.tv_sec = IRCD_MIN(delay2, delay); - wait.tv_usec = usec; - - Debug((DEBUG_INFO, "select: %d %d", delay, delay2)); - - nfds = select(FD_SETSIZE, &read_set, &write_set, 0, &wait); - - CurrentTime = time(0); - - if (-1 < nfds) - break; - - if (errno == EINTR) - return -1; - report_error(SELECT_ERROR_MSG, me.name, errno); - if (++res > 5) - server_restart("too many select errors"); - sleep(1); - CurrentTime = time(0); - } - - if (-1 < UPingFileDescriptor && FD_ISSET(UPingFileDescriptor, &read_set)) { - uping_echo(); - --nfds; - } - for (uping = uping_begin(); uping; uping = uping_next) { - uping_next = uping->next; - if (uping->active) { - assert(-1 < uping->fd); - if (FD_ISSET(uping->fd, &read_set)) { - uping_read(uping); - if (0 == --nfds) - break; - } - else if (CurrentTime > uping->lastsent) { - uping->lastsent = CurrentTime; - uping_send(uping); - } - } - } - if (-1 < ResolverFileDescriptor && FD_ISSET(ResolverFileDescriptor, &read_set)) { - resolver_read(); - --nfds; - } - /* - * Check fd sets for the auth fd's (if set and valid!) first - * because these can not be processed using the normal loops below. - * -avalon - */ - for (auth = AuthPollList; auth; auth = auth_next) { - auth_next = auth->next; - assert(-1 < auth->fd); - if (IsAuthConnect(auth) && FD_ISSET(auth->fd, &write_set)) { - send_auth_query(auth); - if (0 == --nfds) - break; - } - else if (FD_ISSET(auth->fd, &read_set)) { - read_auth_reply(auth); - if (0 == --nfds) - break; - } - } - /* - * next accept connections from active listeners - */ - for (listener = ListenerPollList; listener; listener = listener->next) { - assert(-1 < listener->fd); - if (0 < nfds && FD_ISSET(listener->fd, &read_set)) - accept_connection(listener); - } - - for (i = HighestFd; -1 < i; --i) { - if (!(cptr = LocalClientArray[i])) - continue; - read_ready = 0; - if (0 < nfds) { - if (FD_ISSET(i, &write_set)) { - --nfds; - if (!on_write_unblocked(cptr) || IsDead(cptr)) { - const char* msg = (cptr->error) ? strerror(cptr->error) : cptr->info; - if (!msg) - msg = "Unknown error"; - if (FD_ISSET(i, &read_set)) - --nfds; - exit_client(cptr, cptr, &me, msg); - continue; - } - } - if ((read_ready = FD_ISSET(i, &read_set))) - --nfds; - } - length = 1; /* for fall through case */ - if ((!NoNewLine(cptr) || read_ready) && !IsDead(cptr)) { - if (CPTR_KILLED == (length = read_packet(cptr, read_ready))) - continue; - } - if (IsDead(cptr)) { - const char* msg = (cptr->error) ? strerror(cptr->error) : cptr->info; - if (!msg) - msg = "Unknown error"; - exit_client(cptr, cptr, &me, msg); - continue; - } - if (length > 0) - continue; - - /* - * ...hmm, with non-blocking sockets we might get - * here from quite valid reasons, although.. why - * would select report "data available" when there - * wasn't... So, this must be an error anyway... --msa - * actually, EOF occurs when read() returns 0 and - * in due course, select() returns that fd as ready - * for reading even though it ends up being an EOF. -avalon - */ - Debug((DEBUG_ERROR, "READ ERROR: fd = %d %d %d", i, cptr->error, length)); - - if ((IsServer(cptr) || IsHandshake(cptr)) && cptr->error == 0 && length == 0) - exit_client_msg(cptr, cptr, &me, "Server %s closed the connection (%s)", - cptr->name, cptr->serv->last_error_msg); - else { - const char* msg = (cptr->error) ? strerror(cptr->error) : "EOF from client"; - if (!msg) - msg = "Unknown error"; - exit_client_msg(cptr, cptr, &me, "Read error: %s", msg); + /* If there's still data to process, wait 2 seconds first */ + if (DBufLength(&(cli_recvQ(cptr))) && !NoNewLine(cptr) && + !t_onqueue(&(cli_proc(cptr)))) + { + Debug((DEBUG_LIST, "Adding client process timer for %C", cptr)); + cli_freeflag(cptr) |= FREEFLAG_TIMER; + timer_add(&(cli_proc(cptr)), client_timer_callback, cli_connect(cptr), + TT_RELATIVE, 2); } } - return 0; + return 1; } -#endif /* USE_SELECT */ - -/* - * connect_server - start or complete a connection to another server - * returns true (1) if successful, false (0) otherwise - * - * aconf must point to a valid C:line - * m_connect calls this with a valid by client and a null reply - * try_connections calls this with a null by client, and a null reply - * connect_dns_callback call this with a null by client, and a valid reply - * - * XXX - if this comes from an m_connect message and a dns query needs to - * be done, we loose the information about who started the connection and - * it's considered an auto connect. +/** Start a connection to another server. + * @param aconf Connect block data for target server. + * @param by Client who requested the connection (if any). + * @return Non-zero on success; zero on failure. */ -int connect_server(struct ConfItem* aconf, struct Client* by, - struct DNSReply* reply) +int connect_server(struct ConfItem* aconf, struct Client* by) { struct Client* cptr = 0; assert(0 != aconf); @@ -1308,60 +751,46 @@ int connect_server(struct ConfItem* aconf, struct Client* by, return 0; } Debug((DEBUG_NOTICE, "Connect to %s[@%s]", aconf->name, - ircd_ntoa((const char*) &aconf->ipnum))); + ircd_ntoa(&aconf->address.addr))); if ((cptr = FindClient(aconf->name))) { if (IsServer(cptr) || IsMe(cptr)) { sendto_opmask_butone(0, SNO_OLDSNO, "Server %s already present from %s", - aconf->name, cptr->from->name); + aconf->name, cli_name(cli_from(cptr))); if (by && IsUser(by) && !MyUser(by)) { sendcmdto_one(&me, CMD_NOTICE, by, "%C :Server %s already present " - "from %s", by, aconf->name, cptr->from->name); + "from %s", by, aconf->name, cli_name(cli_from(cptr))); } return 0; } else if (IsHandshake(cptr) || IsConnecting(cptr)) { if (by && IsUser(by)) { sendcmdto_one(&me, CMD_NOTICE, by, "%C :Connection to %s already in " - "progress", by, cptr->name); + "progress", by, cli_name(cptr)); } return 0; } } /* - * If we dont know the IP# for this host and itis a hostname and + * If we don't know the IP# for this host and it is a hostname and * not a ip# string, then try and find the appropriate host record. */ - if (INADDR_NONE == aconf->ipnum.s_addr) { + if (!irc_in_addr_valid(&aconf->address.addr) + && !ircd_aton(&aconf->address.addr, aconf->host)) { char buf[HOSTLEN + 1]; - assert(0 == reply); - if (INADDR_NONE == (aconf->ipnum.s_addr = inet_addr(aconf->host))) { - struct DNSQuery query; - query.vptr = aconf; - query.callback = connect_dns_callback; - host_from_uh(buf, aconf->host, HOSTLEN); - buf[HOSTLEN] = '\0'; - - reply = gethost_byname(buf, &query); - - if (!reply) { - aconf->dns_pending = 1; - return 0; - } - memcpy(&aconf->ipnum, reply->hp->h_addr, sizeof(struct in_addr)); - } + host_from_uh(buf, aconf->host, HOSTLEN); + gethost_byname(buf, connect_dns_callback, aconf); + aconf->dns_pending = 1; + return 0; } cptr = make_client(NULL, STAT_UNKNOWN_SERVER); - if (reply) - ++reply->ref_count; - cptr->dns_reply = reply; /* * Copy these in so we have something for error detection. */ - ircd_strncpy(cptr->name, aconf->name, HOSTLEN); - ircd_strncpy(cptr->sockhost, aconf->host, HOSTLEN); + ircd_strncpy(cli_name(cptr), aconf->name, HOSTLEN); + ircd_strncpy(cli_sockhost(cptr), aconf->host, HOSTLEN); /* * Attach config entries to client here rather than in @@ -1369,12 +798,12 @@ int connect_server(struct ConfItem* aconf, struct Client* by, */ attach_confs_byhost(cptr, aconf->host, CONF_SERVER); - if (!find_conf_byhost(cptr->confs, aconf->host, CONF_SERVER)) { + if (!find_conf_byhost(cli_confs(cptr), aconf->host, CONF_SERVER)) { sendto_opmask_butone(0, SNO_OLDSNO, "Host %s is not enabled for " - "connecting: no C-line", aconf->name); + "connecting: no Connect block", aconf->name); if (by && IsUser(by) && !MyUser(by)) { sendcmdto_one(&me, CMD_NOTICE, by, "%C :Connect to host %s failed: no " - "C-line", by, aconf->name); + "Connect block", by, aconf->name); } det_confs_butmask(cptr, 0); free_client(cptr); @@ -1386,7 +815,7 @@ int connect_server(struct ConfItem* aconf, struct Client* by, if (!connect_inet(aconf, cptr)) { if (by && IsUser(by) && !MyUser(by)) { sendcmdto_one(&me, CMD_NOTICE, by, "%C :Couldn't connect to %s", by, - cptr->name); + cli_name(cptr)); } det_confs_butmask(cptr, 0); free_client(cptr); @@ -1401,23 +830,23 @@ int connect_server(struct ConfItem* aconf, struct Client* by, */ make_server(cptr); if (by && IsUser(by)) { - sprintf_irc(cptr->serv->by, "%s%s", NumNick(by)); - assert(0 == cptr->serv->user); - cptr->serv->user = by->user; - by->user->refcnt++; + ircd_snprintf(0, cli_serv(cptr)->by, sizeof(cli_serv(cptr)->by), "%s%s", + NumNick(by)); + assert(0 == cli_serv(cptr)->user); + cli_serv(cptr)->user = cli_user(by); + cli_user(by)->refcnt++; } else { - *cptr->serv->by = '\0'; + *(cli_serv(cptr))->by = '\0'; /* strcpy(cptr->serv->by, "Auto"); */ } - cptr->serv->up = &me; + cli_serv(cptr)->up = &me; SetConnecting(cptr); - if (cptr->fd > HighestFd) - HighestFd = cptr->fd; + if (cli_fd(cptr) > HighestFd) + HighestFd = cli_fd(cptr); - - LocalClientArray[cptr->fd] = cptr; + LocalClientArray[cli_fd(cptr)] = cptr; Count_newunknown(UserStats); /* Actually we lie, the connect hasn't succeeded yet, but we have a valid @@ -1426,23 +855,13 @@ int connect_server(struct ConfItem* aconf, struct Client* by, */ add_client_to_list(cptr); hAddClient(cptr); - nextping = CurrentTime; +/* nextping = CurrentTime; */ - return 1; + return (s_state(&cli_socket(cptr)) == SS_CONNECTED) ? + completed_connection(cptr) : 1; } -/* - * Setup local socket structure to use for binding to. - */ -void set_virtual_host(struct in_addr addr) -{ - memset(&VirtualHost, 0, sizeof(VirtualHost)); - VirtualHost.sin_family = AF_INET; - VirtualHost.sin_addr.s_addr = addr.s_addr; -} - -/* - * Find the real hostname for the host running the server (or one which +/** Find the real hostname for the host running the server (or one which * matches the server's name) and its primary IP#. Hostname is stored * in the client structure passed as a pointer. */ @@ -1451,8 +870,142 @@ void init_server_identity(void) const struct LocalConf* conf = conf_get_local(); assert(0 != conf); - ircd_strncpy(me.name, conf->name, HOSTLEN); + ircd_strncpy(cli_name(&me), conf->name, HOSTLEN); SetYXXServerName(&me, conf->numeric); } +/** Process events on a client socket. + * @param ev Socket event structure that has a struct Connection as + * its associated data. + */ +static void client_sock_callback(struct Event* ev) +{ + struct Client* cptr; + struct Connection* con; + char *fmt = "%s"; + char *fallback = 0; + + assert(0 != ev_socket(ev)); + assert(0 != s_data(ev_socket(ev))); + + con = (struct Connection*) s_data(ev_socket(ev)); + + assert(0 != con_client(con) || ev_type(ev) == ET_DESTROY); + + cptr = con_client(con); + + assert(0 == cptr || con == cli_connect(cptr)); + + switch (ev_type(ev)) { + case ET_DESTROY: + con_freeflag(con) &= ~FREEFLAG_SOCKET; + + if (!con_freeflag(con) && !cptr) + free_connection(con); + break; + + case ET_CONNECT: /* socket connection completed */ + if(cli_connect(cptr)->con_ssl) { + ssl_start_handshake_connect(cli_connect(cptr)->con_ssl); + } + else if (!completed_connection(cptr) || IsDead(cptr)) + fallback = cli_info(cptr); + break; + + case ET_ERROR: /* an error occurred */ + fallback = cli_info(cptr); + cli_error(cptr) = ev_data(ev); + /* If the OS told us we have a bad file descriptor, we should + * record that for future reference. + */ + if (cli_error(cptr) == EBADF) + cli_fd(cptr) = -1; + if (s_state(&(con_socket(con))) == SS_CONNECTING) { + completed_connection(cptr); + /* for some reason, the os_get_sockerr() in completed_connect() + * can return 0 even when ev_data(ev) indicates a real error, so + * re-assign the client error here. + */ + cli_error(cptr) = ev_data(ev); + break; + } + /*FALLTHROUGH*/ + case ET_EOF: /* end of file on socket */ + Debug((DEBUG_ERROR, "READ ERROR: fd = %d %d", cli_fd(cptr), + cli_error(cptr))); + SetFlag(cptr, FLAG_DEADSOCKET); + if ((IsServer(cptr) || IsHandshake(cptr)) && cli_error(cptr) == 0) { + exit_client_msg(cptr, cptr, &me, "Server %s closed the connection (%s)", + cli_name(cptr), cli_serv(cptr)->last_error_msg); + return; + } else { + fmt = "Read error: %s"; + fallback = "EOF from client"; + } + break; + + case ET_WRITE: /* socket is writable */ + ClrFlag(cptr, FLAG_BLOCKED); + if (cli_listing(cptr) && MsgQLength(&(cli_sendQ(cptr))) < 2048) + list_next_channels(cptr); + Debug((DEBUG_SEND, "Sending queued data to %C", cptr)); + send_queued(cptr); + break; + + case ET_READ: /* socket is readable */ + if (!IsDead(cptr)) { + Debug((DEBUG_DEBUG, "Reading data from %C", cptr)); + if (read_packet(cptr, 1) == 0) /* error while reading packet */ + fallback = "EOF from client"; + } + break; + + default: + assert(0 && "Unrecognized socket event in client_sock_callback()"); + break; + } + + assert(0 == cptr || 0 == cli_connect(cptr) || con == cli_connect(cptr)); + + if (fallback) { + const char* msg = (cli_error(cptr)) ? strerror(cli_error(cptr)) : fallback; + if (!msg) + msg = "Unknown error"; + exit_client_msg(cptr, cptr, &me, fmt, msg); + } +} + +/** Process a timer on client socket. + * @param ev Timer event that has a struct Connection as its + * associated data. + */ +static void client_timer_callback(struct Event* ev) +{ + struct Client* cptr; + struct Connection* con; + + assert(0 != ev_timer(ev)); + assert(0 != t_data(ev_timer(ev))); + assert(ET_DESTROY == ev_type(ev) || ET_EXPIRE == ev_type(ev)); + + con = (struct Connection*) t_data(ev_timer(ev)); + + assert(0 != con_client(con) || ev_type(ev) == ET_DESTROY); + + cptr = con_client(con); + assert(0 == cptr || con == cli_connect(cptr)); + + if (ev_type(ev)== ET_DESTROY) { + con_freeflag(con) &= ~FREEFLAG_TIMER; /* timer has expired... */ + + if (!con_freeflag(con) && !cptr) + free_connection(con); /* client is being destroyed */ + } else { + Debug((DEBUG_LIST, "Client process timer for %C expired; processing", + cptr)); + read_packet(cptr, 0); /* read_packet will re-add timer if needed */ + } + + assert(0 == cptr || 0 == cli_connect(cptr) || con == cli_connect(cptr)); +}