From a92275551218402bf4969a7fe613cab27416c4ef Mon Sep 17 00:00:00 2001 From: jess Date: Sun, 8 Nov 2020 19:30:41 +0000 Subject: [PATCH] make more snotes L_NETWIDE --- extensions/filter.c | 10 ++++---- extensions/hurt.c | 2 +- extensions/sasl_usercloak.c | 2 +- ircd/authproc.c | 6 ++--- ircd/bandbi.c | 6 ++--- ircd/chmode.c | 2 +- ircd/client.c | 18 +++++++-------- ircd/hash.c | 2 +- ircd/ircd.c | 2 +- ircd/listener.c | 8 +++---- ircd/modules.c | 24 +++++++++---------- ircd/newconf.c | 4 ++-- ircd/parse.c | 8 +++---- ircd/restart.c | 2 +- ircd/s_conf.c | 10 ++++---- ircd/s_newconf.c | 4 ++-- ircd/s_serv.c | 18 +++++++-------- ircd/s_user.c | 14 +++++------ ircd/send.c | 2 +- ircd/sslproc.c | 20 ++++++++-------- ircd/wsproc.c | 8 +++---- modules/core/m_error.c | 8 +++---- modules/core/m_message.c | 2 +- modules/core/m_nick.c | 32 +++++++++++++------------- modules/core/m_server.c | 46 ++++++++++++++++++------------------- modules/core/m_squit.c | 9 ++------ modules/m_challenge.c | 6 ++--- modules/m_chghost.c | 2 +- modules/m_dline.c | 12 +++++----- modules/m_kline.c | 12 ++++++++++ modules/m_resv.c | 7 ++++++ modules/m_set.c | 28 +++++++++++----------- modules/m_signon.c | 14 +++++------ modules/m_svinfo.c | 4 ++-- modules/m_xline.c | 10 ++++++++ 35 files changed, 194 insertions(+), 170 deletions(-) diff --git a/extensions/filter.c b/extensions/filter.c index 882ff535..02d75ab3 100644 --- a/extensions/filter.c +++ b/extensions/filter.c @@ -141,13 +141,13 @@ setfilter(const char *check, const char *data, const char **error) if (!strcasecmp(data, "disable")) { filter_enable = 0; - sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Filtering disabled."); return 0; } if (!strcasecmp(data, "enable")) { filter_enable = 1; - sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Filtering enabled."); return 0; } @@ -217,7 +217,7 @@ setfilter(const char *check, const char *data, const char **error) } state = FILTER_LOADED; filter_db = db; - sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "New filters loaded."); rb_free(filter_data); filter_data = 0; @@ -408,7 +408,7 @@ filter_msg_user(void *data_) data->approved = 1; } if (r & ACT_ALARM) { - sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "FILTER: %s!%s@%s [%s]", s->name, s->username, s->host, s->sockhost); } @@ -449,7 +449,7 @@ filter_msg_channel(void *data_) data->approved = 1; } if (r & ACT_ALARM) { - sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "FILTER: %s!%s@%s [%s]", s->name, s->username, s->host, s->sockhost); } diff --git a/extensions/hurt.c b/extensions/hurt.c index c04c09c8..25eafef1 100644 --- a/extensions/hurt.c +++ b/extensions/hurt.c @@ -615,7 +615,7 @@ heal_nick(struct Client *source_p, struct Client *target_p) { if (rb_dlinkFindDestroy(target_p, &hurt_state.hurt_clients)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s used HEAL on %s", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s used HEAL on %s", get_oper_name(source_p), get_client_name(target_p, HIDE_IP)); sendto_one_notice(target_p, ":HURT restriction temporarily removed by operator"); sendto_one_notice(source_p, ":HURT restriction on %s temporarily removed", target_p->name); diff --git a/extensions/sasl_usercloak.c b/extensions/sasl_usercloak.c index c70b0812..70001b7f 100644 --- a/extensions/sasl_usercloak.c +++ b/extensions/sasl_usercloak.c @@ -125,7 +125,7 @@ check_new_user(void *vdata) return; } - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "KLINE active for %s", get_client_name(source_p, HIDE_IP)); diff --git a/ircd/authproc.c b/ircd/authproc.c index 2cb21648..4d2b98e3 100644 --- a/ircd/authproc.c +++ b/ircd/authproc.c @@ -105,7 +105,7 @@ start_authd(void) { ierror("Unable to execute authd in %s or %s/bin", ircd_paths[IRCD_PATH_LIBEXEC], ConfigFileEntry.dpath); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unable to execute authd in %s or %s/bin", ircd_paths[IRCD_PATH_LIBEXEC], ConfigFileEntry.dpath); return 1; @@ -127,12 +127,12 @@ start_authd(void) if(authd_helper == NULL) { ierror("Unable to start authd helper: %s", strerror(errno)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Unable to start authd helper: %s", strerror(errno)); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unable to start authd helper: %s", strerror(errno)); return 1; } ilog(L_MAIN, "authd helper started"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd helper started"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "authd helper started"); rb_helper_run(authd_helper); return 0; } diff --git a/ircd/bandbi.c b/ircd/bandbi.c index 2b17e5d6..29a3bfa2 100644 --- a/ircd/bandbi.c +++ b/ircd/bandbi.c @@ -110,7 +110,7 @@ start_bandb(void) if(bandb_helper == NULL) { ilog(L_MAIN, "Unable to start bandb: %s", strerror(errno)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Unable to start bandb: %s", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unable to start bandb: %s", strerror(errno)); return 1; } @@ -390,7 +390,7 @@ bandb_handle_failure(rb_helper *helper, char **parv, int parc) fprintf(stderr, "bandb - bandb failure: %s\n", parv[1]); ilog(L_MAIN, "bandb - bandb failure: %s", parv[1]); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "bandb - bandb failure: %s", parv[1]); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "bandb - bandb failure: %s", parv[1]); exit(1); } @@ -441,7 +441,7 @@ static void bandb_restart_cb(rb_helper *helper) { ilog(L_MAIN, "bandb - bandb_restart_cb called, bandb helper died?"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "bandb - bandb_restart_cb called, bandb helper died?"); if(helper != NULL) { diff --git a/ircd/chmode.c b/ircd/chmode.c index 78f9f55a..ae3268eb 100644 --- a/ircd/chmode.c +++ b/ircd/chmode.c @@ -797,7 +797,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr, break; default: - sendto_realops_snomask(SNO_GENERAL, L_ALL, "chm_ban() called with unknown type!"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "chm_ban() called with unknown type!"); return; } diff --git a/ircd/client.c b/ircd/client.c index a1187399..dd01d744 100644 --- a/ircd/client.c +++ b/ircd/client.c @@ -399,7 +399,7 @@ check_pings_list(rb_dlink_list * list) { if(IsServer(client_p)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "No response from %s, closing link", client_p->name); ilog(L_SERVER, @@ -466,7 +466,7 @@ check_unknowns_list(rb_dlink_list * list) { if(IsAnyServer(client_p)) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "No response from %s, closing link", client_p->name); ilog(L_SERVER, @@ -548,7 +548,7 @@ check_klines(void) { if(IsExemptKline(client_p)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "KLINE over-ruled for %s, client is kline_exempt [%s@%s]", get_client_name(client_p, HIDE_IP), aconf->user, aconf->host); @@ -722,7 +722,7 @@ check_xlines(void) { if(IsExemptKline(client_p)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "XLINE over-ruled for %s, client is kline_exempt [%s]", get_client_name(client_p, HIDE_IP), aconf->host); @@ -772,11 +772,11 @@ resv_nick_fnc(const char *mask, const char *reason, int temp_time) nick = client_p->id; /* Tell opers. */ - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "RESV forced nick change for %s!%s@%s to %s; nick matched [%s] (%s)", client_p->name, client_p->username, client_p->host, nick, mask, reason); - sendto_realops_snomask(SNO_NCHANGE, L_ALL, + sendto_realops_snomask(SNO_NCHANGE, L_NETWIDE, "Nick change: From %s to %s [%s@%s]", client_p->name, nick, client_p->username, client_p->host); @@ -1301,7 +1301,7 @@ exit_aborted_clients(void *unused) rb_dlinkDelete(ptr, &abort_list); if(IsAnyServer(abt->client)) - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Closing link to %s: %s", abt->client->name, abt->notice); @@ -2135,7 +2135,7 @@ error_exit_client(struct Client *client_p, int error) { if(error == 0) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Server %s closed the connection", client_p->name); @@ -2144,7 +2144,7 @@ error_exit_client(struct Client *client_p, int error) } else { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Lost connection to %s: %s", client_p->name, strerror(current_error)); ilog(L_SERVER, "Lost connection to %s: %s", diff --git a/ircd/hash.c b/ircd/hash.c index cd8e8aa8..9601f244 100644 --- a/ircd/hash.c +++ b/ircd/hash.c @@ -420,7 +420,7 @@ get_or_create_channel(struct Client *client_p, const char *chname, bool *isnew) char *t; if(IsServer(client_p)) { - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "*** Long channel name from %s (%d > %d): %s", client_p->name, len, CHANNELLEN, s); } diff --git a/ircd/ircd.c b/ircd/ircd.c index 935aa4e9..6c6c45d6 100644 --- a/ircd/ircd.c +++ b/ircd/ircd.c @@ -296,7 +296,7 @@ check_rehash(void *unused) if(doremotd) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Got signal SIGUSR1, reloading ircd motd file"); cache_user_motd(); doremotd = false; diff --git a/ircd/listener.c b/ircd/listener.c index f7466295..bc114960 100644 --- a/ircd/listener.c +++ b/ircd/listener.c @@ -185,7 +185,7 @@ inetport(struct Listener *listener) } if (F == NULL) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Cannot open socket for listener on %s port %d", listener->sctp ? "SCTP" : "TCP", get_listener_port(listener)); @@ -203,7 +203,7 @@ inetport(struct Listener *listener) if (ret) { errstr = strerror(rb_get_sockerr(F)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Cannot bind for listener on %s port %d: %s", listener->sctp ? "SCTP" : "TCP", get_listener_port(listener), errstr); @@ -217,7 +217,7 @@ inetport(struct Listener *listener) if(rb_listen(F, SOMAXCONN, listener->defer_accept)) { errstr = strerror(rb_get_sockerr(F)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Cannot listen() for listener on %s port %d: %s", listener->sctp ? "SCTP" : "TCP", get_listener_port(listener), errstr); @@ -609,7 +609,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi */ if((last_oper_notice + 20) <= rb_current_time()) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "All connections in use. (%s)", get_listener_name(listener)); last_oper_notice = rb_current_time(); diff --git a/ircd/modules.c b/ircd/modules.c index e4dc728b..4014d01a 100644 --- a/ircd/modules.c +++ b/ircd/modules.c @@ -297,7 +297,7 @@ load_one_module(const char *path, int origin, bool coremodule) } } - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Cannot locate module %s", path); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Cannot locate module %s", path); if (server_state_foreground) ierror("cannot locate module %s", path); @@ -401,7 +401,7 @@ unload_one_module(const char *name, bool warn) idx = serv_capindex; break; default: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unknown/unsupported CAP index found of type %d on capability %s when unloading %s", m->cap_index, m->cap_name, mod->name); ilog(L_MAIN, @@ -416,7 +416,7 @@ unload_one_module(const char *name, bool warn) break; } default: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unknown/unsupported MAPI version %d when unloading %s!", mod->mapi_version, mod->name); ilog(L_MAIN, "Unknown/unsupported MAPI version %d when unloading %s!", @@ -434,7 +434,7 @@ unload_one_module(const char *name, bool warn) if(warn) { ilog(L_MAIN, "Module %s unloaded", name); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Module %s unloaded", name); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Module %s unloaded", name); } return true; @@ -469,7 +469,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) { const char *err = lt_dlerror(); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Error loading module %s: %s", mod_displayname, err); ilog(L_MAIN, "Error loading module %s: %s", mod_displayname, err); rb_free(mod_displayname); @@ -487,7 +487,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) && (mapi_version = (int *) (uintptr_t) lt_dlsym(tmpptr, "__mheader")) == NULL) || MAPI_MAGIC(*mapi_version) != MAPI_MAGIC_HDR) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Data format error: module %s has no MAPI header.", mod_displayname); ilog(L_MAIN, "Data format error: module %s has no MAPI header.", mod_displayname); @@ -505,7 +505,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) { ilog(L_MAIN, "Module %s indicated failure during load.", mod_displayname); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Module %s indicated failure during load.", mod_displayname); lt_dlclose(tmpptr); @@ -557,7 +557,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) idx = serv_capindex; break; default: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unknown/unsupported CAP index found of type %d on capability %s when loading %s", m->cap_index, m->cap_name, mod_displayname); ilog(L_MAIN, @@ -577,7 +577,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) { ilog(L_MAIN, "Module %s indicated failure during load.", mod_displayname); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Module %s indicated failure during load.", mod_displayname); if(mheader->mapi_cap_list) @@ -619,7 +619,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) delta /= 86400; iwarn("Module %s build date is out of sync with ircd build date by %ld days, expect problems", mod_displayname, delta); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Module %s build date is out of sync with ircd build date by %ld days, expect problems", mod_displayname, delta); } @@ -660,7 +660,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) default: ilog(L_MAIN, "Module %s has unknown/unsupported MAPI version %d.", mod_displayname, MAPI_VERSION(*mapi_version)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Module %s has unknown/unsupported MAPI version %d.", mod_displayname, *mapi_version); lt_dlclose(tmpptr); @@ -703,7 +703,7 @@ load_a_module(const char *path, bool warn, int origin, bool core) break; } - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Module %s [version: %s; MAPI version: %d; origin: %s; description: \"%s\"] loaded at %p", mod_displayname, ver, MAPI_VERSION(*mapi_version), o, description, (void *) tmpptr); diff --git a/ircd/newconf.c b/ircd/newconf.c index d6ae2eb2..ee54fc78 100644 --- a/ircd/newconf.c +++ b/ircd/newconf.c @@ -2313,7 +2313,7 @@ conf_report_error(const char *fmt, ...) } ierror("\"%s\", line %d: %s", current_file, lineno + 1, msg); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "error: \"%s\", line %d: %s", current_file, lineno + 1, msg); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "error: \"%s\", line %d: %s", current_file, lineno + 1, msg); } void @@ -2333,7 +2333,7 @@ conf_report_warning(const char *fmt, ...) } iwarn("\"%s\", line %d: %s", current_file, lineno + 1, msg); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "warning: \"%s\", line %d: %s", current_file, lineno + 1, msg); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "warning: \"%s\", line %d: %s", current_file, lineno + 1, msg); } int diff --git a/ircd/parse.c b/ircd/parse.c index a446c2a1..115ef826 100644 --- a/ircd/parse.c +++ b/ircd/parse.c @@ -223,7 +223,7 @@ handle_command(struct Message *mptr, struct MsgBuf *msgbuf_p, struct Client *cli return (-1); } - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Dropping server %s due to (invalid) command '%s'" " with only %zu arguments (expecting %zu).", client_p->name, mptr->cmd, msgbuf_p->n_para, ehandler.min_para); @@ -380,7 +380,7 @@ remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer) if((IsDigit(lsender[0]) && slen == 3) || (strchr(lsender, '.') != NULL)) { - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Unknown prefix (%s) from %s, Squitting %s", lbuffer, client_p->name, lsender); @@ -392,7 +392,7 @@ remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer) else if(!IsDigit(lsender[0])) ; else if(slen != 9) - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Invalid prefix (%s) from %s", lbuffer, client_p->name); else @@ -481,7 +481,7 @@ do_numeric(int numeric, struct Client *client_p, struct Client *source_p, int pa */ if(numeric != ERR_NOSUCHNICK && numeric != ERR_NOSUCHSERVER) - sendto_realops_snomask(SNO_GENERAL, L_ADMIN, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "*** %s(via %s) sent a %03d numeric to me: %s", source_p->name, client_p->name, numeric, buffer); diff --git a/ircd/restart.c b/ircd/restart.c index 2db2a2ec..acd5f7db 100644 --- a/ircd/restart.c +++ b/ircd/restart.c @@ -54,7 +54,7 @@ server_reboot(void) int i; char path[PATH_MAX+1]; - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Restarting server..."); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Restarting server..."); ilog(L_MAIN, "Restarting server..."); diff --git a/ircd/s_conf.c b/ircd/s_conf.c index 8bd98aa0..2aae3dde 100644 --- a/ircd/s_conf.c +++ b/ircd/s_conf.c @@ -267,7 +267,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern static char ipaddr[HOSTIPLEN]; rb_inet_ntop_sock(&source_p->localClient->ip, ipaddr, sizeof(ipaddr)); #endif - sendto_realops_snomask(SNO_UNAUTH, L_ALL, + sendto_realops_snomask(SNO_UNAUTH, L_NETWIDE, "Unauthorised client connection from " "%s!%s%s@%s [%s] on [%s/%u].", source_p->name, IsGotId(source_p) ? "" : "~", @@ -332,7 +332,7 @@ verify_access(struct Client *client_p, const char *username) if(IsConfSpoofNotice(aconf)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s spoofing: %s as %s", client_p->name, show_ip(NULL, client_p) ? client_p->host : aconf->info.name, @@ -649,7 +649,7 @@ rehash(bool sig) hook_data_rehash hdata = { sig }; if(sig) - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Got signal SIGHUP, reloading ircd conf. file"); rehash_authd(); @@ -1436,7 +1436,7 @@ read_conf_files(bool cold) } else { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Can't open file '%s' - aborting rehash!", filename); return; } @@ -1688,7 +1688,7 @@ yyerror(const char *msg) strip_tabs(newlinebuf, yy_linebuf, sizeof(newlinebuf)); ierror("\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "\"%s\", line %d: %s at '%s'", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "\"%s\", line %d: %s at '%s'", conffilebuf, lineno + 1, msg, newlinebuf); } diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c index e429507d..253b869d 100644 --- a/ircd/s_newconf.c +++ b/ircd/s_newconf.c @@ -510,7 +510,7 @@ set_server_conf_autoconn(struct Client *source_p, const char *name, int newval) else server_p->flags &= ~SERVER_AUTOCONN; - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed AUTOCONN for %s to %i", get_oper_name(source_p), name, newval); } @@ -528,7 +528,7 @@ disable_server_conf_autoconn(const char *name) { server_p->flags &= ~SERVER_AUTOCONN; - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Disabling AUTOCONN for %s because of error", name); ilog(L_SERVER, "Disabling AUTOCONN for %s because of error", diff --git a/ircd/s_serv.c b/ircd/s_serv.c index 7eabf27c..836c204e 100644 --- a/ircd/s_serv.c +++ b/ircd/s_serv.c @@ -330,7 +330,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); @@ -814,7 +814,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!"); } @@ -1106,7 +1106,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) */ 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)) @@ -1116,7 +1116,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) } if (CurrUsers(server_p->class) >= MaxUsers(server_p->class)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + 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)) @@ -1302,7 +1302,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", @@ -1314,7 +1314,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", @@ -1332,7 +1332,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; @@ -1340,7 +1340,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", @@ -1372,7 +1372,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; diff --git a/ircd/s_user.c b/ircd/s_user.c index 1a9d51f4..0fa78ba4 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -254,7 +254,7 @@ authd_check(struct Client *client_p, struct Client *source_p) { /* This shouldn't happen, better tell the ops... */ ierror("authd sent us a malformed OPM string %s", proxy); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "authd sent us a malformed OPM string %s", proxy); break; } @@ -542,7 +542,7 @@ register_local_user(struct Client *client_p, struct Client *source_p) if(rb_dlink_list_length(&lclient_list) >= (unsigned long)GlobalSetOptions.maxclients && !IsConfExemptLimits(aconf)) { - sendto_realops_snomask(SNO_FULL, L_ALL, + sendto_realops_snomask(SNO_FULL, L_NETWIDE, "Too many clients, rejecting %s[%s].", source_p->name, source_p->host); ServerStats.is_ref++; @@ -568,7 +568,7 @@ register_local_user(struct Client *client_p, struct Client *source_p) if(!valid_username(source_p->username)) { - sendto_realops_snomask(SNO_REJ, L_ALL, + sendto_realops_snomask(SNO_REJ, L_NETWIDE, "Invalid username: %s (%s@%s)", source_p->name, source_p->username, source_p->host); ServerStats.is_ref++; @@ -659,7 +659,7 @@ register_local_user(struct Client *client_p, struct Client *source_p) { Count.max_loc = rb_dlink_list_length(&lclient_list); if(!(Count.max_loc % 10)) - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "New Max Local Clients: %d", Count.max_loc); } @@ -1040,7 +1040,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char if(IsServer(source_p)) { - sendto_realops_snomask(SNO_GENERAL, L_ADMIN, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "*** Mode for User %s from %s", parv[1], source_p->name); return 0; } @@ -1513,12 +1513,12 @@ construct_umodebuf(void) if (user_modes[i] == 0) { orphaned_umodes |= prev_user_modes[i]; - sendto_realops_snomask(SNO_DEBUG, L_ALL, "Umode +%c is now orphaned", i); + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Umode +%c is now orphaned", i); } else { orphaned_umodes &= ~prev_user_modes[i]; - sendto_realops_snomask(SNO_DEBUG, L_ALL, "Orphaned umode +%c is picked up by module", i); + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Orphaned umode +%c is picked up by module", i); } user_modes[i] = prev_user_modes[i]; } diff --git a/ircd/send.c b/ircd/send.c index 4205276c..43a64c10 100644 --- a/ircd/send.c +++ b/ircd/send.c @@ -72,7 +72,7 @@ _send_linebuf(struct Client *to, buf_head_t *linebuf) { if(IsServer(to)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Max SendQ limit exceeded for %s: %u > %lu", to->name, rb_linebuf_len(&to->localClient->buf_sendq), diff --git a/ircd/sslproc.c b/ircd/sslproc.c index ffea6e89..f9dc28fc 100644 --- a/ircd/sslproc.c +++ b/ircd/sslproc.c @@ -209,7 +209,7 @@ ssl_dead(ssl_ctl_t * ctl) { ssld_count--; ilog(L_MAIN, "ssld helper died - attempting to restart"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "ssld helper died - attempting to restart"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "ssld helper died - attempting to restart"); start_ssldaemon(1); } } @@ -238,7 +238,7 @@ restart_ssld_event(void *unused) { int start = ServerInfo.ssld_count - get_ssld_count(); ilog(L_MAIN, "Attempting to restart ssld processes"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Attempt to restart ssld processes"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Attempt to restart ssld processes"); start_ssldaemon(start); } } @@ -268,7 +268,7 @@ start_ssldaemon(int count) if(ssld_spin_count > 20 && (rb_current_time() - last_spin < 5)) { ilog(L_MAIN, "ssld helper is spinning - will attempt to restart in 1 minute"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "ssld helper is spinning - will attempt to restart in 1 minute"); rb_event_add("restart_ssld_event", restart_ssld_event, NULL, 60); ssld_wait = 1; @@ -427,7 +427,7 @@ ssl_process_dead_fd(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf) if(IsAnyServer(client_p)) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL, "ssld error for %s: %s", client_p->name, reason); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "ssld error for %s: %s", client_p->name, reason); ilog(L_SERVER, "ssld error for %s: %s", log_client_name(client_p, SHOW_IP), reason); } @@ -573,13 +573,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl) case 'I': ircd_ssl_ok = false; ilog(L_MAIN, "%s", cannot_setup_ssl); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s", cannot_setup_ssl); break; case 'U': ircd_zlib_ok = 0; ircd_ssl_ok = false; ilog(L_MAIN, "%s", no_ssl_or_zlib); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s", no_ssl_or_zlib); ssl_killall(); return; case 'V': @@ -592,7 +592,7 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl) break; default: ilog(L_MAIN, "Received invalid command from ssld: %s", ctl_buf->buf); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Received invalid command from ssld"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Received invalid command from ssld"); break; } rb_dlinkDelete(ptr, &ctl->readq); @@ -744,7 +744,7 @@ send_new_ssl_certs_one(ssl_ctl_t * ctl) if(len > sizeof(tmpbuf)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Parameters for send_new_ssl_certs_one too long (%zu > %zu) to pass to ssld, not sending...", len, sizeof(tmpbuf)); ilog(L_MAIN, @@ -887,7 +887,7 @@ start_zlib_session(void *data) if(len > READBUF_SIZE) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "ssld - attempted to pass message of %zd len, max len %d, giving up", len, READBUF_SIZE); ilog(L_MAIN, "ssld - attempted to pass message of %zd len, max len %d, giving up", len, READBUF_SIZE); @@ -919,7 +919,7 @@ start_zlib_session(void *data) *buf = 'Z'; if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF1, &xF2, "Initial zlib socketpairs") == -1) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Error creating zlib socketpair - %s", strerror(errno)); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Error creating zlib socketpair - %s", strerror(errno)); ilog(L_MAIN, "Error creating zlib socketpairs - %s", strerror(errno)); exit_client(server, server, server, "Error creating zlib socketpair"); rb_free(buf); diff --git a/ircd/wsproc.c b/ircd/wsproc.c index b11b0f3d..e5932917 100644 --- a/ircd/wsproc.c +++ b/ircd/wsproc.c @@ -194,7 +194,7 @@ ws_dead(ws_ctl_t * ctl) { wsockd_count--; ilog(L_MAIN, "wsockd helper died - attempting to restart"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "wsockd helper died - attempting to restart"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "wsockd helper died - attempting to restart"); start_wsockd(1); } } @@ -223,7 +223,7 @@ restart_wsockd_event(void *unused) { int start = ServerInfo.wsockd_count - get_wsockd_count(); ilog(L_MAIN, "Attempting to restart wsockd processes"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Attempting to restart wsockd processes"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Attempting to restart wsockd processes"); start_wsockd(start); } } @@ -253,7 +253,7 @@ start_wsockd(int count) if(wsockd_spin_count > 20 && (rb_current_time() - last_spin < 5)) { ilog(L_MAIN, "wsockd helper is spinning - will attempt to restart in 1 minute"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "wsockd helper is spinning - will attempt to restart in 1 minute"); rb_event_add("restart_wsockd_event", restart_wsockd_event, NULL, 60); wsockd_wait = 1; @@ -380,7 +380,7 @@ ws_process_cmd_recv(ws_ctl_t * ctl) break; default: ilog(L_MAIN, "Received invalid command from wsockd: %s", ctl_buf->buf); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Received invalid command from wsockd"); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Received invalid command from wsockd"); break; } rb_dlinkDelete(ptr, &ctl->readq); diff --git a/modules/core/m_error.c b/modules/core/m_error.c index 4ef16881..69712363 100644 --- a/modules/core/m_error.c +++ b/modules/core/m_error.c @@ -106,11 +106,11 @@ m_error(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ if(IsAnyServer(client_p)) { if (hideit < 2) - sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : (is_remote_connect(client_p) ? L_NETWIDE : L_ALL), + sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_NETWIDE, "ERROR :from %s -- %s", 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), + sendto_realops_snomask(SNO_GENERAL, hideit == 1 ? L_OPER | L_NETWIDE : L_NETWIDE, "ERROR :from %s -- ", client_p->name); } @@ -136,12 +136,12 @@ ms_error(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source if(client_p == source_p) { - sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s -- %s", + sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_NETWIDE, "ERROR :from %s -- %s", client_p->name, para); } else { - sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s via %s -- %s", + sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_NETWIDE, "ERROR :from %s via %s -- %s", source_p->name, client_p->name, para); } } diff --git a/modules/core/m_message.c b/modules/core/m_message.c index 8f9c7aa4..b90d2c86 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -803,7 +803,7 @@ msg_client(enum message_type msgtype, } else if(source_p->from == target_p->from) { - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Send message to %s[%s] dropped from %s(Fake Dir)", target_p->name, target_p->from->name, source_p->name); return; diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c index 00f8f6f6..a5b94d59 100644 --- a/modules/core/m_nick.c +++ b/modules/core/m_nick.c @@ -325,7 +325,7 @@ ms_uid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p if(parc != 10) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Dropping server %s due to (invalid) command 'UID' " "with %d arguments (expecting 10)", client_p->name, parc); ilog(L_SERVER, "Excess parameters (%d) for command 'UID' from %s.", @@ -356,7 +356,7 @@ ms_uid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p if(!clean_username(parv[5]) || !clean_host(parv[6])) { ServerStats.is_kill++; - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Bad user@host: %s@%s From: %s(via %s)", parv[5], parv[6], source_p->name, client_p->name); sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name); @@ -367,7 +367,7 @@ ms_uid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p if(strlen(parv[9]) > REALLEN) { char *s = LOCAL_COPY(parv[9]); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Long realname from server %s for %s", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Long realname from server %s for %s", source_p->name, parv[1]); s[REALLEN] = '\0'; parv[9] = s; @@ -414,7 +414,7 @@ ms_euid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ if(parc != 12) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Dropping server %s due to (invalid) command 'EUID' " "with %d arguments (expecting 12)", client_p->name, parc); ilog(L_SERVER, "Excess parameters (%d) for command 'EUID' from %s.", @@ -445,7 +445,7 @@ ms_euid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ if(!clean_username(parv[5]) || !clean_host(parv[6])) { ServerStats.is_kill++; - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Bad user@host: %s@%s From: %s(via %s)", parv[5], parv[6], source_p->name, client_p->name); sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name); @@ -455,7 +455,7 @@ ms_euid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ if(strcmp(parv[9], "*") && !clean_host(parv[9])) { ServerStats.is_kill++; - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Bad realhost: %s From: %s(via %s)", parv[9], source_p->name, client_p->name); sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name); @@ -466,7 +466,7 @@ ms_euid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ if(strlen(parv[11]) > REALLEN) { char *s = LOCAL_COPY(parv[11]); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Long realname from server %s for %s", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Long realname from server %s for %s", source_p->name, parv[1]); s[REALLEN] = '\0'; parv[11] = s; @@ -790,7 +790,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p, /* if we dont have a ts, or their TS's are the same, kill both */ if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo)) { - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick collision on %s(%s <- %s)(both %s)", target_p->name, target_p->from->name, client_p->name, action); @@ -853,12 +853,12 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p, else { if(sameuser) - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick collision on %s(%s <- %s)(older %s)", target_p->name, target_p->from->name, client_p->name, action); else - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick collision on %s(%s <- %s)(newer %s)", target_p->name, target_p->from->name, client_p->name, action); @@ -905,7 +905,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p, /* its a client changing nick and causing a collide */ if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo) || !source_p->user) { - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick change collision from %s to %s(%s <- %s)(both %s)", source_p->name, target_p->name, target_p->from->name, client_p->name, action); @@ -948,12 +948,12 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p, (!sameuser && newts > target_p->tsinfo)) { if(sameuser) - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick change collision from %s to %s(%s <- %s)(older %s)", source_p->name, target_p->name, target_p->from->name, client_p->name, action); else - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick change collision from %s to %s(%s <- %s)(newer %s)", source_p->name, target_p->name, target_p->from->name, client_p->name, action); @@ -993,12 +993,12 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p, else { if(sameuser) - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick collision on %s(%s <- %s)(older %s)", target_p->name, target_p->from->name, client_p->name, action); else - sendto_realops_snomask(SNO_SKILL, L_ALL, + sendto_realops_snomask(SNO_SKILL, L_NETWIDE, "Nick collision on %s(%s <- %s)(newer %s)", target_p->name, target_p->from->name, client_p->name, action); @@ -1168,7 +1168,7 @@ save_user(struct Client *client_p, struct Client *source_p, { /* This shouldn't happen */ /* Note we only need SAVE support in this direction */ - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Killed %s!%s@%s for nick collision detected by %s (%s does not support SAVE)", target_p->name, target_p->username, target_p->host, source_p->name, target_p->from->name); kill_client_serv_butone(NULL, target_p, "%s (Nick collision (no SAVE support))", me.name); diff --git a/modules/core/m_server.c b/modules/core/m_server.c index 850a67d8..42482d0d 100644 --- a/modules/core/m_server.c +++ b/modules/core/m_server.c @@ -85,7 +85,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if (IsHandshake(client_p) && irccmp(client_p->name, name)) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Server %s has unexpected name %s", client_p->name, name); ilog(L_SERVER, "Server %s has unexpected name %s", @@ -99,7 +99,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc */ if(!DoesTS(client_p)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s dropped, non-TS server", client_p->name); exit_client(client_p, client_p, client_p, "Non-TS server"); return; @@ -122,7 +122,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc case -1: if(ConfigFileEntry.warn_no_nline) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unauthorised server connection attempt from %s: " "No entry for servername %s", "[@255.255.255.255]", name); @@ -138,7 +138,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc break; case -2: - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unauthorised server connection attempt from %s: " "Bad credentials for server %s", "[@255.255.255.255]", name); @@ -153,7 +153,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc break; case -3: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Unauthorised server connection attempt from %s: " "Invalid host for server %s", "[@255.255.255.255]", name); @@ -169,7 +169,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc /* servername is > HOSTLEN */ case -4: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Invalid servername %s from %s", name, "[@255.255.255.255]"); ilog(L_SERVER, "Access denied, invalid servername from %s", @@ -180,7 +180,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc /* NOT REACHED */ break; case -5: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection from servername %s requires SSL/TLS but is plaintext", name); ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s", @@ -191,7 +191,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc case -6: if (client_p->certfp) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection from servername %s has invalid certificate fingerprint %s", name, client_p->certfp); ilog(L_SERVER, "Access denied, invalid certificate fingerprint %s from %s", @@ -200,7 +200,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc } else { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection from servername %s failed certificate validation", name); ilog(L_SERVER, "Access denied; certificate validation failed for certificate from %s", @@ -210,7 +210,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc return; case -7: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection from servername %s rejected, no more connections allowed in class", name); ilog(L_SERVER, "Access denied, no more connections allowed in class for %s", @@ -219,7 +219,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc exit_client(client_p, client_p, client_p, "Access denied, no more connections allowed in class"); return; default: - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Connection from servername %s rejected, unknown error %d", name, ret); ilog(L_SERVER, "Access denied, unknown error %d for server %s%s", ret, @@ -233,7 +233,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc /* require TS6 for direct links */ if(!IsCapable(client_p, CAP_TS6)) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s dropped, TS6 protocol is required", name); exit_client(client_p, client_p, client_p, "Incompatible TS version"); return; @@ -245,7 +245,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc { missing = capability_index_list(serv_capindex, required_mask & ~client_p->localClient->caps); - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s dropped, required CAPABs [%s] are missing", name, missing); ilog(L_SERVER, "Link %s%s dropped, required CAPABs [%s] are missing", @@ -284,7 +284,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc } else { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Attempt to re-introduce server %s from %s", name, "[@255.255.255.255]"); ilog(L_SERVER, "Attempt to re-introduce server %s from %s", @@ -298,7 +298,7 @@ mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if (client_p->preClient && !EmptyString(client_p->preClient->id)) { if ((target_p = find_id(client_p->preClient->id)) != NULL) { - sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Attempt to re-introduce SID %s from %s%s (already in use by %s)", client_p->preClient->id, EmptyString(client_p->name) ? name : "", @@ -395,7 +395,7 @@ ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc * for a while and servers to send stuff to the wrong place. */ sendto_one(client_p, "ERROR :Nickname %s already exists!", name); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s cancelled: Server/nick collision on %s", client_p->name, name); ilog(L_SERVER, "Link %s cancelled: Server/nick collision on %s", @@ -457,7 +457,7 @@ ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(!hlined) { /* OOOPs nope can't HUB */ - sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Non-Hub link %s introduced %s.", client_p->name, name); ilog(L_SERVER, "Non-Hub link %s introduced %s.", client_p->name, name); @@ -473,7 +473,7 @@ ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(llined) { /* OOOPs nope can't HUB this leaf */ - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s introduced leafed server %s.", client_p->name, name); ilog(L_SERVER, "Link %s introduced leafed server %s.", @@ -490,7 +490,7 @@ ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(strlen(name) > HOSTLEN) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s introduced server with invalid servername %s", client_p->name, name); ilog(L_SERVER, "Link %s introduced server with invalid servername %s", @@ -581,7 +581,7 @@ ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p if(bogus_host(parv[1]) || strlen(parv[1]) > HOSTLEN) { sendto_one(client_p, "ERROR :Invalid servername"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s cancelled, servername %s invalid", client_p->name, parv[1]); ilog(L_SERVER, "Link %s cancelled, servername %s invalid", @@ -595,7 +595,7 @@ ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p !IsIdChar(parv[3][2]) || parv[3][3] != '\0') { sendto_one(client_p, "ERROR :Invalid SID"); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s cancelled, SID %s invalid", client_p->name, parv[3]); ilog(L_SERVER, "Link %s cancelled, SID %s invalid", @@ -625,7 +625,7 @@ ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p /* no matching hub_mask */ if(!hlined) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Non-Hub link %s introduced %s.", client_p->name, parv[1]); ilog(L_SERVER, "Non-Hub link %s introduced %s.", @@ -641,7 +641,7 @@ ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p /* matching leaf_mask */ if(llined) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s introduced leafed server %s.", client_p->name, parv[1]); ilog(L_SERVER, "Link %s introduced leafed server %s.", diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c index ad2dc965..9bd789bd 100644 --- a/modules/core/m_squit.c +++ b/modules/core/m_squit.c @@ -76,7 +76,7 @@ mo_squit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source { if(MyConnect(found_squit->target_p)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Received SQUIT %s from %s (%s)", found_squit->target_p->name, get_client_name(source_p, HIDE_IP), comment); @@ -135,14 +135,9 @@ ms_squit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source */ else if(MyConnect(target_p)) { - sendto_wallops_flags(UMODE_WALLOP, &me, - "Remote SQUIT %s from %s (%s)", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Remote SQUIT %s from %s (%s)", target_p->name, source_p->name, comment); - sendto_server(NULL, NULL, CAP_TS6, NOCAPS, - ":%s WALLOPS :Remote SQUIT %s from %s (%s)", - me.id, target_p->name, source_p->name, comment); - ilog(L_SERVER, "SQUIT From %s : %s (%s)", source_p->name, target_p->name, comment); } exit_client(client_p, target_p, source_p, comment); diff --git a/modules/m_challenge.c b/modules/m_challenge.c index 137dfb7a..1842f727 100644 --- a/modules/m_challenge.c +++ b/modules/m_challenge.c @@ -60,7 +60,7 @@ static const char challenge_desc[] = "Does nothing as OpenSSL was not enabled."; /* now it is -larne */ static int challenge_load(void) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Challenge module not loaded because OpenSSL is not available."); ilog(L_MAIN, "Challenge module not loaded because OpenSSL is not available."); return -1; @@ -231,7 +231,7 @@ m_challenge(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou if(ConfigFileEntry.failed_oper_notice) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Failed CHALLENGE attempt - missing SSL/TLS by %s (%s@%s)", source_p->name, source_p->username, source_p->host); } @@ -249,7 +249,7 @@ m_challenge(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou if(ConfigFileEntry.failed_oper_notice) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Failed OPER attempt - client certificate fingerprint mismatch by %s (%s@%s)", source_p->name, source_p->username, source_p->host); } diff --git a/modules/m_chghost.c b/modules/m_chghost.c index b6711f76..a402367a 100644 --- a/modules/m_chghost.c +++ b/modules/m_chghost.c @@ -113,7 +113,7 @@ do_chghost(struct Client *source_p, struct Client *target_p, { if (!clean_host(newhost)) { - sendto_realops_snomask(SNO_GENERAL, is_encap ? L_ALL : L_NETWIDE, "%s attempted to change hostname for %s to %s (invalid)", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s attempted to change hostname for %s to %s (invalid)", IsServer(source_p) ? source_p->name : get_oper_name(source_p), target_p->name, newhost); /* sending this remotely may disclose important diff --git a/modules/m_dline.c b/modules/m_dline.c index 3f9a3d16..eb8edcf3 100644 --- a/modules/m_dline.c +++ b/modules/m_dline.c @@ -303,7 +303,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * if(EmptyString(oper_reason)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s added temporary %d min. D-Line for [%s] [%s]", get_oper_name(source_p), tdline_time / 60, aconf->host, reason); @@ -312,7 +312,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * } else { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s added temporary %d min. D-Line for [%s] [%s|%s]", get_oper_name(source_p), tdline_time / 60, aconf->host, reason, oper_reason); @@ -333,7 +333,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * if(EmptyString(oper_reason)) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s added D-Line for [%s] [%s]", get_oper_name(source_p), aconf->host, reason); ilog(L_KLINE, "D %s 0 %s %s", @@ -341,7 +341,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char * } else { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s added D-Line for [%s] [%s|%s]", get_oper_name(source_p), aconf->host, reason, oper_reason); ilog(L_KLINE, "D %s 0 %s %s|%s", @@ -378,7 +378,7 @@ apply_undline(struct Client *source_p, const char *cidr) sendto_one(source_p, ":%s NOTICE %s :Un-dlined [%s] from temporary D-lines", me.name, source_p->name, buf); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has removed the temporary D-Line for: [%s]", get_oper_name(source_p), buf); ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), buf); @@ -389,7 +389,7 @@ apply_undline(struct Client *source_p, const char *cidr) sendto_one(source_p, ":%s NOTICE %s :D-Line for [%s] is removed", me.name, source_p->name, aconf->host); - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s has removed the D-Line for: [%s]", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has removed the D-Line for: [%s]", get_oper_name(source_p), aconf->host); ilog(L_KLINE, "UD %s %s", get_oper_name(source_p), aconf->host); delete_one_address_conf(aconf->host, aconf); diff --git a/modules/m_kline.c b/modules/m_kline.c index 0259f858..e478f50d 100644 --- a/modules/m_kline.c +++ b/modules/m_kline.c @@ -163,6 +163,15 @@ mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source if(target_server != NULL) { + if (tkline_time) + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, + "%s is adding a temporary %d min. K-Line for [%s@%s] on %s [%s]", + get_oper_name(source_p), tkline_time / 60, user, host, target_server, reason); + else + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, + "%s is adding a K-Line for [%s@%s] on %s [%s]", + get_oper_name(source_p), user, host, target_server, reason); + propagate_generic(source_p, "KLINE", target_server, CAP_KLN, "%d %s %s :%s", tkline_time, user, host, reason); @@ -390,6 +399,9 @@ mo_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour return; } + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is removing the K-Line for [%s@%s] on %s", + get_oper_name(source_p), user, host, parv[3]); + propagate_generic(source_p, "UNKLINE", parv[3], CAP_UNKLN, "%s %s", user, host); if(match(parv[3], me.name) == 0) diff --git a/modules/m_resv.c b/modules/m_resv.c index 9e615ea5..f0c14b4a 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -130,6 +130,13 @@ mo_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ /* remote resv.. */ if(target_server) { + if (temp_time) + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is adding a %d min. RESV for [%s] on %s [%s]", + get_oper_name(source_p), temp_time / 60, name, target_server, reason); + else + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is adding a permanent RESV for [%s] on %s [%s]", + get_oper_name(source_p), name, target_server, reason); + propagate_resv(source_p, target_server, temp_time, name, reason); if(match(target_server, me.name) == 0) diff --git a/modules/m_set.c b/modules/m_set.c index 34bdea2e..95114fdd 100644 --- a/modules/m_set.c +++ b/modules/m_set.c @@ -154,7 +154,7 @@ quote_autoconnall(struct Client *source_p, const char *arg, int newval) { if(newval >= 0) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s has changed AUTOCONNALL to %i", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed AUTOCONNALL to %i", source_p->name, newval); GlobalSetOptions.autoconn = newval; @@ -174,7 +174,7 @@ quote_floodcount(struct Client *source_p, const char *arg, int newval) if(newval >= 0) { GlobalSetOptions.floodcount = newval; - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed FLOODCOUNT to %i", source_p->name, GlobalSetOptions.floodcount); } @@ -198,7 +198,7 @@ quote_identtimeout(struct Client *source_p, const char *arg, int newval) if(newval > 0) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed IDENTTIMEOUT to %d", get_oper_name(source_p), newval); GlobalSetOptions.ident_timeout = newval; @@ -232,7 +232,7 @@ quote_max(struct Client *source_p, const char *arg, int newval) GlobalSetOptions.maxclients = newval; - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s!%s@%s set new MAXCLIENTS to %d (%lu current)", source_p->name, source_p->username, source_p->host, GlobalSetOptions.maxclients, @@ -260,7 +260,7 @@ quote_operstring(struct Client *source_p, const char *arg, int newval) rb_strlcpy(GlobalSetOptions.operstring, arg, sizeof(GlobalSetOptions.operstring)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed OPERSTRING to '%s'", get_oper_name(source_p), arg); } @@ -279,7 +279,7 @@ quote_adminstring(struct Client *source_p, const char *arg, int newval) rb_strlcpy(GlobalSetOptions.adminstring, arg, sizeof(GlobalSetOptions.adminstring)); - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed ADMINSTRING to '%s'", get_oper_name(source_p), arg); } @@ -293,7 +293,7 @@ quote_spamnum(struct Client *source_p, const char *arg, int newval) { if(newval == 0) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has disabled ANTI_SPAMBOT", source_p->name); GlobalSetOptions.spam_num = newval; return; @@ -306,7 +306,7 @@ quote_spamnum(struct Client *source_p, const char *arg, int newval) { GlobalSetOptions.spam_num = newval; } - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s has changed SPAMNUM to %i", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed SPAMNUM to %i", source_p->name, GlobalSetOptions.spam_num); } else @@ -329,7 +329,7 @@ quote_spamtime(struct Client *source_p, const char *arg, int newval) { GlobalSetOptions.spam_time = newval; } - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s has changed SPAMTIME to %i", + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed SPAMTIME to %i", source_p->name, GlobalSetOptions.spam_time); } else @@ -372,7 +372,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval) /* OFF */ if(newval == 0) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is disabling splitmode", get_oper_name(source_p)); splitmode = false; @@ -384,7 +384,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval) /* ON */ else if(newval == 1) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is enabling and activating splitmode", get_oper_name(source_p)); @@ -398,7 +398,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval) /* AUTO */ else if(newval == 2) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is enabling automatic splitmode", get_oper_name(source_p)); @@ -421,7 +421,7 @@ quote_splitnum(struct Client *source_p, const char *arg, int newval) { if(newval >= 0) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed SPLITNUM to %i", source_p->name, newval); split_servers = newval; @@ -438,7 +438,7 @@ quote_splitusers(struct Client *source_p, const char *arg, int newval) { if(newval >= 0) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has changed SPLITUSERS to %i", source_p->name, newval); split_users = newval; diff --git a/modules/m_signon.c b/modules/m_signon.c index 0714b47a..3ad91834 100644 --- a/modules/m_signon.c +++ b/modules/m_signon.c @@ -253,7 +253,7 @@ ms_signon(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(!clean_nick(parv[1], 0)) { ServerStats.is_kill++; - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Bad Nick from SIGNON: %s From: %s(via %s)", parv[1], source_p->servptr->name, client_p->name); /* if source_p has an id, kill_client_serv_butone() will @@ -271,7 +271,7 @@ ms_signon(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(!clean_username(parv[2]) || !clean_host(parv[3])) { ServerStats.is_kill++; - sendto_realops_snomask(SNO_DEBUG, L_ALL, + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, "Bad user@host from SIGNON: %s@%s From: %s(via %s)", parv[2], parv[3], source_p->servptr->name, client_p->name); /* if source_p has an id, kill_client_serv_butone() will @@ -311,7 +311,7 @@ ms_signon(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc { if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo) || !source_p->user) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Nick change collision from SIGNON from %s to %s(%s <- %s)(both killed)", source_p->name, target_p->name, target_p->from->name, client_p->name); @@ -341,12 +341,12 @@ ms_signon(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc (!sameuser && newts > target_p->tsinfo)) { if(sameuser) - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Nick change collision from SIGNON from %s to %s(%s <- %s)(older killed)", source_p->name, target_p->name, target_p->from->name, client_p->name); else - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Nick change collision from SIGNON from %s to %s(%s <- %s)(newer killed)", source_p->name, target_p->name, target_p->from->name, client_p->name); @@ -371,12 +371,12 @@ ms_signon(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc else { if(sameuser) - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Nick collision from SIGNON on %s(%s <- %s)(older killed)", target_p->name, target_p->from->name, client_p->name); else - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Nick collision from SIGNON on %s(%s <- %s)(newer killed)", target_p->name, target_p->from->name, client_p->name); diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c index c6042fe1..6aaf9b16 100644 --- a/modules/m_svinfo.c +++ b/modules/m_svinfo.c @@ -67,7 +67,7 @@ ms_svinfo(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(TS_CURRENT < atoi(parv[2]) || atoi(parv[1]) < TS_MIN) { /* TS version is too low on one of the sides, drop the link */ - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s dropped, wrong TS protocol version (%s,%s)", source_p->name, parv[1], parv[2]); snprintf(squitreason, sizeof squitreason, "Incompatible TS version (%s,%s)", @@ -85,7 +85,7 @@ ms_svinfo(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc if(deltat > ConfigFileEntry.ts_max_delta) { - sendto_realops_snomask(SNO_GENERAL, L_ALL, + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Link %s dropped, excessive TS delta" " (my TS=%ld, their TS=%ld, delta=%ld)", source_p->name, diff --git a/modules/m_xline.c b/modules/m_xline.c index 7119b08f..fb92bb95 100644 --- a/modules/m_xline.c +++ b/modules/m_xline.c @@ -148,6 +148,13 @@ mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source if(target_server != NULL) { + if (temp_time) + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is adding a temporary %d min. X-Line for [%s] on %s [%s]", + get_oper_name(source_p), temp_time / 60, name, target_server, reason); + else + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is adding a permanent X-Line for [%s] on %s [%s]", + get_oper_name(source_p), name, target_server, reason); + propagate_xline(source_p, target_server, temp_time, name, "2", reason); if(!match(target_server, me.name)) @@ -396,6 +403,9 @@ mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour return; } + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is removing the X-Line for [%s] on %s.", + get_oper_name(source_p), parv[1], parv[3]); + propagate_generic(source_p, "UNXLINE", parv[3], CAP_CLUSTER, "%s", parv[1]); if(match(parv[3], me.name) == 0)