From 5295cde25d273204b27a4b929fe04238ad706d9b Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 11 Apr 2008 10:22:44 -0500 Subject: [PATCH 1/2] start working on TS5 removal. --- TODO | 2 +- include/config.h | 8 -------- include/config.h.dist | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/TODO b/TODO index 0686247..77ddf53 100644 --- a/TODO +++ b/TODO @@ -24,7 +24,7 @@ [?] +C (noctcp) channel/usermode [F] kline/xline/resv sync [F] make an ability of using bandb instead of .conf files as bans storage -[ ] drop non-TS6 (legacy protocol) support +[/] drop non-TS6 (legacy protocol) support [F] module engine rework [F] more beautiful way of adding new channel modes by module [F] make nick/user/host validation functions/match tables able to work in separated modules, diff --git a/include/config.h b/include/config.h index d20bfd9..0470d2e 100644 --- a/include/config.h +++ b/include/config.h @@ -88,14 +88,6 @@ */ #define HIDE_SERVERS_IPS -/* TS6_ONLY - * - * If this is defined only TS6 servers may link to the network. See - * doc/TS6.txt for more information. If your network has old servers - * (hyb7.0, ircd-ratbox-1.x, +CSr) or hybserv you should NOT define this. - */ -#undef TS6_ONLY - /* 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 d20bfd9..0470d2e 100644 --- a/include/config.h.dist +++ b/include/config.h.dist @@ -88,14 +88,6 @@ */ #define HIDE_SERVERS_IPS -/* TS6_ONLY - * - * If this is defined only TS6 servers may link to the network. See - * doc/TS6.txt for more information. If your network has old servers - * (hyb7.0, ircd-ratbox-1.x, +CSr) or hybserv you should NOT define this. - */ -#undef TS6_ONLY - /* 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 From bbce52f18d2afe322cd49871d1768ce7b5d91aca Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 11 Apr 2008 10:23:47 -0500 Subject: [PATCH 2/2] TS_MIN is 6 now. --- include/client.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/include/client.h b/include/client.h index f15444c..a3acba6 100644 --- a/include/client.h +++ b/include/client.h @@ -111,11 +111,11 @@ struct Server struct ZipStats { - unsigned long long in; - unsigned long long in_wire; - unsigned long long out; - unsigned long long out_wire; - double in_ratio; + unsigned long long in; + unsigned long long in_wire; + unsigned long long out; + unsigned long long out_wire; + double in_ratio; double out_ratio; }; @@ -374,12 +374,7 @@ struct exit_client_hook * ts stuff */ #define TS_CURRENT 6 - -#ifdef TS6_ONLY #define TS_MIN 6 -#else -#define TS_MIN 3 -#endif #define TS_DOESTS 0x10000000 #define DoesTS(x) ((x)->tsinfo & TS_DOESTS)