From b3ebc7ab9e187cbbe55b0085930d41bf4fe740c0 Mon Sep 17 00:00:00 2001 From: Valery V Yatsko Date: Sat, 28 Jun 2008 14:13:50 +0400 Subject: [PATCH] Applied svn diff from ratbox3 r21458:21470 --- include/client.h | 1 - include/config.h | 7 ----- include/config.h.dist | 7 ----- modules/core/m_error.c | 8 +++--- modules/core/m_server.c | 38 +++++++++++++-------------- modules/m_connect.c | 6 ----- modules/m_stats.c | 8 ++---- modules/m_svinfo.c | 4 +-- modules/m_trace.c | 37 ++++++++++++++------------ src/client.c | 57 +++-------------------------------------- src/parse.c | 6 ++--- src/s_serv.c | 26 +++++-------------- src/send.c | 2 +- 13 files changed, 61 insertions(+), 146 deletions(-) diff --git a/include/client.h b/include/client.h index aad68a6d0..9c6203000 100644 --- a/include/client.h +++ b/include/client.h @@ -569,7 +569,6 @@ extern void check_dlines(void); extern void check_xlines(void); extern const char *get_client_name(struct Client *client, int show_ip); -extern const char *get_server_name(struct Client *client, int show_ip); extern const char *log_client_name(struct Client *, int); extern int is_remote_connect(struct Client *); extern void init_client(void); diff --git a/include/config.h b/include/config.h index 0470d2ea6..daa8652a6 100644 --- a/include/config.h +++ b/include/config.h @@ -81,13 +81,6 @@ */ #undef IGNORE_BOGUS_TS -/* HIDE_SERVERS_IPS - * - * If this is undefined, anyone can see a servers ip. If it is defined, - * noone can. - */ -#define HIDE_SERVERS_IPS - /* HANGONGOODLINK and HANGONRETRYDELAY * Often net breaks for a short time and it's useful to try to * establishing the same connection again faster than CONNECTFREQUENCY diff --git a/include/config.h.dist b/include/config.h.dist index 0470d2ea6..daa8652a6 100644 --- a/include/config.h.dist +++ b/include/config.h.dist @@ -81,13 +81,6 @@ */ #undef IGNORE_BOGUS_TS -/* HIDE_SERVERS_IPS - * - * If this is undefined, anyone can see a servers ip. If it is defined, - * noone can. - */ -#define HIDE_SERVERS_IPS - /* HANGONGOODLINK and HANGONRETRYDELAY * Often net breaks for a short time and it's useful to try to * establishing the same connection again faster than CONNECTFREQUENCY diff --git a/modules/core/m_error.c b/modules/core/m_error.c index 0c194b140..9659f11b2 100644 --- a/modules/core/m_error.c +++ b/modules/core/m_error.c @@ -106,11 +106,11 @@ m_error(struct Client *client_p, struct Client *source_p, int parc, const char * if (hideit < 2) sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : (is_remote_connect(client_p) ? L_NETWIDE : L_ALL), "ERROR :from %s -- %s", - get_server_name(client_p, HIDE_IP), para); + client_p->name, para); if (hideit > 0) sendto_realops_snomask(SNO_GENERAL, (hideit == 1 ? L_OPER : L_ALL) | (is_remote_connect(client_p) ? L_NETWIDE : L_ALL), "ERROR :from %s -- ", - get_server_name(client_p, HIDE_IP)); + client_p->name); } exit_client(client_p, source_p, source_p, "ERROR"); @@ -137,12 +137,12 @@ ms_error(struct Client *client_p, struct Client *source_p, int parc, const char if(client_p == source_p) { sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s -- %s", - get_server_name(client_p, HIDE_IP), para); + client_p->name, para); } else { sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s via %s -- %s", - source_p->name, get_server_name(client_p, HIDE_IP), para); + source_p->name, client_p->name, para); } return 0; diff --git a/modules/core/m_server.c b/modules/core/m_server.c index e79d5ee1f..95926f10c 100644 --- a/modules/core/m_server.c +++ b/modules/core/m_server.c @@ -85,7 +85,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Server %s has unexpected name %s", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Server %s has unexpected name %s", log_client_name(client_p, SHOW_IP), name); exit_client(client_p, client_p, client_p, "Server name mismatch"); @@ -98,7 +98,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char if(!DoesTS(client_p)) { sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server", - get_server_name(client_p, HIDE_IP)); + client_p->name); exit_client(client_p, client_p, client_p, "Non-TS server"); return 0; } @@ -119,7 +119,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char sendto_realops_snomask(SNO_GENERAL, L_ALL, "Unauthorised server connection attempt from %s: " "No entry for servername %s", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Access denied, no connect block for server %s%s", EmptyString(client_p->name) ? name : "", @@ -135,7 +135,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Unauthorised server connection attempt from %s: " "Bad password for server %s", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Access denied, invalid password for server %s%s", EmptyString(client_p->name) ? name : "", @@ -150,7 +150,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char sendto_realops_snomask(SNO_GENERAL, L_ALL, "Unauthorised server connection attempt from %s: " "Invalid host for server %s", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Access denied, invalid host for server %s%s", EmptyString(client_p->name) ? name : "", @@ -165,7 +165,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char case -4: sendto_realops_snomask(SNO_GENERAL, L_ALL, "Invalid servername %s from %s", - name, get_server_name(client_p, HIDE_IP)); + name, client_p->name); ilog(L_SERVER, "Access denied, invalid servername from %s", log_client_name(client_p, SHOW_IP)); @@ -208,7 +208,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char */ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Attempt to re-introduce server %s from %s", - name, get_server_name(client_p, HIDE_IP)); + name, client_p->name); ilog(L_SERVER, "Attempt to re-introduce server %s from %s", name, log_client_name(client_p, SHOW_IP)); @@ -223,7 +223,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char "Attempt to re-introduce SID %s from %s%s", client_p->id, EmptyString(client_p->name) ? name : "", - get_server_name(client_p, HIDE_IP)); + client_p->name); ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s", client_p->id, EmptyString(client_p->name) ? name : "", @@ -302,7 +302,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s cancelled, server %s already exists", - get_server_name(client_p, SHOW_IP), name); + client_p->name, name); ilog(L_SERVER, "Link %s cancelled, server %s already exists", client_p->name, name); @@ -324,7 +324,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char sendto_one(client_p, "ERROR :Nickname %s already exists!", name); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s cancelled: Server/nick collision on %s", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Link %s cancelled: Server/nick collision on %s", client_p->name, name); @@ -390,7 +390,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char { /* OOOPs nope can't HUB */ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Non-Hub link %s introduced %s.", client_p->name, name); @@ -404,7 +404,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char /* OOOPs nope can't HUB this leaf */ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s introduced leafed server %s.", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Link %s introduced leafed server %s.", client_p->name, name); @@ -418,7 +418,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char { sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s introduced server with invalid servername %s", - get_server_name(client_p, HIDE_IP), name); + client_p->name, name); ilog(L_SERVER, "Link %s introduced server with invalid servername %s", client_p->name, name); @@ -482,7 +482,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(client_p, "ERROR :Server %s already exists", parv[1]); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s cancelled, server %s already exists", - get_server_name(client_p, SHOW_IP), parv[1]); + client_p->name, parv[1]); ilog(L_SERVER, "Link %s cancelled, server %s already exists", client_p->name, parv[1]); @@ -496,7 +496,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(client_p, "ERROR :SID %s already exists", parv[3]); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s cancelled, SID %s already exists", - get_server_name(client_p, SHOW_IP), parv[3]); + client_p->name, parv[3]); ilog(L_SERVER, "Link %s cancelled, SID %s already exists", client_p->name, parv[3]); @@ -509,7 +509,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(client_p, "ERROR :Invalid servername"); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s cancelled, servername %s invalid", - get_server_name(client_p, SHOW_IP), parv[1]); + client_p->name, parv[1]); ilog(L_SERVER, "Link %s cancelled, servername %s invalid", client_p->name, parv[1]); @@ -523,7 +523,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(client_p, "ERROR :Invalid SID"); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s cancelled, SID %s invalid", - get_server_name(client_p, SHOW_IP), parv[3]); + client_p->name, parv[3]); ilog(L_SERVER, "Link %s cancelled, SID %s invalid", client_p->name, parv[3]); @@ -554,7 +554,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(client_p, "ERROR :No matching hub_mask"); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.", - get_server_name(client_p, SHOW_IP), parv[1]); + client_p->name, parv[1]); ilog(L_SERVER, "Non-Hub link %s introduced %s.", client_p->name, parv[1]); exit_client(NULL, client_p, &me, "No matching hub_mask."); @@ -567,7 +567,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(client_p, "ERROR :Matching leaf_mask"); sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s introduced leafed server %s.", - get_server_name(client_p, SHOW_IP), parv[1]); + client_p->name, parv[1]); ilog(L_SERVER, "Link %s introduced leafed server %s.", client_p->name, parv[1]); exit_client(NULL, client_p, &me, "Leafed Server."); diff --git a/modules/m_connect.c b/modules/m_connect.c index 3b8e4d593..d1b77a820 100644 --- a/modules/m_connect.c +++ b/modules/m_connect.c @@ -138,14 +138,8 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha */ if(serv_connect(server_p, source_p)) { -#ifndef HIDE_SERVERS_IPS - sendto_one_notice(source_p, ":*** Connecting to %s[%s].%d", - server_p->host, server_p->name, server_p->port); -#else sendto_one_notice(source_p, ":*** Connecting to %s.%d", server_p->name, server_p->port); -#endif - } else { diff --git a/modules/m_stats.c b/modules/m_stats.c index e63c0de66..92fc3f24c 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -318,11 +318,7 @@ stats_connect(struct Client *source_p) sendto_one_numeric(source_p, RPL_STATSCLINE, form_str(RPL_STATSCLINE), -#ifndef HIDE_SERVERS_IPS - server_p->host, -#else "*@127.0.0.1", -#endif buf, server_p->name, server_p->port, server_p->class_name); } @@ -1396,7 +1392,7 @@ stats_servlinks (struct Client *source_p) sendto_one(source_p, Sformat, get_id(&me, source_p), RPL_STATSLINKINFO, get_id(source_p, source_p), - get_server_name(target_p, SHOW_IP), + target_p->name, (int) rb_linebuf_len (&target_p->localClient->buf_sendq), (int) target_p->localClient->sendM, (int) target_p->localClient->sendK, @@ -1550,7 +1546,7 @@ stats_l_client(struct Client *source_p, struct Client *target_p, if(IsAnyServer(target_p)) { sendto_one_numeric(source_p, RPL_STATSLINKINFO, Lformat, - get_server_name(target_p, SHOW_IP), + target_p->name, (int) rb_linebuf_len(&target_p->localClient->buf_sendq), (int) target_p->localClient->sendM, (int) target_p->localClient->sendK, diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c index 6f7f32677..740f8d7df 100644 --- a/modules/m_svinfo.c +++ b/modules/m_svinfo.c @@ -70,7 +70,7 @@ ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char /* TS version is too low on one of the sides, drop the link */ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, wrong TS protocol version (%s,%s)", - get_server_name(source_p, SHOW_IP), parv[1], parv[2]); + source_p->name, parv[1], parv[2]); snprintf(squitreason, sizeof squitreason, "Incompatible TS version (%s,%s)", parv[1], parv[2]); exit_client(source_p, source_p, source_p, squitreason); @@ -89,7 +89,7 @@ ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, excessive TS delta" " (my TS=%ld, their TS=%ld, delta=%d)", - get_server_name(source_p, SHOW_IP), + source_p->name, (long) rb_current_time(), (long) theirtime, deltat); ilog(L_SERVER, "Link %s dropped, excessive TS delta" diff --git a/modules/m_trace.c b/modules/m_trace.c index a7bede442..e173d2116 100644 --- a/modules/m_trace.c +++ b/modules/m_trace.c @@ -345,7 +345,7 @@ report_this_status(struct Client *source_p, struct Client *target_p) class_name = get_client_class(target_p); if(IsAnyServer(target_p)) - name = get_server_name(target_p, HIDE_IP); + name = target_p->name; else name = get_client_name(target_p, HIDE_IP); @@ -378,23 +378,26 @@ report_this_status(struct Client *source_p, struct Client *target_p) break; case STAT_CLIENT: - if(IsOper(target_p)) - sendto_one_numeric(source_p, RPL_TRACEOPERATOR, - form_str(RPL_TRACEOPERATOR), - class_name, name, - show_ip(source_p, target_p) ? ip : "255.255.255.255", - rb_current_time() - target_p->localClient->lasttime, - rb_current_time() - target_p->localClient->last); + /* Only opers see users if there is a wildcard + * but anyone can see all the opers. + */ + if((IsOper(source_p) && + (MyClient(source_p) || !(dow && IsInvisible(target_p)))) + || !dow || IsOper(target_p) || (source_p == target_p)) + { + int tnumeric = RPL_TRACEUSER; + if(IsOper(target_p)) + tnumeric = RPL_TRACEOPERATOR; + + sendto_one_numeric(source_p, tnumeric, form_str(tnumeric), + class_name, name, + show_ip(source_p, target_p) ? ip : empty_sockhost, + rb_current_time() - target_p->localClient->lasttime, + rb_current_time() - target_p->localClient->last); + cnt++; + } + break; - else - sendto_one_numeric(source_p, RPL_TRACEUSER, - form_str(RPL_TRACEUSER), - class_name, name, - show_ip(source_p, target_p) ? ip : "255.255.255.255", - rb_current_time() - target_p->localClient->lasttime, - rb_current_time() - target_p->localClient->last); - cnt++; - break; case STAT_SERVER: { diff --git a/src/client.c b/src/client.c index dd3ae34d0..a1fd820f5 100644 --- a/src/client.c +++ b/src/client.c @@ -323,7 +323,7 @@ check_pings_list(rb_dlink_list * list) { sendto_realops_snomask(SNO_GENERAL, L_ALL, "No response from %s, closing link", - get_server_name(client_p, HIDE_IP)); + client_p->name); ilog(L_SERVER, "No response from %s, closing link", log_client_name(client_p, HIDE_IP)); @@ -391,7 +391,7 @@ check_unknowns_list(rb_dlink_list * list) { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "No response from %s, closing link", - get_server_name(client_p, HIDE_IP)); + client_p->name); ilog(L_SERVER, "No response from %s, closing link", log_client_name(client_p, HIDE_IP)); @@ -850,10 +850,8 @@ get_client_name(struct Client *client, int showip) if(ConfigFileEntry.hide_spoof_ips && showip == SHOW_IP && IsIPSpoof(client)) showip = MASK_IP; -#ifdef HIDE_SERVERS_IPS if(IsAnyServer(client)) showip = MASK_IP; -#endif /* And finally, let's get the host information, ip or name */ switch (showip) @@ -879,49 +877,6 @@ get_client_name(struct Client *client, int showip) */ return client->name; } - -const char * -get_server_name(struct Client *target_p, int showip) -{ - static char nbuf[HOSTLEN * 2 + USERLEN + 5]; - - if(target_p == NULL) - return NULL; - - if(!MyConnect(target_p) || !irccmp(target_p->name, target_p->host)) - return target_p->name; - -#ifdef HIDE_SERVERS_IPS - if(EmptyString(target_p->name)) - { - rb_snprintf(nbuf, sizeof(nbuf), "[%s@255.255.255.255]", - target_p->username); - return nbuf; - } - else - return target_p->name; -#endif - - switch (showip) - { - case SHOW_IP: - rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", - target_p->name, target_p->username, - target_p->sockhost); - break; - - case MASK_IP: - rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]", - target_p->name, target_p->username); - - default: - rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", - target_p->name, target_p->username, - target_p->host); - } - - return nbuf; -} /* log_client_name() * @@ -1200,7 +1155,7 @@ exit_aborted_clients(void *unused) if(IsAnyServer(abt->client)) sendto_realops_snomask(SNO_GENERAL, L_ALL, "Closing link to %s: %s", - get_server_name(abt->client, HIDE_IP), abt->notice); + abt->client->name, abt->notice); /* its no longer on abort list - we *must* remove * FLAGS_CLOSING otherwise exit_client() will not run --fl @@ -1722,10 +1677,6 @@ show_ip(struct Client *source_p, struct Client *target_p) { if(IsAnyServer(target_p)) { -#ifndef HIDE_SERVERS_IPS - if(source_p == NULL || IsOper(source_p)) - return 1; -#endif return 0; } else if(IsIPSpoof(target_p)) @@ -2013,7 +1964,7 @@ error_exit_client(struct Client *client_p, int error) { sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL, "Server %s closed the connection", - get_server_name(client_p, SHOW_IP)); + client_p->name); ilog(L_SERVER, "Server %s closed the connection", log_client_name(client_p, SHOW_IP)); diff --git a/src/parse.c b/src/parse.c index 79c037e5b..40dbc5499 100644 --- a/src/parse.c +++ b/src/parse.c @@ -508,7 +508,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd) sendto_realops_snomask(SNO_DEBUG, L_ALL, "Message for %s[%s] from %s", source_p->name, source_p->from->name, - get_server_name(client_p, SHOW_IP)); + client_p->name); } else { @@ -518,7 +518,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd) source_p->username, source_p->host, source_p->from->name, - get_server_name(client_p, SHOW_IP)); + client_p->name); } } @@ -543,7 +543,7 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer) { sendto_realops_snomask(SNO_DEBUG, L_ALL, "Unknown prefix (%s) from %s, Squitting %s", - lbuffer, get_server_name(client_p, SHOW_IP), lsender); + lbuffer, client_p->name, lsender); sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)", diff --git a/src/s_serv.c b/src/s_serv.c index 5241afc74..be25f8b74 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -297,15 +297,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); } @@ -800,7 +794,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", @@ -924,7 +918,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; } @@ -1017,7 +1011,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"); @@ -1078,10 +1072,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; } @@ -1258,11 +1252,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, @@ -1274,11 +1264,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, @@ -1294,7 +1280,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; } diff --git a/src/send.c b/src/send.c index dbb4a7f2b..c0d029d02 100644 --- a/src/send.c +++ b/src/send.c @@ -73,7 +73,7 @@ _send_linebuf(struct Client *to, buf_head_t *linebuf) { sendto_realops_snomask(SNO_GENERAL, L_ALL, "Max SendQ limit exceeded for %s: %u > %lu", - get_server_name(to, HIDE_IP), + to->name, rb_linebuf_len(&to->localClient->buf_sendq), get_sendq(to));