X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8db00894ab7750513d8750290e508b5802bc1fc5..c1c91f9438713b71a0b8b7cc9104458c7a6a3b47:/src/s_serv.c diff --git a/src/s_serv.c b/src/s_serv.c index 60768e4..94b26bc 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -35,8 +35,7 @@ #include "client.h" #include "common.h" #include "hash.h" -#include "irc_string.h" -#include "sprintf_irc.h" +#include "match.h" #include "ircd.h" #include "ircd_defs.h" #include "numeric.h" @@ -55,17 +54,12 @@ #include "msg.h" #include "reject.h" #include "sslproc.h" - -extern char *crypt(); +#include "irc_dictionary.h" #ifndef INADDR_NONE #define INADDR_NONE ((unsigned int) 0xffffffff) #endif -#ifndef HAVE_SOCKETPAIR -static int inet_socketpair(int d, int type, int protocol, int sv[2]); -#endif - int MaxConnectionCount = 1; int MaxClientCount = 1; int refresh_user_links = 0; @@ -84,7 +78,6 @@ struct Capability captab[] = { { "CHW", CAP_CHW}, { "IE", CAP_IE}, { "KLN", CAP_KLN}, - { "GLN", CAP_GLN}, { "KNOCK", CAP_KNOCK}, { "ZIP", CAP_ZIP}, { "TB", CAP_TB}, @@ -95,6 +88,7 @@ struct Capability captab[] = { { "RSFNC", CAP_RSFNC }, { "SAVE", CAP_SAVE }, { "EUID", CAP_EUID }, + { "EOPMOD", CAP_EOPMOD }, {0, 0} }; @@ -160,41 +154,23 @@ hunt_server(struct Client *client_p, struct Client *source_p, * Again, if there are no wild cards involved in the server * name, use the hash lookup */ - if(!target_p) + if(!target_p && wilds) { - if(!wilds) - { - if(MyClient(source_p) || !IsDigit(parv[server][0])) - sendto_one_numeric(source_p, ERR_NOSUCHSERVER, - form_str(ERR_NOSUCHSERVER), - parv[server]); - return (HUNTED_NOSUCH); - } - else + RB_DLINK_FOREACH(ptr, global_client_list.head) { - target_p = NULL; - - RB_DLINK_FOREACH(ptr, global_client_list.head) + if(match(new, ((struct Client *) (ptr->data))->name)) { - if(match(new, ((struct Client *) (ptr->data))->name)) - { - target_p = ptr->data; - break; - } + target_p = ptr->data; + break; } } } + if(target_p && !IsRegistered(target_p)) + target_p = NULL; + if(target_p) { - if(!IsRegistered(target_p)) - { - sendto_one_numeric(source_p, ERR_NOSUCHSERVER, - form_str(ERR_NOSUCHSERVER), - parv[server]); - return HUNTED_NOSUCH; - } - if(IsMe(target_p) || MyClient(target_p)) return HUNTED_ISME; @@ -238,8 +214,8 @@ try_connections(void *unused) if(ServerConfIllegal(tmp_p) || !ServerConfAutoconn(tmp_p)) continue; - /* don't allow ssl connections if ssl isn't setup */ - if(ServerConfSSL(tmp_p) && (!ssl_ok || !get_ssld_count())) + /* don't allow ssl connections if ssl isn't setup */ + if(ServerConfSSL(tmp_p) && (!ssl_ok || !get_ssld_count())) continue; cltmp = tmp_p->class; @@ -299,15 +275,9 @@ try_connections(void *unused) * error afterwards if it fails. * -- adrian */ -#ifndef HIDE_SERVERS_IPS - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "Connection to %s[%s] activated.", - server_p->name, server_p->host); -#else sendto_realops_snomask(SNO_GENERAL, L_ALL, "Connection to %s activated", server_p->name); -#endif serv_connect(server_p, 0); } @@ -351,7 +321,7 @@ check_server(const char *name, struct Client *client_p) if(ServerConfEncrypted(tmp_p)) { - if(!strcmp(tmp_p->passwd, crypt(client_p->localClient->passwd, + if(!strcmp(tmp_p->passwd, rb_crypt(client_p->localClient->passwd, tmp_p->passwd))) { server_p = tmp_p; @@ -369,9 +339,9 @@ check_server(const char *name, struct Client *client_p) if(server_p == NULL) return error; - if(ServerConfSSL(server_p) && client_p->localClient->ssl_ctl == NULL) - { - return -5; + if(ServerConfSSL(server_p) && client_p->localClient->ssl_ctl == NULL) + { + return -5; } attach_server_conf(client_p, server_p); @@ -422,62 +392,6 @@ send_capabilities(struct Client *client_p, int cap_can_send) sendto_one(client_p, "CAPAB :%s", msgbuf); } -/* burst_modes_TS5() - * - * input - client to burst to, channel name, list to burst, mode flag - * output - - * side effects - client is sent a list of +b, or +e, or +I modes - */ -static void -burst_modes_TS5(struct Client *client_p, char *chname, rb_dlink_list *list, char flag) -{ - rb_dlink_node *ptr; - struct Ban *banptr; - char mbuf[MODEBUFLEN]; - char pbuf[BUFSIZE]; - int tlen; - int mlen; - int cur_len; - char *mp; - char *pp; - int count = 0; - - mlen = rb_sprintf(buf, ":%s MODE %s +", me.name, chname); - cur_len = mlen; - - mp = mbuf; - pp = pbuf; - - RB_DLINK_FOREACH(ptr, list->head) - { - banptr = ptr->data; - tlen = strlen(banptr->banstr) + 3; - - /* uh oh */ - if(tlen > MODEBUFLEN) - continue; - - if((count >= MAXMODEPARAMS) || ((cur_len + tlen + 2) > (BUFSIZE - 3))) - { - sendto_one(client_p, "%s%s %s", buf, mbuf, pbuf); - - mp = mbuf; - pp = pbuf; - cur_len = mlen; - count = 0; - } - - *mp++ = flag; - *mp = '\0'; - pp += rb_sprintf(pp, "%s ", banptr->banstr); - cur_len += tlen; - count++; - } - - if(count != 0) - sendto_one(client_p, "%s%s %s", buf, mbuf, pbuf); -} - /* burst_modes_TS6() * * input - client to burst to, channel name, list to burst, mode flag @@ -534,138 +448,6 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr, sendto_one(client_p, "%s", buf); } -/* - * burst_TS5 - * - * inputs - client (server) to send nick towards - * - client to send nick for - * output - NONE - * side effects - NICK message is sent towards given client_p - */ -static void -burst_TS5(struct Client *client_p) -{ - static char ubuf[12]; - struct Client *target_p; - struct Channel *chptr; - struct membership *msptr; - hook_data_client hclientinfo; - hook_data_channel hchaninfo; - rb_dlink_node *ptr; - rb_dlink_node *uptr; - char *t; - int tlen, mlen; - int cur_len = 0; - - hclientinfo.client = hchaninfo.client = client_p; - - RB_DLINK_FOREACH(ptr, global_client_list.head) - { - target_p = ptr->data; - - if(!IsPerson(target_p)) - continue; - - send_umode(NULL, target_p, 0, 0, ubuf); - if(!*ubuf) - { - ubuf[0] = '+'; - ubuf[1] = '\0'; - } - - sendto_one(client_p, "NICK %s %d %ld %s %s %s %s :%s", - target_p->name, target_p->hopcount + 1, - (long) target_p->tsinfo, ubuf, - target_p->username, target_p->host, - target_p->servptr->name, target_p->info); - - if(IsDynSpoof(target_p)) - sendto_one(client_p, ":%s ENCAP * REALHOST %s", - target_p->name, target_p->orighost); - if(!EmptyString(target_p->user->suser)) - sendto_one(client_p, ":%s ENCAP * LOGIN %s", - target_p->name, target_p->user->suser); - - if(ConfigFileEntry.burst_away && !EmptyString(target_p->user->away)) - sendto_one(client_p, ":%s AWAY :%s", - target_p->name, target_p->user->away); - - hclientinfo.target = target_p; - call_hook(h_burst_client, &hclientinfo); - } - - RB_DLINK_FOREACH(ptr, global_channel_list.head) - { - chptr = ptr->data; - - if(*chptr->chname != '#') - continue; - - cur_len = mlen = rb_sprintf(buf, ":%s SJOIN %ld %s %s :", me.name, - (long) chptr->channelts, chptr->chname, - channel_modes(chptr, client_p)); - - t = buf + mlen; - - RB_DLINK_FOREACH(uptr, chptr->members.head) - { - msptr = uptr->data; - - tlen = strlen(msptr->client_p->name) + 1; - if(is_chanop(msptr)) - tlen++; - if(is_voiced(msptr)) - tlen++; - - if(cur_len + tlen >= BUFSIZE - 3) - { - t--; - *t = '\0'; - sendto_one(client_p, "%s", buf); - cur_len = mlen; - t = buf + mlen; - } - - rb_sprintf(t, "%s%s ", find_channel_status(msptr, 1), - msptr->client_p->name); - - cur_len += tlen; - t += tlen; - } - - if (rb_dlink_list_length(&chptr->members) > 0) - { - /* remove trailing space */ - t--; - *t = '\0'; - } - sendto_one(client_p, "%s", buf); - - burst_modes_TS5(client_p, chptr->chname, &chptr->banlist, 'b'); - - if(IsCapable(client_p, CAP_EX)) - burst_modes_TS5(client_p, chptr->chname, &chptr->exceptlist, 'e'); - - if(IsCapable(client_p, CAP_IE)) - burst_modes_TS5(client_p, chptr->chname, &chptr->invexlist, 'I'); - - burst_modes_TS5(client_p, chptr->chname, &chptr->quietlist, 'q'); - - if(IsCapable(client_p, CAP_TB) && chptr->topic != NULL) - sendto_one(client_p, ":%s TB %s %ld %s%s:%s", - me.name, chptr->chname, (long) chptr->topic_time, - ConfigChannel.burst_topicwho ? chptr->topic_info : "", - ConfigChannel.burst_topicwho ? " " : "", - chptr->topic); - - hchaninfo.chptr = chptr; - call_hook(h_burst_channel, &hchaninfo); - } - - hclientinfo.target = NULL; - call_hook(h_burst_finished, &hclientinfo); -} - /* * burst_TS6 * @@ -688,6 +470,8 @@ burst_TS6(struct Client *client_p) char *t; int tlen, mlen; int cur_len = 0; + struct Metadata *md; + struct DictionaryIter iter; hclientinfo.client = hchaninfo.client = client_p; @@ -705,7 +489,7 @@ burst_TS6(struct Client *client_p) ubuf[1] = '\0'; } - if(has_id(target_p) && IsCapable(client_p, CAP_EUID)) + if(IsCapable(client_p, CAP_EUID)) sendto_one(client_p, ":%s EUID %s %d %ld %s %s %s %s %s %s %s :%s", target_p->servptr->id, target_p->name, target_p->hopcount + 1, @@ -716,7 +500,7 @@ burst_TS6(struct Client *client_p) IsDynSpoof(target_p) ? target_p->orighost : "*", EmptyString(target_p->user->suser) ? "*" : target_p->user->suser, target_p->info); - else if(has_id(target_p)) + else sendto_one(client_p, ":%s UID %s %d %ld %s %s %s %s %s :%s", target_p->servptr->id, target_p->name, target_p->hopcount + 1, @@ -724,16 +508,12 @@ burst_TS6(struct Client *client_p) target_p->username, target_p->host, IsIPSpoof(target_p) ? "0" : target_p->sockhost, target_p->id, target_p->info); - else - sendto_one(client_p, "NICK %s %d %ld %s %s %s %s :%s", - target_p->name, - target_p->hopcount + 1, - (long) target_p->tsinfo, - ubuf, - target_p->username, target_p->host, - target_p->servptr->name, target_p->info); - - if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID)) + + if(!EmptyString(target_p->certfp)) + sendto_one(client_p, ":%s ENCAP * CERTFP :%s", + use_id(target_p), target_p->certfp); + + if(!IsCapable(client_p, CAP_EUID)) { if(IsDynSpoof(target_p)) sendto_one(client_p, ":%s ENCAP * REALHOST %s", @@ -743,6 +523,12 @@ burst_TS6(struct Client *client_p) use_id(target_p), target_p->user->suser); } + DICTIONARY_FOREACH(md, &iter, target_p->user->metadata) + { + sendto_one(client_p, ":%s ENCAP * METADATA ADD %s %s :%s", + use_id(target_p), use_id(target_p), md->name, md->value); + } + if(ConfigFileEntry.burst_away && !EmptyString(target_p->user->away)) sendto_one(client_p, ":%s AWAY :%s", use_id(target_p), @@ -770,8 +556,12 @@ burst_TS6(struct Client *client_p) msptr = uptr->data; tlen = strlen(use_id(msptr->client_p)) + 1; + if(is_admin(msptr)) + tlen++; if(is_chanop(msptr)) tlen++; + if(is_halfop(msptr)) + tlen++; if(is_voiced(msptr)) tlen++; @@ -797,6 +587,14 @@ burst_TS6(struct Client *client_p) } sendto_one(client_p, "%s", buf); + DICTIONARY_FOREACH(md, &iter, chptr->metadata) + { + /* don't bother bursting +J metadata */ + if(!(md->name[0] == 'K')) + sendto_one(&me, ":%s ENCAP * METADATA ADD %s %s :%s", + use_id(target_p), use_id(target_p), md->name, md->value); + } + if(rb_dlink_list_length(&chptr->banlist) > 0) burst_modes_TS6(client_p, chptr, &chptr->banlist, 'b'); @@ -838,32 +636,23 @@ show_capabilities(struct Client *target_p) { static char msgbuf[BUFSIZE]; struct Capability *cap; - char *t; - int tl; - t = msgbuf; - tl = rb_sprintf(msgbuf, "TS "); - t += tl; + if(has_id(target_p)) + rb_strlcpy(msgbuf, " TS6", sizeof(msgbuf)); + + if(IsSSL(target_p)) + rb_strlcat(msgbuf, " SSL", sizeof(msgbuf)); if(!IsServer(target_p) || !target_p->serv->caps) /* short circuit if no caps */ - { - msgbuf[2] = '\0'; - return msgbuf; - } + return msgbuf + 1; for (cap = captab; cap->cap; ++cap) { if(cap->cap & target_p->serv->caps) - { - tl = rb_sprintf(t, "%s ", cap->name); - t += tl; - } + rb_snprintf_append(msgbuf, sizeof(msgbuf), " %s", cap->name); } - t--; - *t = '\0'; - - return msgbuf; + return msgbuf + 1; } /* @@ -950,11 +739,11 @@ server_estab(struct Client *client_p) 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, rb_current_time()); + 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; @@ -967,7 +756,6 @@ server_estab(struct Client *client_p) set_chcap_usage_counts(client_p); rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers); - del_unknown_ip(client_p); rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list); rb_dlinkAddTailAlloc(client_p, &global_serv_list); @@ -999,7 +787,7 @@ server_estab(struct Client *client_p) /* Show the real host/IP to admins */ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link with %s established: (%s) link", - get_server_name(client_p, SHOW_IP), + client_p->name, show_capabilities(client_p)); ilog(L_SERVER, "Link with %s established: (%s) link", @@ -1009,7 +797,7 @@ server_estab(struct Client *client_p) hdata.target = client_p; call_hook(h_server_introduced, &hdata); - rb_snprintf(note, sizeof(note), "Server: %s", client_p->name); + rb_snprintf(note, sizeof(note), "Server: %s", client_p->name); rb_note(client_p->localClient->F, note); /* @@ -1093,18 +881,14 @@ server_estab(struct Client *client_p) target_p->serv->fullcaps); } - if(has_id(client_p)) - burst_TS6(client_p); - else - burst_TS5(client_p); + burst_TS6(client_p); /* Always send a PING after connect burst is done */ sendto_one(client_p, "PING :%s", get_id(&me, client_p)); free_pre_client(client_p); - if (!IsCapable(client_p, CAP_ZIP)) - send_pop_queue(client_p); + send_pop_queue(client_p); return 0; } @@ -1126,7 +910,7 @@ serv_connect_resolved(struct Client *client_p) 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", - get_server_name(client_p, HIDE_IP)); + client_p->name); exit_client(client_p, client_p, &me, "Lost connect{} block"); return 0; } @@ -1171,21 +955,21 @@ serv_connect_resolved(struct Client *client_p) #endif (server_p->aftype == AF_INET ? "IPv4" : "?")); - if(ServerConfSSL(server_p)) - { - rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, - NULL, 0, serv_connect_ssl_callback, - client_p, ConfigFileEntry.connect_timeout); - } - else - rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, - NULL, 0, serv_connect_callback, + if(ServerConfSSL(server_p)) + { + rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, + NULL, 0, serv_connect_ssl_callback, + client_p, ConfigFileEntry.connect_timeout); + } + else + rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, + NULL, 0, serv_connect_callback, client_p, ConfigFileEntry.connect_timeout); return 1; } /* log */ - inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr); + rb_inet_ntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr); ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", client_p->name, client_p->sockhost, port, #ifdef RB_IPV6 server_p->aftype == AF_INET6 ? "IPv6" : @@ -1193,15 +977,15 @@ serv_connect_resolved(struct Client *client_p) (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr); - if(ServerConfSSL(server_p)) - rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, - (struct sockaddr *) &myipnum, - GET_SS_LEN(&myipnum), serv_connect_ssl_callback, client_p, - ConfigFileEntry.connect_timeout); - else - rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, - (struct sockaddr *) &myipnum, - GET_SS_LEN(&myipnum), serv_connect_callback, client_p, + if(ServerConfSSL(server_p)) + rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, + (struct sockaddr *) &myipnum, + GET_SS_LEN(&myipnum), serv_connect_ssl_callback, client_p, + ConfigFileEntry.connect_timeout); + else + rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip, + (struct sockaddr *) &myipnum, + GET_SS_LEN(&myipnum), serv_connect_callback, client_p, ConfigFileEntry.connect_timeout); return 1; @@ -1219,7 +1003,7 @@ serv_connect_dns_callback(void *vptr, struct DNSReply *reply) if (reply == NULL) { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Cannot resolve hostname for %s", - get_server_name(client_p, HIDE_IP)); + client_p->name); ilog(L_SERVER, "Cannot resolve hostname for %s", log_client_name(client_p, HIDE_IP)); exit_client(client_p, client_p, &me, "Cannot resolve hostname"); @@ -1239,7 +1023,7 @@ serv_connect_dns_callback(void *vptr, struct DNSReply *reply) #endif ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = port; /* Set sockhost properly now -- jilles */ - inetntop_sock((struct sockaddr *)&client_p->localClient->ip, + rb_inet_ntop_sock((struct sockaddr *)&client_p->localClient->ip, client_p->sockhost, sizeof client_p->sockhost); serv_connect_resolved(client_p); } @@ -1280,10 +1064,10 @@ serv_connect(struct server_conf *server_p, struct Client *by) { sendto_realops_snomask(SNO_GENERAL, L_ALL, "Server %s already present from %s", - server_p->name, get_server_name(client_p, SHOW_IP)); + server_p->name, client_p->name); if(by && IsPerson(by) && !MyClient(by)) sendto_one_notice(by, ":Server %s already present from %s", - server_p->name, get_server_name(client_p, SHOW_IP)); + server_p->name, client_p->name); return 0; } @@ -1304,9 +1088,9 @@ serv_connect(struct server_conf *server_p, struct Client *by) * The sockhost may be a hostname, this will be corrected later * -- jilles */ - strlcpy(client_p->name, server_p->name, sizeof(client_p->name)); - strlcpy(client_p->host, server_p->host, sizeof(client_p->host)); - strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost)); + rb_strlcpy(client_p->name, server_p->name, sizeof(client_p->name)); + rb_strlcpy(client_p->host, server_p->host, sizeof(client_p->host)); + rb_strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost)); client_p->localClient->F = F; add_to_cli_fd_hash(client_p); @@ -1386,32 +1170,32 @@ serv_connect(struct server_conf *server_p, struct Client *by) } } -static void -serv_connect_ev(void *data) -{ - struct Client *client_p = data; - serv_connect_callback(client_p->localClient->F, RB_OK, client_p); -} +static void +serv_connect_ssl_callback(rb_fde_t *F, int status, void *data) +{ + struct Client *client_p = data; + rb_fde_t *xF[2]; + rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip)); + if(status != RB_OK) + { + /* Print error message, just like non-SSL. */ + serv_connect_callback(F, status, data); + return; + } + if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection") == -1) + { + ilog_error("rb_socketpair failed for server"); + serv_connect_callback(F, RB_ERROR, data); + return; + + } + del_from_cli_fd_hash(client_p); + client_p->localClient->F = xF[0]; + add_to_cli_fd_hash(client_p); -static void -serv_connect_ssl_callback(rb_fde_t *F, int status, void *data) -{ - struct Client *client_p = data; - rb_fde_t *xF[2]; - if(status != RB_OK) - { - /* XXX deal with failure */ - return; - } - rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip)); - rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection"); - del_from_cli_fd_hash(client_p); - client_p->localClient->F = xF[0]; - add_to_cli_fd_hash(client_p); - - client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0])); - SetSSL(client_p); - rb_event_addonce("serv_connect_ev", serv_connect_ev, client_p, 1); + client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0])); + SetSSL(client_p); + serv_connect_callback(client_p->localClient->F, RB_OK, client_p); } /* @@ -1446,7 +1230,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) return; } - if(client_p->localClient->ssl_ctl == NULL) + if(client_p->localClient->ssl_ctl == NULL) rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip)); /* Check the status */ @@ -1460,11 +1244,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Error connecting to %s[%s]: %s", client_p->name, -#ifdef HIDE_SERVERS_IPS "255.255.255.255", -#else - client_p->host, -#endif rb_errstr(status)); ilog(L_SERVER, "Error connecting to %s[%s]: %s", client_p->name, client_p->sockhost, @@ -1476,11 +1256,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Error connecting to %s[%s]: %s (%s)", client_p->name, -#ifdef HIDE_SERVERS_IPS "255.255.255.255", -#else - client_p->host, -#endif rb_errstr(status), errstr); ilog(L_SERVER, "Error connecting to %s[%s]: %s (%s)", client_p->name, client_p->sockhost, @@ -1496,7 +1272,7 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) 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", - get_server_name(client_p, HIDE_IP)); + client_p->name); exit_client(client_p, client_p, &me, "Lost connect{} block"); return; } @@ -1504,9 +1280,6 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) /* Next, send the initial handshake */ SetHandshake(client_p); - /* kludge, if we're not using TS6, dont ever send - * ourselves as being TS6 capable. - */ if(!EmptyString(server_p->spasswd)) { sendto_one(client_p, "PASS %s TS %d :%s", @@ -1539,60 +1312,3 @@ serv_connect_callback(rb_fde_t *F, int status, void *data) /* If we get here, we're ok, so lets start reading some data */ read_packet(F, client_p); } - -#ifndef HAVE_SOCKETPAIR -static int -inet_socketpair(int d, int type, int protocol, int sv[2]) -{ - struct sockaddr_in addr1, addr2, addr3; - int addr3_len = sizeof(addr3); - int fd, rc; - int port_no = 20000; - - if(d != AF_INET || type != SOCK_STREAM || protocol) - { - errno = EAFNOSUPPORT; - return -1; - } - if(((sv[0] = socket(AF_INET, SOCK_STREAM, 0)) < 0) || ((sv[1] = socket(AF_INET, SOCK_STREAM, 0)) < 0)) - return -1; - - addr1.sin_port = htons(port_no); - addr1.sin_family = AF_INET; - addr1.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - while ((rc = bind (sv[0], (struct sockaddr *) &addr1, sizeof (addr1))) < 0 && errno == EADDRINUSE) - addr1.sin_port = htons(++port_no); - - if(rc < 0) - return -1; - - if(listen(sv[0], 1) < 0) - { - close(sv[0]); - close(sv[1]); - return -1; - } - - addr2.sin_port = htons(port_no); - addr2.sin_family = AF_INET; - addr2.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if(connect (sv[1], (struct sockaddr *) &addr2, sizeof (addr2)) < 0) - { - close(sv[0]); - close(sv[1]); - return -1; - } - - if((fd = accept(sv[1], (struct sockaddr *) &addr3, &addr3_len)) < 0) - { - close(sv[0]); - close(sv[1]); - return -1; - } - close(sv[0]); - sv[0] = fd; - - return(0); - -} -#endif