Merge with 'charybdis-ts6only' branch.

This commit is contained in:
William Pitcock 2008-06-08 01:09:04 -05:00
commit f06c147c70
4 changed files with 4 additions and 21 deletions

4
TODO
View File

@ -23,8 +23,12 @@
[x] remote d:lines support [x] remote d:lines support
[F] kline/xline/resv sync [F] kline/xline/resv sync
[F] make an ability of using bandb instead of .conf files as bans storage [F] make an ability of using bandb instead of .conf files as bans storage
<<<<<<< local
[/] drop non-TS6 (legacy protocol) support
=======
[F] drop non-TS6 (legacy protocol) support [F] drop non-TS6 (legacy protocol) support
[F] Doxygen code documentation [F] Doxygen code documentation
>>>>>>> other
[F] module engine rework [F] module engine rework
[F] more beautiful way of adding new channel modes by module [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, [F] make nick/user/host validation functions/match tables able to work in separated modules,

View File

@ -373,12 +373,7 @@ struct exit_client_hook
* ts stuff * ts stuff
*/ */
#define TS_CURRENT 6 #define TS_CURRENT 6
#ifdef TS6_ONLY
#define TS_MIN 6 #define TS_MIN 6
#else
#define TS_MIN 3
#endif
#define TS_DOESTS 0x10000000 #define TS_DOESTS 0x10000000
#define DoesTS(x) ((x)->tsinfo & TS_DOESTS) #define DoesTS(x) ((x)->tsinfo & TS_DOESTS)

View File

@ -88,14 +88,6 @@
*/ */
#define HIDE_SERVERS_IPS #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 /* HANGONGOODLINK and HANGONRETRYDELAY
* Often net breaks for a short time and it's useful to try to * Often net breaks for a short time and it's useful to try to
* establishing the same connection again faster than CONNECTFREQUENCY * establishing the same connection again faster than CONNECTFREQUENCY

View File

@ -88,14 +88,6 @@
*/ */
#define HIDE_SERVERS_IPS #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 /* HANGONGOODLINK and HANGONRETRYDELAY
* Often net breaks for a short time and it's useful to try to * Often net breaks for a short time and it's useful to try to
* establishing the same connection again faster than CONNECTFREQUENCY * establishing the same connection again faster than CONNECTFREQUENCY