X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/66c8fdd207e5ca29445ea4892f197a2ac1f24840..62d289465fbe0c51a6a86f642f8b88d7b44bcb47:/src/s_serv.c diff --git a/src/s_serv.c b/src/s_serv.c index 582d154..361d546 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -30,12 +30,10 @@ #include #endif -#include "tools.h" #include "s_serv.h" #include "class.h" #include "client.h" #include "common.h" -#include "event.h" #include "hash.h" #include "irc_string.h" #include "sprintf_irc.h" @@ -44,7 +42,6 @@ #include "numeric.h" #include "packet.h" #include "res.h" -#include "commio.h" #include "s_conf.h" #include "s_newconf.h" #include "s_log.h" @@ -53,7 +50,6 @@ #include "scache.h" #include "send.h" #include "client.h" -#include "memory.h" #include "channel.h" /* chcap_usage_counts stuff... */ #include "hook.h" #include "msg.h" @@ -207,10 +203,10 @@ slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data, struct C void collect_zipstats(void *unused) { - dlink_node *ptr; + rb_dlink_node *ptr; struct Client *target_p; - DLINK_FOREACH(ptr, serv_list.head) + RB_DLINK_FOREACH(ptr, serv_list.head) { target_p = ptr->data; if(IsCapable(target_p, CAP_ZIP)) @@ -218,7 +214,7 @@ collect_zipstats(void *unused) /* only bother if we haven't already got something queued... */ if(!target_p->localClient->slinkq) { - target_p->localClient->slinkq = MyMalloc(1); /* sigh.. */ + target_p->localClient->slinkq = rb_malloc(1); /* sigh.. */ target_p->localClient->slinkq[0] = SLINKCMD_ZIPSTATS; target_p->localClient->slinkq_ofs = 0; target_p->localClient->slinkq_len = 1; @@ -253,7 +249,7 @@ hunt_server(struct Client *client_p, struct Client *source_p, { struct Client *target_p; int wilds; - dlink_node *ptr; + rb_dlink_node *ptr; const char *old; char *new; @@ -301,7 +297,7 @@ hunt_server(struct Client *client_p, struct Client *source_p, { target_p = NULL; - DLINK_FOREACH(ptr, global_client_list.head) + RB_DLINK_FOREACH(ptr, global_client_list.head) { if(match(new, ((struct Client *) (ptr->data))->name)) { @@ -334,7 +330,7 @@ hunt_server(struct Client *client_p, struct Client *source_p, return (HUNTED_PASS); } - if(!IsDigit(parv[server][0])) + if(MyClient(source_p) || !IsDigit(parv[server][0])) sendto_one_numeric(source_p, ERR_NOSUCHSERVER, form_str(ERR_NOSUCHSERVER), parv[server]); return (HUNTED_NOSUCH); @@ -353,12 +349,12 @@ try_connections(void *unused) struct server_conf *server_p = NULL; struct server_conf *tmp_p; struct Class *cltmp; - dlink_node *ptr; + rb_dlink_node *ptr; int connecting = FALSE; int confrq = 0; time_t next = 0; - DLINK_FOREACH(ptr, server_conf_list.head) + RB_DLINK_FOREACH(ptr, server_conf_list.head) { tmp_p = ptr->data; @@ -410,12 +406,12 @@ try_connections(void *unused) return; /* move this connect entry to end.. */ - dlinkDelete(&server_p->node, &server_conf_list); - dlinkAddTail(server_p, &server_p->node, &server_conf_list); + rb_dlinkDelete(&server_p->node, &server_conf_list); + rb_dlinkAddTail(server_p, &server_p->node, &server_conf_list); /* * We used to only print this if serv_connect() actually - * suceeded, but since comm_tcp_connect() can call the callback + * suceeded, but since rb_tcp_connect() can call the callback * immediately if there is an error, we were getting error messages * in the wrong order. SO, we just print out the activated line, * and let serv_connect() / serv_connect_callback() print an @@ -440,7 +436,7 @@ check_server(const char *name, struct Client *client_p) { struct server_conf *server_p = NULL; struct server_conf *tmp_p; - dlink_node *ptr; + rb_dlink_node *ptr; int error = -1; s_assert(NULL != client_p); @@ -453,7 +449,7 @@ check_server(const char *name, struct Client *client_p) if(strlen(name) > HOSTLEN) return -4; - DLINK_FOREACH(ptr, server_conf_list.head) + RB_DLINK_FOREACH(ptr, server_conf_list.head) { tmp_p = ptr->data; @@ -529,7 +525,7 @@ send_capabilities(struct Client *client_p, int cap_can_send) { if(cap->cap & cap_can_send) { - tl = ircsprintf(t, "%s ", cap->name); + tl = rb_sprintf(t, "%s ", cap->name); t += tl; } } @@ -547,9 +543,9 @@ send_capabilities(struct Client *client_p, int cap_can_send) * 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, dlink_list *list, char flag) +burst_modes_TS5(struct Client *client_p, char *chname, rb_dlink_list *list, char flag) { - dlink_node *ptr; + rb_dlink_node *ptr; struct Ban *banptr; char mbuf[MODEBUFLEN]; char pbuf[BUFSIZE]; @@ -560,13 +556,13 @@ burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char fl char *pp; int count = 0; - mlen = ircsprintf(buf, ":%s MODE %s +", me.name, chname); + mlen = rb_sprintf(buf, ":%s MODE %s +", me.name, chname); cur_len = mlen; mp = mbuf; pp = pbuf; - DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH(ptr, list->head) { banptr = ptr->data; tlen = strlen(banptr->banstr) + 3; @@ -587,7 +583,7 @@ burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char fl *mp++ = flag; *mp = '\0'; - pp += ircsprintf(pp, "%s ", banptr->banstr); + pp += rb_sprintf(pp, "%s ", banptr->banstr); cur_len += tlen; count++; } @@ -604,20 +600,20 @@ burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char fl */ static void burst_modes_TS6(struct Client *client_p, struct Channel *chptr, - dlink_list *list, char flag) + rb_dlink_list *list, char flag) { - dlink_node *ptr; + rb_dlink_node *ptr; struct Ban *banptr; char *t; int tlen; int mlen; int cur_len; - cur_len = mlen = ircsprintf(buf, ":%s BMASK %ld %s %c :", + cur_len = mlen = rb_sprintf(buf, ":%s BMASK %ld %s %c :", me.id, (long) chptr->channelts, chptr->chname, flag); t = buf + mlen; - DLINK_FOREACH(ptr, list->head) + RB_DLINK_FOREACH(ptr, list->head) { banptr = ptr->data; @@ -640,7 +636,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr, t = buf + mlen; } - ircsprintf(t, "%s ", banptr->banstr); + rb_sprintf(t, "%s ", banptr->banstr); t += tlen; cur_len += tlen; } @@ -669,15 +665,15 @@ burst_TS5(struct Client *client_p) struct membership *msptr; hook_data_client hclientinfo; hook_data_channel hchaninfo; - dlink_node *ptr; - dlink_node *uptr; + rb_dlink_node *ptr; + rb_dlink_node *uptr; char *t; int tlen, mlen; int cur_len = 0; hclientinfo.client = hchaninfo.client = client_p; - DLINK_FOREACH(ptr, global_client_list.head) + RB_DLINK_FOREACH(ptr, global_client_list.head) { target_p = ptr->data; @@ -712,20 +708,20 @@ burst_TS5(struct Client *client_p) call_hook(h_burst_client, &hclientinfo); } - DLINK_FOREACH(ptr, global_channel_list.head) + RB_DLINK_FOREACH(ptr, global_channel_list.head) { chptr = ptr->data; if(*chptr->chname != '#') continue; - cur_len = mlen = ircsprintf(buf, ":%s SJOIN %ld %s %s :", me.name, + 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; - DLINK_FOREACH(uptr, chptr->members.head) + RB_DLINK_FOREACH(uptr, chptr->members.head) { msptr = uptr->data; @@ -744,14 +740,14 @@ burst_TS5(struct Client *client_p) t = buf + mlen; } - ircsprintf(t, "%s%s ", find_channel_status(msptr, 1), + rb_sprintf(t, "%s%s ", find_channel_status(msptr, 1), msptr->client_p->name); cur_len += tlen; t += tlen; } - if (dlink_list_length(&chptr->members) > 0) + if (rb_dlink_list_length(&chptr->members) > 0) { /* remove trailing space */ t--; @@ -801,15 +797,15 @@ burst_TS6(struct Client *client_p) struct membership *msptr; hook_data_client hclientinfo; hook_data_channel hchaninfo; - dlink_node *ptr; - dlink_node *uptr; + rb_dlink_node *ptr; + rb_dlink_node *uptr; char *t; int tlen, mlen; int cur_len = 0; hclientinfo.client = hchaninfo.client = client_p; - DLINK_FOREACH(ptr, global_client_list.head) + RB_DLINK_FOREACH(ptr, global_client_list.head) { target_p = ptr->data; @@ -870,20 +866,20 @@ burst_TS6(struct Client *client_p) call_hook(h_burst_client, &hclientinfo); } - DLINK_FOREACH(ptr, global_channel_list.head) + RB_DLINK_FOREACH(ptr, global_channel_list.head) { chptr = ptr->data; if(*chptr->chname != '#') continue; - cur_len = mlen = ircsprintf(buf, ":%s SJOIN %ld %s %s :", me.id, + cur_len = mlen = rb_sprintf(buf, ":%s SJOIN %ld %s %s :", me.id, (long) chptr->channelts, chptr->chname, channel_modes(chptr, client_p)); t = buf + mlen; - DLINK_FOREACH(uptr, chptr->members.head) + RB_DLINK_FOREACH(uptr, chptr->members.head) { msptr = uptr->data; @@ -901,32 +897,32 @@ burst_TS6(struct Client *client_p) t = buf + mlen; } - ircsprintf(t, "%s%s ", find_channel_status(msptr, 1), + rb_sprintf(t, "%s%s ", find_channel_status(msptr, 1), use_id(msptr->client_p)); cur_len += tlen; t += tlen; } - if (dlink_list_length(&chptr->members) > 0) + if (rb_dlink_list_length(&chptr->members) > 0) { /* remove trailing space */ *(t-1) = '\0'; } sendto_one(client_p, "%s", buf); - if(dlink_list_length(&chptr->banlist) > 0) + if(rb_dlink_list_length(&chptr->banlist) > 0) burst_modes_TS6(client_p, chptr, &chptr->banlist, 'b'); if(IsCapable(client_p, CAP_EX) && - dlink_list_length(&chptr->exceptlist) > 0) + rb_dlink_list_length(&chptr->exceptlist) > 0) burst_modes_TS6(client_p, chptr, &chptr->exceptlist, 'e'); if(IsCapable(client_p, CAP_IE) && - dlink_list_length(&chptr->invexlist) > 0) + rb_dlink_list_length(&chptr->invexlist) > 0) burst_modes_TS6(client_p, chptr, &chptr->invexlist, 'I'); - if(dlink_list_length(&chptr->quietlist) > 0) + if(rb_dlink_list_length(&chptr->quietlist) > 0) burst_modes_TS6(client_p, chptr, &chptr->quietlist, 'q'); if(IsCapable(client_p, CAP_TB) && chptr->topic != NULL) @@ -960,7 +956,7 @@ show_capabilities(struct Client *target_p) int tl; t = msgbuf; - tl = ircsprintf(msgbuf, "TS "); + tl = rb_sprintf(msgbuf, "TS "); t += tl; if(!IsServer(target_p) || !target_p->serv->caps) /* short circuit if no caps */ @@ -973,7 +969,7 @@ show_capabilities(struct Client *target_p) { if(cap->cap & target_p->serv->caps) { - tl = ircsprintf(t, "%s ", cap->name); + tl = rb_sprintf(t, "%s ", cap->name); t += tl; } } @@ -998,12 +994,11 @@ server_estab(struct Client *client_p) struct server_conf *server_p; hook_data_client hdata; char *host; - dlink_node *ptr; + rb_dlink_node *ptr; s_assert(NULL != client_p); if(client_p == NULL) return -1; - ClearAccess(client_p); host = client_p->name; @@ -1021,7 +1016,7 @@ server_estab(struct Client *client_p) if(client_p->localClient->passwd) { memset(client_p->localClient->passwd, 0, strlen(client_p->localClient->passwd)); - MyFree(client_p->localClient->passwd); + rb_free(client_p->localClient->passwd); client_p->localClient->passwd = NULL; } @@ -1064,7 +1059,7 @@ server_estab(struct Client *client_p) (me.info[0]) ? (me.info) : "IRCers United"); } - if(!comm_set_buffers(client_p->localClient->fd, READBUF_SIZE)) + if(!rb_set_buffers(client_p->localClient->F->fd, READBUF_SIZE)) report_error(SETBUF_ERROR_MSG, get_server_name(client_p, SHOW_IP), log_client_name(client_p, SHOW_IP), errno); @@ -1096,10 +1091,10 @@ server_estab(struct Client *client_p) /* Update the capability combination usage counts */ set_chcap_usage_counts(client_p); - dlinkAdd(client_p, &client_p->lnode, &me.serv->servers); + rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers); del_unknown_ip(client_p); - dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list); - dlinkAddTailAlloc(client_p, &global_serv_list); + rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list); + rb_dlinkAddTailAlloc(client_p, &global_serv_list); if(has_id(client_p)) add_to_id_hash(client_p->id, client_p); @@ -1112,18 +1107,19 @@ server_estab(struct Client *client_p) if(client_p->localClient->fullcaps) { - DupString(client_p->serv->fullcaps, client_p->localClient->fullcaps); - MyFree(client_p->localClient->fullcaps); + client_p->serv->fullcaps = rb_strdup(client_p->localClient->fullcaps); + rb_free(client_p->localClient->fullcaps); client_p->localClient->fullcaps = NULL; } + client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p)); client_p->localClient->firsttime = CurrentTime; /* fixing eob timings.. -gnp */ - if((dlink_list_length(&lclient_list) + dlink_list_length(&serv_list)) > + if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) > (unsigned long)MaxConnectionCount) - MaxConnectionCount = dlink_list_length(&lclient_list) + - dlink_list_length(&serv_list); + MaxConnectionCount = rb_dlink_list_length(&lclient_list) + + rb_dlink_list_length(&serv_list); /* Show the real host/IP to admins */ sendto_realops_snomask(SNO_GENERAL, L_ALL, @@ -1143,18 +1139,18 @@ server_estab(struct Client *client_p) /* we won't overflow FD_DESC_SZ here, as it can hold * client_p->name + 64 */ - comm_note(client_p->localClient->fd, "slink data: %s", client_p->name); - comm_note(client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name); + rb_note(client_p->localClient->F->fd, "slink data: %s", client_p->name); + rb_note(client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name); } else - comm_note(client_p->localClient->fd, "Server: %s", client_p->name); + rb_note(client_p->localClient->F->fd, "Server: %s", client_p->name); /* ** Old sendto_serv_but_one() call removed because we now ** need to send different names to different servers ** (domain name matching) Send new server to other servers. */ - DLINK_FOREACH(ptr, serv_list.head) + RB_DLINK_FOREACH(ptr, serv_list.head) { target_p = ptr->data; @@ -1203,7 +1199,7 @@ server_estab(struct Client *client_p) ** see previous *WARNING*!!! (Also, original inpath ** is destroyed...) */ - DLINK_FOREACH(ptr, global_serv_list.head) + RB_DLINK_FOREACH(ptr, global_serv_list.head) { target_p = ptr->data; @@ -1251,7 +1247,7 @@ start_io(struct Client *server) int linecount = 0; int linelen; - iobuf = MyMalloc(256); /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */ + iobuf = rb_malloc(256); /* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */ if(IsCapable(server, CAP_ZIP)) { @@ -1364,16 +1360,16 @@ fork_server(struct Client *server) goto fork_error; else if(ret == 0) { - int maxconn = comm_get_maxconnections(); + int maxconn = rb_get_maxconnections(); /* set our fds as non blocking and close everything else */ for (i = 0; i < maxconn; i++) { - if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->fd)) + if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->F->fd)) { - comm_set_nb(i); + rb_set_nb(i); } else { @@ -1384,9 +1380,9 @@ fork_server(struct Client *server) } } - ircsnprintf(fd_str[0], sizeof(fd_str[0]), "%d", ctrl_fds[1]); - ircsnprintf(fd_str[1], sizeof(fd_str[1]), "%d", data_fds[1]); - ircsnprintf(fd_str[2], sizeof(fd_str[2]), "%d", server->localClient->fd); + rb_snprintf(fd_str[0], sizeof(fd_str[0]), "%d", ctrl_fds[1]); + rb_snprintf(fd_str[1], sizeof(fd_str[1]), "%d", data_fds[1]); + rb_snprintf(fd_str[2], sizeof(fd_str[2]), "%d", server->localClient->F->fd); kid_argv[0] = slink; kid_argv[1] = fd_str[0]; kid_argv[2] = fd_str[1]; @@ -1401,7 +1397,7 @@ fork_server(struct Client *server) } else { - comm_close(server->localClient->fd); + rb_close(server->localClient->F->fd); /* close the childs end of the pipes */ close(ctrl_fds[1]); @@ -1409,9 +1405,9 @@ fork_server(struct Client *server) s_assert(server->localClient); server->localClient->ctrlfd = ctrl_fds[0]; - server->localClient->fd = data_fds[0]; + server->localClient->F = rb_add_fd(data_fds[0]); - if(!comm_set_nb(server->localClient->fd)) + if(!rb_set_nb(server->localClient->F->fd)) { report_error(NONB_ERROR_MSG, get_server_name(server, SHOW_IP), @@ -1419,7 +1415,7 @@ fork_server(struct Client *server) errno); } - if(!comm_set_nb(server->localClient->ctrlfd)) + if(!rb_set_nb(server->localClient->ctrlfd)) { report_error(NONB_ERROR_MSG, get_server_name(server, SHOW_IP), @@ -1427,11 +1423,11 @@ fork_server(struct Client *server) errno); } - comm_open(server->localClient->ctrlfd, FD_SOCKET, NULL); - comm_open(server->localClient->fd, FD_SOCKET, NULL); + rb_open(server->localClient->ctrlfd, FD_SOCKET, NULL); + rb_open(server->localClient->F->fd, FD_SOCKET, NULL); read_ctrl_packet(server->localClient->ctrlfd, server); - read_packet(server->localClient->fd, server); + read_packet(server->localClient->F->fd, server); } return 0; @@ -1463,7 +1459,7 @@ fork_server(struct Client *server) * This code initiates a connection to a server. It first checks to make * sure the given server exists. If this is the case, it creates a socket, * creates a client, saves the socket information in the client, and - * initiates a connection to the server through comm_connect_tcp(). The + * initiates a connection to the server through rb_connect_tcp(). The * completion of this goes through serv_completed_connection(). * * We return 1 if the connection is attempted, since we don't know whether @@ -1475,6 +1471,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) struct Client *client_p; struct irc_sockaddr_storage myipnum; int fd; + char vhoststr[HOSTIPLEN]; s_assert(server_p != NULL); if(server_p == NULL) @@ -1495,7 +1492,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) } /* create a socket for the server connection */ - if((fd = comm_socket(server_p->aftype, SOCK_STREAM, 0, NULL)) < 0) + if((fd = rb_socket(server_p->aftype, SOCK_STREAM, 0, NULL)) < 0) { /* Eek, failure to create the socket */ report_error("opening stream socket to %s: %s", @@ -1504,7 +1501,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) } /* servernames are always guaranteed under HOSTLEN chars */ - comm_note(fd, "Server: %s", server_p->name); + rb_note(fd, "Server: %s", server_p->name); /* Create a local client */ client_p = make_client(NULL); @@ -1516,7 +1513,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) 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)); - client_p->localClient->fd = fd; + client_p->localClient->F = rb_add_fd(fd); /* * Set up the initial server evilness, ripped straight from @@ -1524,7 +1521,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) * -- adrian */ - if(!comm_set_buffers(client_p->localClient->fd, READBUF_SIZE)) + if(!rb_set_buffers(client_p->localClient->F->fd, READBUF_SIZE)) { report_error(SETBUF_ERROR_MSG, get_server_name(client_p, SHOW_IP), @@ -1562,14 +1559,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) client_p->serv->user = NULL; } SetConnecting(client_p); - dlinkAddTail(client_p, &client_p->node, &global_client_list); - - /* log */ - ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port, -#ifdef IPV6 - server_p->aftype == AF_INET6 ? "IPv6" : -#endif - (server_p->aftype == AF_INET ? "IPv4" : "?")); + rb_dlinkAddTail(client_p, &client_p->node, &global_client_list); if(ServerConfVhosted(server_p)) { @@ -1597,14 +1587,30 @@ serv_connect(struct server_conf *server_p, struct Client *by) #endif else { - comm_connect_tcp(client_p->localClient->fd, server_p->host, + /* log */ + ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port, +#ifdef IPV6 + server_p->aftype == AF_INET6 ? "IPv6" : +#endif + (server_p->aftype == AF_INET ? "IPv4" : "?")); + + rb_connect_tcp(client_p->localClient->F->fd, server_p->host, server_p->port, NULL, 0, serv_connect_callback, client_p, server_p->aftype, ConfigFileEntry.connect_timeout); return 1; } - comm_connect_tcp(client_p->localClient->fd, server_p->host, + /* log */ + inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr); + ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", server_p->name, server_p->host, server_p->port, +#ifdef IPV6 + server_p->aftype == AF_INET6 ? "IPv6" : +#endif + (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr); + + + rb_connect_tcp(client_p->localClient->F->fd, server_p->host, server_p->port, (struct sockaddr *) &myipnum, GET_SS_LEN(myipnum), serv_connect_callback, client_p, myipnum.ss_family, ConfigFileEntry.connect_timeout); @@ -1627,11 +1633,11 @@ serv_connect_callback(int fd, int status, void *data) struct Client *client_p = data; struct server_conf *server_p; char *errstr; - fde_t *F = comm_locate_fd(fd); + fde_t *F = rb_locate_fd(fd); /* First, make sure its a real client! */ s_assert(client_p != NULL); - s_assert(client_p->localClient->fd == fd); + s_assert(client_p->localClient->F->fd == fd); if(client_p == NULL) return; @@ -1667,14 +1673,14 @@ serv_connect_callback(int fd, int status, void *data) #else client_p->host, #endif - comm_errstr(status)); + rb_errstr(status)); ilog(L_SERVER, "Error connecting to %s[%s]: %s", client_p->name, client_p->sockhost, - comm_errstr(status)); + rb_errstr(status)); } else { - errstr = strerror(comm_get_sockerr(fd)); + errstr = strerror(rb_get_sockerr(fd)); sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Error connecting to %s[%s]: %s (%s)", client_p->name, @@ -1683,13 +1689,13 @@ serv_connect_callback(int fd, int status, void *data) #else client_p->host, #endif - comm_errstr(status), errstr); + rb_errstr(status), errstr); ilog(L_SERVER, "Error connecting to %s[%s]: %s (%s)", client_p->name, client_p->sockhost, - comm_errstr(status), errstr); + rb_errstr(status), errstr); } - exit_client(client_p, client_p, &me, comm_errstr(status)); + exit_client(client_p, client_p, &me, rb_errstr(status)); return; }