X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/53789fddda974222f729d608558ce9ae662c6d9f..9dd98618d044c63ba4d30c79350f4b6a4a2c3453:/ircd/s_serv.c diff --git a/ircd/s_serv.c b/ircd/s_serv.c index 6f43537f..98caf93a 100644 --- a/ircd/s_serv.c +++ b/ircd/s_serv.c @@ -53,10 +53,6 @@ #include "capability.h" #include "s_assert.h" -#ifndef INADDR_NONE -#define INADDR_NONE ((unsigned int) 0xffffffff) -#endif - int MaxConnectionCount = 1; int MaxClientCount = 1; int refresh_user_links = 0; @@ -77,7 +73,6 @@ unsigned int CAP_EX; unsigned int CAP_CHW; unsigned int CAP_IE; unsigned int CAP_KLN; -unsigned int CAP_ZIP; unsigned int CAP_KNOCK; unsigned int CAP_TB; unsigned int CAP_UNKLN; @@ -107,6 +102,7 @@ unsigned int CLICAP_ECHO_MESSAGE; void init_builtin_capabs(void) { + static struct ClientCapability high_priority = {.flags = CLICAP_FLAGS_PRIORITY}; serv_capindex = capability_index_create("server capabilities"); /* These two are not set via CAPAB/GCAP keywords. */ @@ -119,7 +115,6 @@ init_builtin_capabs(void) CAP_IE = capability_put(serv_capindex, "IE", NULL); CAP_KLN = capability_put(serv_capindex, "KLN", NULL); CAP_KNOCK = capability_put(serv_capindex, "KNOCK", NULL); - CAP_ZIP = capability_put(serv_capindex, "ZIP", NULL); CAP_TB = capability_put(serv_capindex, "TB", NULL); CAP_UNKLN = capability_put(serv_capindex, "UNKLN", NULL); CAP_CLUSTER = capability_put(serv_capindex, "CLUSTER", NULL); @@ -139,13 +134,13 @@ init_builtin_capabs(void) cli_capindex = capability_index_create("client capabilities"); - CLICAP_MULTI_PREFIX = capability_put(cli_capindex, "multi-prefix", NULL); - CLICAP_ACCOUNT_NOTIFY = capability_put(cli_capindex, "account-notify", NULL); - CLICAP_EXTENDED_JOIN = capability_put(cli_capindex, "extended-join", NULL); - CLICAP_AWAY_NOTIFY = capability_put(cli_capindex, "away-notify", NULL); - CLICAP_USERHOST_IN_NAMES = capability_put(cli_capindex, "userhost-in-names", NULL); + CLICAP_MULTI_PREFIX = capability_put(cli_capindex, "multi-prefix", &high_priority); + CLICAP_ACCOUNT_NOTIFY = capability_put(cli_capindex, "account-notify", &high_priority); + CLICAP_EXTENDED_JOIN = capability_put(cli_capindex, "extended-join", &high_priority); + CLICAP_AWAY_NOTIFY = capability_put(cli_capindex, "away-notify", &high_priority); + CLICAP_USERHOST_IN_NAMES = capability_put(cli_capindex, "userhost-in-names", &high_priority); CLICAP_CAP_NOTIFY = capability_put(cli_capindex, "cap-notify", NULL); - CLICAP_CHGHOST = capability_put(cli_capindex, "chghost", NULL); + CLICAP_CHGHOST = capability_put(cli_capindex, "chghost", &high_priority); CLICAP_ECHO_MESSAGE = capability_put(cli_capindex, "echo-message", NULL); } @@ -301,7 +296,7 @@ try_connections(void *unused) */ client_p = find_server(NULL, tmp_p->name); - if(!client_p && (CurrUsers(cltmp) < MaxUsers(cltmp)) && !connecting) + if(!client_p && (CurrUsers(cltmp) < MaxAutoconn(cltmp)) && !connecting) { server_p = tmp_p; @@ -333,7 +328,7 @@ try_connections(void *unused) * error afterwards if it fails. * -- adrian */ - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection to %s activated", server_p->name); @@ -376,18 +371,16 @@ check_server(const char *name, struct Client *client_p) name_matched = true; - if(rb_inet_pton_sock(client_p->sockhost, (struct sockaddr *)&client_addr) <= 0) + if(rb_inet_pton_sock(client_p->sockhost, &client_addr) <= 0) SET_SS_FAMILY(&client_addr, AF_UNSPEC); if((tmp_p->connect_host && match(tmp_p->connect_host, client_p->host)) || (GET_SS_FAMILY(&client_addr) == GET_SS_FAMILY(&tmp_p->connect4) && comp_with_mask_sock((struct sockaddr *)&client_addr, (struct sockaddr *)&tmp_p->connect4, 32)) -#ifdef RB_IPV6 || (GET_SS_FAMILY(&client_addr) == GET_SS_FAMILY(&tmp_p->connect6) && comp_with_mask_sock((struct sockaddr *)&client_addr, (struct sockaddr *)&tmp_p->connect6, 128)) -#endif ) { host_matched = true; @@ -441,14 +434,14 @@ check_server(const char *name, struct Client *client_p) return -5; } + if (client_p->localClient->att_sconf && client_p->localClient->att_sconf->class == server_p->class) { + /* this is an outgoing connection that is already attached to the correct class */ + } else if (CurrUsers(server_p->class) >= MaxUsers(server_p->class)) { + return -7; + } attach_server_conf(client_p, server_p); - /* clear ZIP/TB if they support but we dont want them */ -#ifdef HAVE_LIBZ - if(!ServerConfCompressed(server_p)) -#endif - ClearCap(client_p, CAP_ZIP); - + /* clear TB if they support but we dont want it */ if(!ServerConfTb(server_p)) ClearCap(client_p, CAP_TB); @@ -472,19 +465,12 @@ send_capabilities(struct Client *client_p, unsigned int cap_can_send) static void burst_ban(struct Client *client_p) { - rb_dlink_node *ptr; struct ConfItem *aconf; - const char *type, *oper; - /* +5 for !,@,{,} and null */ - char operbuf[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5]; - char *p; - size_t melen; - - melen = strlen(me.name); - RB_DLINK_FOREACH(ptr, prop_bans.head) - { - aconf = ptr->data; + const char *type; + rb_dictionary_iter state; + RB_DICTIONARY_FOREACH(aconf, &state, prop_bans_dict) + { /* Skip expired stuff. */ if(aconf->lifetime < rb_current_time()) continue; @@ -498,24 +484,6 @@ burst_ban(struct Client *client_p) default: continue; } - oper = aconf->info.oper; - if(aconf->flags & CONF_FLAGS_MYOPER) - { - /* Our operator{} names may not be meaningful - * to other servers, so rewrite to our server - * name. - */ - rb_strlcpy(operbuf, aconf->info.oper, sizeof buf); - p = strrchr(operbuf, '{'); - if (p != NULL && - operbuf + sizeof operbuf - p > (ptrdiff_t)(melen + 2)) - { - memcpy(p + 1, me.name, melen); - p[melen + 1] = '}'; - p[melen + 2] = '\0'; - oper = operbuf; - } - } sendto_one(client_p, ":%s BAN %s %s %s %lu %d %d %s :%s%s%s", me.id, type, @@ -523,7 +491,7 @@ burst_ban(struct Client *client_p) (unsigned long)aconf->created, (int)(aconf->hold - aconf->created), (int)(aconf->lifetime - aconf->created), - oper, + aconf->info.oper, aconf->passwd, aconf->spasswd ? "|" : "", aconf->spasswd ? aconf->spasswd : ""); @@ -542,51 +510,26 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr, { rb_dlink_node *ptr; struct Ban *banptr; - char *t; - int tlen; - int mlen; - int cur_len; - cur_len = mlen = sprintf(buf, ":%s BMASK %ld %s %c :", - me.id, (long) chptr->channelts, chptr->chname, flag); - t = buf + mlen; + send_multiline_init(client_p, " ", ":%s BMASK %ld %s %c :", + me.id, + (long)chptr->channelts, + chptr->chname, + flag); - RB_DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH_PREV(ptr, list->tail) { banptr = ptr->data; - tlen = strlen(banptr->banstr) + (banptr->forward ? strlen(banptr->forward) + 1 : 0) + 1; - - /* uh oh */ - if(cur_len + tlen > BUFSIZE - 3) - { - /* the one we're trying to send doesnt fit at all! */ - if(cur_len == mlen) - { - s_assert(0); - continue; - } - - /* chop off trailing space and send.. */ - *(t-1) = '\0'; - sendto_one(client_p, "%s", buf); - cur_len = mlen; - t = buf + mlen; - } - if (banptr->forward) - sprintf(t, "%s$%s ", banptr->banstr, banptr->forward); + send_multiline_item(client_p, "%s$%s", + banptr->banstr, + banptr->forward); else - sprintf(t, "%s ", banptr->banstr); - t += tlen; - cur_len += tlen; + send_multiline_item(client_p, "%s", banptr->banstr); } - /* cant ever exit the loop above without having modified buf, - * chop off trailing space and send. - */ - *(t-1) = '\0'; - sendto_one(client_p, "%s", buf); + send_multiline_fini(client_p, NULL); } /* @@ -621,6 +564,9 @@ burst_TS6(struct Client *client_p) if(!IsPerson(target_p)) continue; + if(MyClient(target_p->from) && target_p->localClient->att_sconf != NULL && ServerConfNoExport(target_p->localClient->att_sconf)) + continue; + send_umode(NULL, target_p, 0, ubuf); if(!*ubuf) { @@ -667,6 +613,19 @@ burst_TS6(struct Client *client_p) use_id(target_p), target_p->user->away); + if (IsOper(target_p) && target_p->user && target_p->user->opername) + { + if (target_p->user->privset) + sendto_one(client_p, ":%s OPER %s %s", + use_id(target_p), + target_p->user->opername, + target_p->user->privset->name); + else + sendto_one(client_p, ":%s OPER %s", + use_id(target_p), + target_p->user->opername); + } + hclientinfo.target = target_p; call_hook(h_burst_client, &hclientinfo); } @@ -805,7 +764,7 @@ server_estab(struct Client *client_p) if((server_p = client_p->localClient->att_sconf) == NULL) { /* This shouldn't happen, better tell the ops... -A1kmm */ - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Warning: Lost connect{} block for server %s!", host); return exit_client(client_p, client_p, client_p, "Lost connect{} block!"); } @@ -830,8 +789,7 @@ server_estab(struct Client *client_p) EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id); /* pass info to new server */ - send_capabilities(client_p, default_server_capabs - | (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0) + send_capabilities(client_p, default_server_capabs | CAP_MASK | (ServerConfTb(server_p) ? CAP_TB : 0)); sendto_one(client_p, "SERVER %s 1 :%s%s", @@ -843,19 +801,12 @@ server_estab(struct Client *client_p) if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE)) ilog_error("rb_set_buffers failed for server"); - /* Enable compression now */ - if(IsCapable(client_p, CAP_ZIP)) - { - start_zlib_session(client_p); - } - sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, (long int)rb_current_time()); - client_p->servptr = &me; if(IsAnyDead(client_p)) return CLIENT_EXITED; - SetServer(client_p); + sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, (long int)rb_current_time()); rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers); rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list); @@ -867,6 +818,7 @@ server_estab(struct Client *client_p) add_to_client_hash(client_p->name, client_p); /* doesnt duplicate client_p->serv if allocated this struct already */ make_server(client_p); + SetServer(client_p); client_p->serv->caps = client_p->localClient->caps; @@ -914,6 +866,9 @@ server_estab(struct Client *client_p) if(target_p == client_p) continue; + if(target_p->localClient->att_sconf != NULL && ServerConfNoExport(target_p->localClient->att_sconf)) + continue; + if(has_id(target_p) && has_id(client_p)) { sendto_one(target_p, ":%s SID %s 2 %s :%s%s", @@ -962,6 +917,10 @@ server_estab(struct Client *client_p) if(IsMe(target_p) || target_p->from == client_p) continue; + /* don't distribute downstream leaves of servers that are no-export */ + if(MyClient(target_p->from) && target_p->from->localClient->att_sconf != NULL && ServerConfNoExport(target_p->from->localClient->att_sconf)) + continue; + /* presumption, if target has an id, so does its uplink */ if(has_id(client_p) && has_id(target_p)) sendto_one(client_p, ":%s SID %s %d %s :%s%s", @@ -1022,8 +981,8 @@ int serv_connect(struct server_conf *server_p, struct Client *by) { struct Client *client_p; - struct rb_sockaddr_storage sa_connect; - struct rb_sockaddr_storage sa_bind; + struct sockaddr_storage sa_connect[2]; + struct sockaddr_storage sa_bind[ARRAY_SIZE(sa_connect)]; char note[HOSTLEN + 10]; rb_fde_t *F; @@ -1031,47 +990,66 @@ serv_connect(struct server_conf *server_p, struct Client *by) if(server_p == NULL) return 0; -#ifdef RB_IPV6 - if(server_p->aftype != AF_UNSPEC + for (int i = 0; i < ARRAY_SIZE(sa_connect); i++) { + SET_SS_FAMILY(&sa_connect[i], AF_UNSPEC); + SET_SS_FAMILY(&sa_bind[i], AF_UNSPEC); + } + + if(server_p->aftype == AF_UNSPEC && GET_SS_FAMILY(&server_p->connect4) == AF_INET && GET_SS_FAMILY(&server_p->connect6) == AF_INET6) { if(rand() % 2 == 0) { - sa_connect = server_p->connect4; - sa_bind = server_p->bind4; + sa_connect[0] = server_p->connect4; + sa_connect[1] = server_p->connect6; + sa_bind[0] = server_p->bind4; + sa_bind[1] = server_p->bind6; } else { - sa_connect = server_p->connect6; - sa_bind = server_p->bind6; + sa_connect[0] = server_p->connect6; + sa_connect[1] = server_p->connect4; + sa_bind[0] = server_p->bind6; + sa_bind[1] = server_p->bind4; } } else if(server_p->aftype == AF_INET || GET_SS_FAMILY(&server_p->connect4) == AF_INET) -#endif { - sa_connect = server_p->connect4; - sa_bind = server_p->bind4; + sa_connect[0] = server_p->connect4; + sa_bind[0] = server_p->bind4; } -#ifdef RB_IPV6 else if(server_p->aftype == AF_INET6 || GET_SS_FAMILY(&server_p->connect6) == AF_INET6) { - sa_connect = server_p->connect6; - sa_bind = server_p->bind6; + sa_connect[0] = server_p->connect6; + sa_bind[0] = server_p->bind6; } -#endif /* log */ - buf[0] = 0; - rb_inet_ntop_sock((struct sockaddr *)&sa_connect, buf, sizeof(buf)); - ilog(L_SERVER, "Connect to *[%s] @%s", server_p->name, buf); +#ifdef HAVE_LIBSCTP + if (ServerConfSCTP(server_p) && GET_SS_FAMILY(&sa_connect[1]) != AF_UNSPEC) { + char buf2[HOSTLEN + 1]; + + buf[0] = 0; + buf2[0] = 0; + rb_inet_ntop_sock((struct sockaddr *)&sa_connect[0], buf, sizeof(buf)); + rb_inet_ntop_sock((struct sockaddr *)&sa_connect[1], buf2, sizeof(buf2)); + ilog(L_SERVER, "Connect to *[%s] @%s&%s", server_p->name, buf, buf2); + } else { +#else + { +#endif + buf[0] = 0; + rb_inet_ntop_sock((struct sockaddr *)&sa_connect[0], buf, sizeof(buf)); + ilog(L_SERVER, "Connect to *[%s] @%s", server_p->name, buf); + } /* * Make sure this server isn't already connected */ if((client_p = find_server(NULL, server_p->name))) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Server %s already present from %s", server_p->name, client_p->name); if(by && IsPerson(by) && !MyClient(by)) @@ -1080,14 +1058,28 @@ serv_connect(struct server_conf *server_p, struct Client *by) return 0; } + if (CurrUsers(server_p->class) >= MaxUsers(server_p->class)) { + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, + "No more connections allowed in class \"%s\" for server %s", + server_p->class->class_name, server_p->name); + if(by && IsPerson(by) && !MyClient(by)) + sendto_one_notice(by, ":No more connections allowed in class \"%s\" for server %s", + server_p->class->class_name, server_p->name); + return 0; + } + /* create a socket for the server connection */ - if(GET_SS_FAMILY(&sa_connect) == AF_UNSPEC) - { + if(GET_SS_FAMILY(&sa_connect[0]) == AF_UNSPEC) { ilog_error("unspecified socket address family"); return 0; - } - else if((F = rb_socket(GET_SS_FAMILY(&sa_connect), SOCK_STREAM, 0, NULL)) == NULL) - { +#ifdef HAVE_LIBSCTP + } else if (ServerConfSCTP(server_p)) { + if ((F = rb_socket(AF_INET6, SOCK_STREAM, IPPROTO_SCTP, NULL)) == NULL) { + ilog_error("opening a stream socket"); + return 0; + } +#endif + } else if ((F = rb_socket(GET_SS_FAMILY(&sa_connect[0]), SOCK_STREAM, IPPROTO_TCP, NULL)) == NULL) { ilog_error("opening a stream socket"); return 0; } @@ -1108,7 +1100,8 @@ serv_connect(struct server_conf *server_p, struct Client *by) rb_strlcpy(client_p->sockhost, buf, sizeof(client_p->sockhost)); client_p->localClient->F = F; /* shove the port number into the sockaddr */ - SET_SS_PORT(&sa_connect, htons(server_p->port)); + SET_SS_PORT(&sa_connect[0], htons(server_p->port)); + SET_SS_PORT(&sa_connect[1], htons(server_p->port)); /* * Set up the initial server evilness, ripped straight from @@ -1136,28 +1129,38 @@ serv_connect(struct server_conf *server_p, struct Client *by) */ make_server(client_p); if(by && IsClient(by)) - strcpy(client_p->serv->by, by->name); + rb_strlcpy(client_p->serv->by, by->name, sizeof(client_p->serv->by)); else strcpy(client_p->serv->by, "AutoConn."); SetConnecting(client_p); rb_dlinkAddTail(client_p, &client_p->node, &global_client_list); - if(GET_SS_FAMILY(&sa_bind) == AF_UNSPEC) + for (int i = 0; i < ARRAY_SIZE(sa_connect); i++) { + if (GET_SS_FAMILY(&sa_bind[i]) == AF_UNSPEC) { + if (GET_SS_FAMILY(&sa_connect[i]) == GET_SS_FAMILY(&ServerInfo.bind4)) + sa_bind[i] = ServerInfo.bind4; + if (GET_SS_FAMILY(&sa_connect[i]) == GET_SS_FAMILY(&ServerInfo.bind6)) + sa_bind[i] = ServerInfo.bind6; + } + } + +#ifdef HAVE_LIBSCTP + if (ServerConfSCTP(server_p)) { + rb_connect_sctp(client_p->localClient->F, + sa_connect, ARRAY_SIZE(sa_connect), sa_bind, ARRAY_SIZE(sa_bind), + ServerConfSSL(server_p) ? serv_connect_ssl_callback : serv_connect_callback, + client_p, ConfigFileEntry.connect_timeout); + } else { +#else { - if(GET_SS_FAMILY(&sa_connect) == GET_SS_FAMILY(&ServerInfo.bind4)) - sa_bind = ServerInfo.bind4; -#ifdef RB_IPV6 - if(GET_SS_FAMILY(&sa_connect) == GET_SS_FAMILY(&ServerInfo.bind6)) - sa_bind = ServerInfo.bind6; #endif + rb_connect_tcp(client_p->localClient->F, + (struct sockaddr *)&sa_connect[0], + GET_SS_FAMILY(&sa_bind[0]) == AF_UNSPEC ? NULL : (struct sockaddr *)&sa_bind[0], + ServerConfSSL(server_p) ? serv_connect_ssl_callback : serv_connect_callback, + client_p, ConfigFileEntry.connect_timeout); } - - rb_connect_tcp(client_p->localClient->F, - (struct sockaddr *)&sa_connect, - GET_SS_FAMILY(&sa_bind) == AF_UNSPEC ? NULL : (struct sockaddr *)&sa_bind, - ServerConfSSL(server_p) ? serv_connect_ssl_callback : serv_connect_callback, - client_p, ConfigFileEntry.connect_timeout); return 1; } @@ -1242,7 +1245,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) */ if(status == RB_ERR_TIMEOUT || status == RB_ERROR_SSL) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Error connecting to %s[%s]: %s", client_p->name, "255.255.255.255", @@ -1254,7 +1257,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) else { errstr = strerror(rb_get_sockerr(F)); - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Error connecting to %s[%s]: %s (%s)", client_p->name, "255.255.255.255", @@ -1272,7 +1275,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) /* Get the C/N lines */ if((server_p = client_p->localClient->att_sconf) == NULL) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Lost connect{} block for %s", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Lost connect{} block for %s", client_p->name); exit_client(client_p, client_p, &me, "Lost connect{} block"); return; @@ -1280,7 +1283,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) if(server_p->certfp && (!client_p->certfp || rb_strcasecmp(server_p->certfp, client_p->certfp) != 0)) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection to %s has invalid certificate fingerprint %s", client_p->name, client_p->certfp); ilog(L_SERVER, "Access denied, invalid certificate fingerprint %s from %s", @@ -1298,8 +1301,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) EmptyString(server_p->spasswd) ? "*" : server_p->spasswd, TS_CURRENT, me.id); /* pass my info to the new server */ - send_capabilities(client_p, default_server_capabs - | (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0) + send_capabilities(client_p, default_server_capabs | CAP_MASK | (ServerConfTb(server_p) ? CAP_TB : 0)); sendto_one(client_p, "SERVER %s 1 :%s%s", @@ -1312,7 +1314,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) */ if(IsAnyDead(client_p)) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s went dead during handshake", client_p->name); exit_client(client_p, client_p, &me, "Went dead during handshake"); return;