From 6fe212b4df3671d09f1004bedc50cf32f14dc4c0 Mon Sep 17 00:00:00 2001 From: acidvegas Date: Sun, 2 Jul 2023 00:03:22 -0400 Subject: [PATCH] numerics.h updated and whois details changed --- doc/conf/except.conf | 10 +++++++++- doc/conf/ircd.motd | 2 +- doc/conf/modules.conf | 2 +- doc/conf/unrealircd.hub.conf | 9 +++++++-- doc/conf/unrealircd.remote.conf | 10 ++++++---- include/numeric.h | 32 ++++++++++++++++---------------- src/modules/topic.c | 3 +-- 7 files changed, 41 insertions(+), 27 deletions(-) diff --git a/doc/conf/except.conf b/doc/conf/except.conf index d6e891a..54bf9cf 100644 --- a/doc/conf/except.conf +++ b/doc/conf/except.conf @@ -1,3 +1,11 @@ +# Custom (FOENEM) +except ban { + mask { + ip { 1.4.8.8; } # Pyrex + } + type { all; } +} + # Local except ban { mask { @@ -29,4 +37,4 @@ except ban { ip { 97.107.138.109; 2600:3c03::f03c:91ff:fe96:c1fa; } # bot.search.mibbit.com } type { all; } -} \ No newline at end of file +} diff --git a/doc/conf/ircd.motd b/doc/conf/ircd.motd index 1216ff0..c4fb5d6 100644 --- a/doc/conf/ircd.motd +++ b/doc/conf/ircd.motd @@ -45,7 +45,7 @@ 14• 7SSL/TLS Ports 6697 & 9000 14• 7 Mail 12admin@supernets.org -14• 7 Github 12https://github.com/supernets +14• 7 Git 12https://git.supernets.org 14• 7 Twitter 12https://twitter.com/super_nets 14• 7 Website 12https://supernets.org/ diff --git a/doc/conf/modules.conf b/doc/conf/modules.conf index b98ded2..6f79023 100644 --- a/doc/conf/modules.conf +++ b/doc/conf/modules.conf @@ -172,7 +172,7 @@ loadmodule "extbans/join"; /* +b ~join */ loadmodule "extbans/msgbypass"; /* +e ~msgbypass */ loadmodule "extbans/nickchange"; /* +b ~nickchange */ #loadmodule "extbans/operclass"; /* +b ~operclass */ -#loadmodule "extbans/partmsg"; /* +b ~partmsg */ +loadmodule "extbans/partmsg"; /* +b ~partmsg */ loadmodule "extbans/quiet"; /* +b ~quiet */ loadmodule "extbans/realname"; /* +b ~realname */ loadmodule "extbans/textban"; /* +b ~text */ diff --git a/doc/conf/unrealircd.hub.conf b/doc/conf/unrealircd.hub.conf index d08245c..c8df371 100644 --- a/doc/conf/unrealircd.hub.conf +++ b/doc/conf/unrealircd.hub.conf @@ -19,7 +19,12 @@ link services.supernets.org { log { source { error; fatal; warn; } - destination { file "ircd.log" { maxsize 1M; } } + destination { file "ircd.log" { maxsize 5M; } } +} + +log { + source { !debug; all; } + destination { channel "#syslog"; } } ulines { services.supernets.org; } @@ -38,4 +43,4 @@ set { "REDACTED"; "REDACTED"; } -} \ No newline at end of file +} diff --git a/doc/conf/unrealircd.remote.conf b/doc/conf/unrealircd.remote.conf index a795b7b..7e91db3 100644 --- a/doc/conf/unrealircd.remote.conf +++ b/doc/conf/unrealircd.remote.conf @@ -59,7 +59,7 @@ log { } log { - source { antimixedutf8; antirandom; connthrottle; flood; htm; kill; listen; link; oper; sacmds; } + source { !debug; all; } destination { channel "#syslog"; } } @@ -229,10 +229,12 @@ set { manual-ban-target ip; hide-idle-time { policy always; } whois-details { + bot { everyone none; self full; oper full; } channels { everyone none; self full; oper full; } - reputation { everyone full; } + oper { everyone none; self full; oper full; } + reputation { everyone full; self full; oper full; } server { everyone none; self full; oper full; } - swhois { everyone full; } + swhois { everyone full; self full; oper full; } } } @@ -255,4 +257,4 @@ hideserver { security-group known-users { identified yes; reputation-score 10000; -} \ No newline at end of file +} diff --git a/include/numeric.h b/include/numeric.h index 18f32d8..b288509 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -339,8 +339,8 @@ #define STR_RPL_MAPEND /* 007 */ ":End of /MAP" #define STR_RPL_SNOMASK /* 008 */ "+%s :Server notice mask" #define STR_RPL_REDIR /* 010 */ "%s %d :Please use this Server/Port instead" -//#define STR_RPL_MAPUSERS /* 018 */ ":%d server%s and %d user%s, average %.2f users per server" -#define STR_RPL_MAPUSERS /* 018 */ ":5000 servers and 1000000 users, average 1000000 users per server" +#define STR_RPL_MAPUSERS /* 018 */ ":%d server%s and %d user%s, average %.2f users per server" +//#define STR_RPL_MAPUSERS /* 018 */ ":5000 servers and 1000000 users, average 1000000 users per server" #define STR_RPL_REMOTEISUPPORT /* 105 */ "%s :are supported by this server" #define STR_RPL_TRACELINK /* 200 */ "Link %s%s %s %s" #define STR_RPL_TRACECONNECTING /* 201 */ "Attempt %s %s" @@ -374,27 +374,27 @@ #define STR_RPL_STATSXLINE /* 247 */ "X %s %d" #define STR_RPL_STATSULINE /* 248 */ "U %s" #define STR_RPL_STATSDEBUG /* 249 */ ":%s" -//#define STR_RPL_STATSCONN /* 250 */ ":Highest connection count: %d (%d clients)" -#define STR_RPL_STATSCONN /* 250 */ ":Highest connection count: 1000000 (1000000 clients)" -//#define STR_RPL_LUSERCLIENT /* 251 */ ":There are %d users and %d invisible on %d servers" -#define STR_RPL_LUSERCLIENT /* 251 */ ":There are 1000000 users and 0 invisible on 5000 servers" -//#define STR_RPL_LUSEROP /* 252 */ "%d :operator(s) online" -#define STR_RPL_LUSEROP /* 252 */ "5000 :operator(s) online" +#define STR_RPL_STATSCONN /* 250 */ ":Highest connection count: %d (%d clients)" +//#define STR_RPL_STATSCONN /* 250 */ ":Highest connection count: 1000000 (1000000 clients)" +#define STR_RPL_LUSERCLIENT /* 251 */ ":There are %d users and %d invisible on %d servers" +//#define STR_RPL_LUSERCLIENT /* 251 */ ":There are 1000000 users and 0 invisible on 5000 servers" +#define STR_RPL_LUSEROP /* 252 */ "%d :operator(s) online" +//#define STR_RPL_LUSEROP /* 252 */ "5000 :operator(s) online" #define STR_RPL_LUSERUNKNOWN /* 253 */ "%d :unknown connection(s)" -//#define STR_RPL_LUSERCHANNELS /* 254 */ "%d :channels formed" -#define STR_RPL_LUSERCHANNELS /* 254 */ "1000000 :channels formed" -//#define STR_RPL_LUSERME /* 255 */ ":I have %d clients and %d servers" -#define STR_RPL_LUSERME /* 255 */ ":I have 5000 clients and 5000 servers" +#define STR_RPL_LUSERCHANNELS /* 254 */ "%d :channels formed" +//#define STR_RPL_LUSERCHANNELS /* 254 */ "1000000 :channels formed" +#define STR_RPL_LUSERME /* 255 */ ":I have %d clients and %d servers" +//#define STR_RPL_LUSERME /* 255 */ ":I have 5000 clients and 5000 servers" #define STR_RPL_ADMINME /* 256 */ ":Administrative info about %s" #define STR_RPL_ADMINLOC1 /* 257 */ ":%s" #define STR_RPL_ADMINLOC2 /* 258 */ ":%s" #define STR_RPL_ADMINEMAIL /* 259 */ ":%s" #define STR_RPL_TRACELOG /* 261 */ "File %s %d" #define STR_RPL_TRYAGAIN /* 263 */ "%s :Flooding detected. Please wait a while and try again." -//#define STR_RPL_LOCALUSERS /* 265 */ "%d %d :Current local users %d, max %d" -#define STR_RPL_LOCALUSERS /* 265 */ "1000000 1000000 :Current local users 1000000, max 1000000" -//#define STR_RPL_GLOBALUSERS /* 266 */ "%d %d :Current global users %d, max %d" -#define STR_RPL_GLOBALUSERS /* 266 */ "1000000 1000000 :Current global users 1000000, max 1000000" +#define STR_RPL_LOCALUSERS /* 265 */ "%d %d :Current local users %d, max %d" +//#define STR_RPL_LOCALUSERS /* 265 */ "1000000 1000000 :Current local users 1000000, max 1000000" +#define STR_RPL_GLOBALUSERS /* 266 */ "%d %d :Current global users %d, max %d" +//#define STR_RPL_GLOBALUSERS /* 266 */ "1000000 1000000 :Current global users 1000000, max 1000000" #define STR_RPL_SILELIST /* 271 */ "%s" #define STR_RPL_ENDOFSILELIST /* 272 */ ":End of Silence List" #define STR_RPL_STATSDLINE /* 275 */ "%c %s %s" diff --git a/src/modules/topic.c b/src/modules/topic.c index 6947543..736c863 100644 --- a/src/modules/topic.c +++ b/src/modules/topic.c @@ -312,7 +312,6 @@ void _set_channel_topic(Client *client, Channel *channel, MessageTag *recv_mtags sendto_server(client, 0, 0, mtags, ":%s TOPIC %s %s %lld :%s", client->id, channel->name, channel->topic_nick, (long long)channel->topic_time, channel->topic); - // EXPERIMENTAL - have not tried this - //sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags, ":%s TOPIC %s :%s", client->name, channel->name, channel->topic); + sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags, ":%s TOPIC %s :%s", client->name, channel->name, channel->topic); free_message_tags(mtags); }