Add split functionality into ircd
Add /split command
Add /stats S/split (make /STATS s/S case sensitive, s spoofhosts)
-Add feature SPLIT
+Add feature SPLIT HIS_SPLIT
Add split.c split.h m_split.c
+Add SPLIT priv
+Add LS_JUPE for logging
-diff -r 2da61ac38fa1 include/handlers.h
---- a/include/handlers.h Sun Jan 18 14:18:36 2009 +0100
-+++ b/include/handlers.h Sun Jan 18 15:26:56 2009 +0100
-@@ -139,6 +139,7 @@
+NOTE: feature SPLIT is default enabled as that is just easier when working on this patch.
+
+diff -r 1c62939e612b doc/api/log.txt
+--- a/doc/api/log.txt Wed Feb 04 17:58:50 2009 +0100
++++ b/doc/api/log.txt Wed Feb 04 18:04:57 2009 +0100
+@@ -41,7 +41,7 @@
+
+ <enum>
+ enum LogSys {
+- LS_SYSTEM, LS_CONFIG, LS_OPERMODE, LS_GLINE, LS_JUPE, LS_WHO, LS_NETWORK,
++ LS_SYSTEM, LS_CONFIG, LS_OPERMODE, LS_GLINE, LS_JUPE, LS_SPLIT, LS_WHO, LS_NETWORK,
+ LS_OPERKILL, LS_SERVKILL, LS_USER, LS_OPER, LS_RESOLVER, LS_SOCKET,
+ LS_DEBUG, LS_OLDLOG,
+ LS_LAST_SYSTEM
+diff -r 1c62939e612b include/client.h
+--- a/include/client.h Wed Feb 04 17:58:50 2009 +0100
++++ b/include/client.h Wed Feb 04 18:04:57 2009 +0100
+@@ -151,6 +151,7 @@
+ PRIV_CHECK_CHANNEL, /* staff can /CHECK #channel */
+ PRIV_WELCOME, /* oper can WELCOME */
+ PRIV_LOCAL_WELCOME, /* oper can local WELCOME */
++ PRIV_SPLIT, /* oper can SPLIT */
+ PRIV_LAST_PRIV /**< number of privileges */
+ };
+
+diff -r 1c62939e612b include/handlers.h
+--- a/include/handlers.h Wed Feb 04 17:58:50 2009 +0100
++++ b/include/handlers.h Wed Feb 04 18:04:57 2009 +0100
+@@ -141,6 +141,7 @@
extern int m_registered(struct Client*, struct Client*, int, char*[]);
extern int m_sethost(struct Client*, struct Client*, int, char*[]);
extern int m_silence(struct Client*, struct Client*, int, char*[]);
+extern int m_split(struct Client*, struct Client*, int, char*[]);
+ extern int m_staff(struct Client*, struct Client*, int, char*[]);
extern int m_stats(struct Client*, struct Client*, int, char*[]);
extern int m_time(struct Client*, struct Client*, int, char*[]);
- extern int m_topic(struct Client*, struct Client*, int, char*[]);
-@@ -178,6 +179,7 @@
+@@ -182,6 +183,7 @@
extern int mo_rping(struct Client*, struct Client*, int, char*[]);
extern int mo_set(struct Client*, struct Client*, int, char*[]);
extern int mo_settime(struct Client*, struct Client*, int, char*[]);
+extern int mo_split(struct Client*, struct Client*, int, char*[]);
extern int mo_squit(struct Client*, struct Client*, int, char*[]);
+ extern int mo_staff(struct Client*, struct Client*, int, char*[]);
extern int mo_stats(struct Client*, struct Client*, int, char*[]);
- extern int mo_trace(struct Client*, struct Client*, int, char*[]);
-@@ -232,6 +234,7 @@
+@@ -238,6 +240,7 @@
extern int ms_sethost(struct Client*, struct Client*, int, char*[]);
extern int ms_settime(struct Client*, struct Client*, int, char*[]);
extern int ms_silence(struct Client*, struct Client*, int, char*[]);
+extern int ms_split(struct Client*, struct Client*, int, char*[]);
extern int ms_squit(struct Client*, struct Client*, int, char*[]);
+ extern int ms_staff(struct Client*, struct Client*, int, char*[]);
extern int ms_stats(struct Client*, struct Client*, int, char*[]);
- extern int ms_topic(struct Client*, struct Client*, int, char*[]);
-diff -r 2da61ac38fa1 include/ircd_features.h
---- a/include/ircd_features.h Sun Jan 18 14:18:36 2009 +0100
-+++ b/include/ircd_features.h Sun Jan 18 15:26:56 2009 +0100
-@@ -109,6 +109,7 @@
- FEAT_SETHOST,
+diff -r 1c62939e612b include/ircd_features.h
+--- a/include/ircd_features.h Wed Feb 04 17:58:50 2009 +0100
++++ b/include/ircd_features.h Wed Feb 04 18:04:57 2009 +0100
+@@ -112,6 +112,10 @@
FEAT_SETHOST_USER,
FEAT_SETHOST_AUTO,
-+ FEAT_SPLIT,
++ /* SPLIT */
++ FEAT_SPLIT,
++ FEAT_SPLIT_AUTO_EXPIRE,
++
/* HEAD_IN_SAND Features */
FEAT_HIS_SNOTICES,
-@@ -137,6 +138,7 @@
+ FEAT_HIS_SNOTICES_OPER_ONLY,
+@@ -120,6 +124,7 @@
+ FEAT_HIS_MAP,
+ FEAT_HIS_LINKS,
+ FEAT_HIS_TRACE,
++ FEAT_HIS_SPLIT,
+ FEAT_HIS_STATS_a,
+ FEAT_HIS_STATS_c,
+ FEAT_HIS_STATS_d,
+@@ -139,6 +144,7 @@
FEAT_HIS_STATS_q,
FEAT_HIS_STATS_R,
FEAT_HIS_STATS_r,
FEAT_HIS_STATS_s,
FEAT_HIS_STATS_t,
FEAT_HIS_STATS_T,
-diff -r 2da61ac38fa1 include/msg.h
---- a/include/msg.h Sun Jan 18 14:18:36 2009 +0100
-+++ b/include/msg.h Sun Jan 18 15:26:56 2009 +0100
-@@ -332,6 +332,10 @@
+diff -r 1c62939e612b include/ircd_log.h
+--- a/include/ircd_log.h Wed Feb 04 17:58:50 2009 +0100
++++ b/include/ircd_log.h Wed Feb 04 18:04:57 2009 +0100
+@@ -55,6 +55,7 @@
+ LS_OPERMODE, /**< Uses of OPMODE, CLEARMODE< etc. */
+ LS_GLINE, /**< Adding, (de-)activating or removing GLINEs. */
+ LS_JUPE, /**< Adding, (de-)activating or removing JUPEs. */
++ LS_SPLIT, /**< Adding, (de-)activating or removing SPLITs. */
+ LS_WHO, /**< Use of extended WHO privileges. */
+ LS_NETWORK, /**< New server connections. */
+ LS_OPERKILL, /**< Kills by IRC operators. */
+diff -r 1c62939e612b include/msg.h
+--- a/include/msg.h Wed Feb 04 17:58:50 2009 +0100
++++ b/include/msg.h Wed Feb 04 18:04:57 2009 +0100
+@@ -340,6 +340,10 @@
#define TOK_JUPE "JU"
#define CMD_JUPE MSG_JUPE, TOK_JUPE
#define MSG_OPMODE "OPMODE" /* OPMO */
#define TOK_OPMODE "OM"
#define CMD_OPMODE MSG_OPMODE, TOK_OPMODE
-diff -r 2da61ac38fa1 include/numeric.h
---- a/include/numeric.h Sun Jan 18 14:18:36 2009 +0100
-+++ b/include/numeric.h Sun Jan 18 15:26:56 2009 +0100
-@@ -117,6 +117,7 @@
- RPL_STATSVLINE 227 unreal */
+diff -r 1c62939e612b include/numeric.h
+--- a/include/numeric.h Wed Feb 04 17:58:50 2009 +0100
++++ b/include/numeric.h Wed Feb 04 18:04:57 2009 +0100
+@@ -118,6 +118,7 @@
#define RPL_STATSALINE 226 /* Hybrid, Undernet */
+ #define RPL_STATSWELCOME 227 /* QuakeNet extension */
#define RPL_STATSQLINE 228 /* Undernet extension */
+#define RPL_STATSSPLIT 229 /* QuakeNet extension */
+ #define RPL_STATSHEADER 230 /* QuakeNet extension */
/* RPL_SERVICEINFO 231 unused */
- /* RPL_ENDOFSERVICES 232 unused */
-@@ -177,6 +178,8 @@
+@@ -179,6 +180,8 @@
#define RPL_STATSDLINE 275 /* Undernet extension */
#define RPL_STATSRLINE 276 /* Undernet extension */
#define RPL_GLIST 280 /* Undernet extension */
#define RPL_ENDOFGLIST 281 /* Undernet extension */
#define RPL_JUPELIST 282 /* Undernet extension - jupe -Kev */
-@@ -440,6 +443,7 @@
- /* ERR_GHOSTEDCLIENT 503 efnet */
- /* ERR_VWORLDWARN 503 austnet */
+@@ -449,6 +452,7 @@
+
+ #define ERR_NOSUCHWELCOME 509 /* QuakeNet extension */
+#define ERR_NOSUCHSPLIT 510 /* QuakeNet extension */
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 2da61ac38fa1 include/split.h
+diff -r 1c62939e612b include/split.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/split.h Sun Jan 18 15:26:56 2009 +0100
-@@ -0,0 +1,121 @@
-+/* TODO: ifndef ? */
-+#ifndef INCLUDED_jupe_h
-+#define INCLUDED_jupe_h
++++ b/include/split.h Wed Feb 04 18:04:57 2009 +0100
+@@ -0,0 +1,109 @@
++#ifndef INCLUDED_split_h
++#define INCLUDED_split_h
+/*
+ * IRC - Internet Relay Chat, include/split.h
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ */
+/** @file
+ * @brief Interface and declarations for split server handling.
-+ * @version $Id: jupe.h 1208 2004-10-03 14:12:35Z entrope $
+ */
-+/* TODO: ifndef ? */
+#ifndef INCLUDED_sys_types_h
+#include <sys/types.h>
+#define INCLUDED_sys_types_h
+struct Client;
+struct StatDesc;
+
-+#define SPLIT_MAX_EXPIRE 604800 /**< Maximum split expiration time (7 days). */
-+#define SPLIT_AUTO_EXPIRE 604800 /**< Expireation time used for auto created entries. */
++#define SPLIT_MAX_EXPIRE 2419200 /**< Maximum split expiration time (4 weeks).
++ * that an operator can use in /SPLIT
++ */
++#define SPLIT_MAX_DRIFT 600 /**< Maximum drift in seconds allowed in lastmod
++ * timestamp
++ * when greater correct and throw warning
++ */
+
+/* Describes a SPLIT server entry. */
+struct Split {
+};
+
+/** Split state flags. */
-+#define SPLIT_ACTIVE 0x0001 /**< Split is active. */
-+#define SPLIT_REMOVING 0x0002 /**< Split is about to be destroyed. */
++#define SPLIT_ACTIVE 0x01 /**< Split is active. */
++#define SPLIT_REMOVING 0x02 /**< Split is being force removed (instead of deactivated). */
++#define SPLIT_BURST 0x04 /**< Split is for a server that is in progress of linking,
++ and will be destroyed at the end of burst */
+
-+/* TODO: these ; after } needed ? */
+/* Actions to perform on a SPLIT. */
+enum SplitAction {
+ SPLIT_ACTIVATE, /**< SPLIT should be activated. */
+ SPLIT_REMOVE /**< SPLIT should be removed. */
+};
+
-+/* TODO: what values to use here? */
+/* Split update flags. */
-+#define SPLIT_EXPIRE 0x0002 /**< Expiration time update. */
-+#define SPLIT_LIFETIME 0x0004 /**< Record lifetime update. */
-+#define SPLIT_REASON 0x0008 /**< Reason update. */
-+#define SPLIT_CREATION 0x0010 /**< Creation time update. */
-+#define SPLIT_MODIFY 0x0020 /**< No state change. */
++#define SPLIT_EXPIRE 0x01 /**< Expiration time update. */
++#define SPLIT_LIFETIME 0x02 /**< Record lifetime update. */
++#define SPLIT_REASON 0x04 /**< Reason update. */
+
+/* mask for Split update flags. */
+#define SPLIT_UPDATE (SPLIT_EXPIRE | SPLIT_LIFETIME | SPLIT_REASON)
+
+/* test whether a split entry is active. */
+#define SplitIsActive(s) ((s)->sp_flags & SPLIT_ACTIVE)
-+/* test whether a split entry is marked for forecd removal. */
-+#define SplitIsRemoving(s) ((s)->sp_flags & SPLIT_REMOVING)
-+
-+/* TODO: these are not used? some are, check! */
-+/* get the server name for a split entry. */
-+#define SplitServer(s) ((s)->sp_server)
-+/* get the reason for a split entry. */
-+#define SplitReason(s) ((s)->sp_reason)
-+/* get the creation time for split entry. */
-+#define SplitCreation(s) ((s)->sp_creation)
-+/* get the expiration time for split entry. */
-+#define SplitExpire(s) ((s)->sp_expire)
-+/* get the last modification time for split entry. */
-+#define SplitLastMod(s) ((s)->sp_lastmod)
-+/* get the life time for split entry. */
-+#define SplitLifeTime(s) ((s)->sp_lifetime)
++/* test whether a split entry is marked for forced removal. */
++#define SplitIsRemoving(s) ((s)->sp_flags & SPLIT_REMOVING)
++/* test whether a split entry is part of a netmerge. */
++#define SplitIsBurst(s) ((s)->sp_flags & SPLIT_BURST)
+
+extern int split_add(struct Client *cptr, struct Client *sptr,
+ char *server, const char *reason,
+extern void split_burst(struct Client *cptr);
+extern int split_resend(struct Client *cptr, struct Split *split);
+extern int split_list(struct Client *sptr, char *server);
-+extern int split_merge(struct Client *server);
-+extern int split_break(struct Client *server, const char *reason);
++extern void split_newserver(struct Client *acptr);
++extern int split_netmerge(struct Client *sptr);
++extern int split_netbreak(struct Client *victim, const char *reason);
+extern void split_conf();
+extern void split_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+extern int split_memory_count(size_t *sp_size);
+
-+/* TODO: endif ? */
-+#endif /* INCLUDED_jupe_h */
-diff -r 2da61ac38fa1 ircd/Makefile.in
---- a/ircd/Makefile.in Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/Makefile.in Sun Jan 18 15:26:56 2009 +0100
++#endif /* INCLUDED_split_h */
+diff -r 1c62939e612b ircd/Makefile.in
+--- a/ircd/Makefile.in Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/Makefile.in Wed Feb 04 18:04:57 2009 +0100
@@ -173,6 +173,7 @@
m_sethost.c \
m_settime.c \
m_silence.c \
+ m_split.c \
m_squit.c \
+ m_staff.c \
m_stats.c \
- m_time.c \
-@@ -212,6 +213,7 @@
+@@ -214,6 +215,7 @@
s_stats.c \
s_user.c \
send.c \
+ split.c \
uping.c \
userload.c \
- whocmds.c \
-@@ -1052,6 +1054,15 @@
+ welcome.c \
+@@ -1055,6 +1057,15 @@
../include/ircd_chattr.h ../include/list.h ../include/msg.h \
../include/numeric.h ../include/numnicks.h ../include/s_user.h \
../include/send.h ../include/struct.h
m_squit.o: m_squit.c ../config.h ../include/client.h \
../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
../include/ircd_events.h ../config.h ../include/ircd_handler.h \
-@@ -1325,6 +1336,7 @@
+@@ -1344,6 +1355,7 @@
../include/msgq.h ../include/numeric.h ../include/numnicks.h \
../include/res.h ../include/s_bsd.h ../include/s_conf.h \
../include/s_user.h ../include/s_stats.h ../include/send.h \
../include/struct.h ../include/sys.h ../include/whowas.h
s_err.o: s_err.c ../config.h ../include/numeric.h ../include/ircd_log.h \
../include/s_debug.h ../config.h ../include/ircd_defs.h
-@@ -1410,6 +1422,16 @@
+@@ -1429,6 +1441,16 @@
../include/msg.h ../include/numnicks.h ../include/parse.h \
../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
../include/s_user.h ../include/struct.h ../include/sys.h
uping.o: uping.c ../config.h ../include/uping.h ../include/ircd_defs.h \
../include/ircd_events.h ../config.h ../include/res.h \
../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r 2da61ac38fa1 ircd/ircd.c
---- a/ircd/ircd.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/ircd.c Sun Jan 18 15:26:56 2009 +0100
+diff -r 1c62939e612b ircd/client.c
+--- a/ircd/client.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/client.c Wed Feb 04 18:04:57 2009 +0100
+@@ -185,6 +185,7 @@
+ FlagSet(&privs_local, PRIV_DISPLAY);
+ FlagSet(&privs_local, PRIV_FORCE_LOCAL_OPMODE);
+ FlagSet(&privs_local, PRIV_LOCAL_WELCOME);
++ FlagSet(&privs_local, PRIV_SPLIT);
+ FlagClr(&privs_local, PRIV_STAFF);
+ FlagClr(&privs_local, PRIV_CLAIM_NICK);
+ FlagClr(&privs_local, PRIV_GLINE_LOOKUP);
+@@ -292,6 +293,7 @@
+ P(STAFF), P(CLAIM_NICK), P(GLINE_LOOKUP), P(HIDE_CHANS),
+ P(CHECK_CHANNEL),
+ P(WELCOME), P(LOCAL_WELCOME),
++ P(SPLIT),
+ #undef P
+ { 0, 0 }
+ };
+diff -r 1c62939e612b ircd/ircd.c
+--- a/ircd/ircd.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/ircd.c Wed Feb 04 18:04:57 2009 +0100
@@ -55,6 +55,7 @@
#include "s_misc.h"
#include "s_stats.h"
event_loop();
return 0;
-diff -r 2da61ac38fa1 ircd/ircd_features.c
---- a/ircd/ircd_features.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/ircd_features.c Sun Jan 18 15:26:56 2009 +0100
-@@ -363,6 +363,7 @@
- F_B(SETHOST, 0, 0, 0),
+diff -r 1c62939e612b ircd/ircd_features.c
+--- a/ircd/ircd_features.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/ircd_features.c Wed Feb 04 18:04:57 2009 +0100
+@@ -366,6 +366,10 @@
F_B(SETHOST_USER, 0, 0, 0),
F_B(SETHOST_AUTO, 0, 0, 0),
-+ F_B(SPLIT, 0, 1, 0),
++ /* SPLIT */
++ F_B(SPLIT, 0, 1, 0),
++ F_I(SPLIT_AUTO_EXPIRE, 0, 604800, 0),
++
/* HEAD_IN_SAND Features */
F_B(HIS_SNOTICES, 0, 1, 0),
-@@ -391,6 +392,7 @@
+ F_B(HIS_SNOTICES_OPER_ONLY, 0, 1, 0),
+@@ -374,6 +378,7 @@
+ F_B(HIS_MAP, 0, 1, 0),
+ F_B(HIS_LINKS, 0, 1, 0),
+ F_B(HIS_TRACE, 0, 1, 0),
++ F_B(HIS_SPLIT, 0, 1, 0),
+ F_B(HIS_STATS_a, 0, 1, 0),
+ F_B(HIS_STATS_c, 0, 1, 0),
+ F_B(HIS_STATS_d, 0, 1, 0),
+@@ -393,6 +398,7 @@
F_B(HIS_STATS_q, 0, 1, 0),
F_B(HIS_STATS_R, 0, 1, 0),
F_B(HIS_STATS_r, 0, 1, 0),
F_B(HIS_STATS_s, 0, 1, 0),
F_B(HIS_STATS_t, 0, 1, 0),
F_B(HIS_STATS_T, 0, 1, 0),
-diff -r 2da61ac38fa1 ircd/m_endburst.c
---- a/ircd/m_endburst.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/m_endburst.c Sun Jan 18 15:26:56 2009 +0100
+diff -r 1c62939e612b ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/ircd_lexer.l Wed Feb 04 18:04:57 2009 +0100
+@@ -175,6 +175,7 @@
+ { "check_channel", TPRIV_CHECK_CHANNEL },
+ { "local_welcome", TPRIV_LOCAL_WELCOME },
+ { "welcome", TPRIV_WELCOME },
++ { "split", TPRIV_SPLIT },
+ { NULL, 0 }
+ };
+ static int ntokens;
+diff -r 1c62939e612b ircd/ircd_log.c
+--- a/ircd/ircd_log.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/ircd_log.c Wed Feb 04 18:04:57 2009 +0100
+@@ -154,6 +154,7 @@
+ S(OPERMODE, -1, SNO_HACK4),
+ S(GLINE, -1, SNO_GLINE),
+ S(JUPE, -1, SNO_NETWORK),
++ S(SPLIT, -1, SNO_NETWORK),
+ S(WHO, -1, 0),
+ S(NETWORK, -1, SNO_NETWORK),
+ S(OPERKILL, -1, 0),
+diff -r 1c62939e612b ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/ircd_parser.y Wed Feb 04 18:04:57 2009 +0100
+@@ -193,6 +193,7 @@
+ %token TPRIV_STAFF TPRIV_CLAIM_NICK TPRIV_GLINE_LOOKUP TPRIV_HIDE_CHANS
+ %token TPRIV_CHECK_CHANNEL
+ %token TPRIV_LOCAL_WELCOME TPRIV_WELCOME
++%token TPRIV_SPLIT
+ /* and some types... */
+ %type <num> sizespec
+ %type <num> timespec timefactor factoredtimes factoredtime
+@@ -716,6 +717,7 @@
+ TPRIV_HIDE_CHANS { $$ = PRIV_HIDE_CHANS; } |
+ TPRIV_LOCAL_WELCOME { $$ = PRIV_LOCAL_WELCOME; } |
+ TPRIV_WELCOME { $$ = PRIV_WELCOME; } |
++ TPRIV_SPLIT { $$ = PRIV_SPLIT; } |
+ TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
+ yesorno: YES { $$ = 1; } | NO { $$ = 0; };
+
+diff -r 1c62939e612b ircd/m_endburst.c
+--- a/ircd/m_endburst.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/m_endburst.c Wed Feb 04 18:04:57 2009 +0100
@@ -85,6 +85,7 @@
#include "client.h"
#include "hash.h"
sendto_opmask_butone(0, SNO_NETWORK, "Completed net.burst from %C.",
sptr);
+ /* cleanup SPLITs, but only bother ops when FEAT_SPLIT is enabled. */
-+ split = split_merge(sptr);
++ split = split_netmerge(sptr);
+ if (feature_bool(FEAT_SPLIT))
+ sendto_opmask_butone(0, SNO_NETWORK, "Removed %d SPLIT entries.", split);
if (MyConnect(sptr))
sendcmdto_one(&me, CMD_END_OF_BURST_ACK, sptr, "");
-diff -r 2da61ac38fa1 ircd/m_reburst.c
---- a/ircd/m_reburst.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/m_reburst.c Sun Jan 18 15:26:56 2009 +0100
+diff -r 1c62939e612b ircd/m_reburst.c
+--- a/ircd/m_reburst.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/m_reburst.c Wed Feb 04 18:04:57 2009 +0100
@@ -102,6 +102,7 @@
#include "ircd_snprintf.h"
#include "gline.h"
default:
break;
}
-diff -r 2da61ac38fa1 ircd/m_split.c
+diff -r 1c62939e612b ircd/m_server.c
+--- a/ircd/m_server.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/m_server.c Wed Feb 04 18:04:57 2009 +0100
+@@ -47,6 +47,7 @@
+ #include "s_misc.h"
+ #include "s_serv.h"
+ #include "send.h"
++#include "split.h"
+ #include "userload.h"
+
+ /* #include <assert.h> -- Now using assert in ircd_log.h */
+@@ -764,6 +765,9 @@
+ sendto_opmask_butone(0, SNO_NETWORK, "Net junction: %s %s",
+ cli_name(sptr), cli_name(acptr));
+ }
++ /* new server - mark SPLIT for this server */
++ split_newserver(acptr);
++
+ /*
+ * Old sendto_serv_but_one() call removed because we now need to send
+ * different names to different servers (domain name matching).
+diff -r 1c62939e612b ircd/m_split.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_split.c Sun Jan 18 15:26:56 2009 +0100
-@@ -0,0 +1,374 @@
++++ b/ircd/m_split.c Wed Feb 04 18:04:57 2009 +0100
+@@ -0,0 +1,400 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_split.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
-+ * $Id: m_split.c 1737 2006-12-19 05:20:48Z entrope $
+ */
+
+/*
+ */
+int ms_split(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
-+ struct Client *acptr = 0;
+ struct Split *asplit = 0;
+ unsigned int flags = 0;
+ enum SplitAction action = SPLIT_MODIFY;
+ time_t creation = 0, expire = 0, lastmod = 0, lifetime = 0;
-+ char *server = parv[1], *tmp = 0;
++ char *server;
+ const char *reason = "No reason";
+
-+ /* TODO: perhaps make some fields optional? reason? */
-+ if (parc < 6)
++ /* reason is optional - for lazy services, we always send it */
++ if (parc < 5) {
++ protocol_violation(sptr, "Too few parameters for SPLIT (got %d - need at least 5)", parc);
+ return need_more_params(sptr, "SPLIT");
++ }
++
++ /* server param */
++ server = parv[1];
+
++ /* check for ! prefix - force removing */
+ if (*server == '!') {
+ server++;
-+ action = SPLIT_REMOVE; /* removing entry */
++ action = SPLIT_REMOVE;
+ }
-+
-+ switch (*server) { /* handle + and - */
-+ case '+': /* activate the split entry */
++
++ /* check for + and - prefix */
++ switch (*server) {
++ case '+':
+ if (action != SPLIT_REMOVE)
+ action = SPLIT_ACTIVATE;
+ server++;
+ break;
+
-+ case '-': /* deactivate the entry */
++ case '-':
+ if (action != SPLIT_REMOVE)
+ action = SPLIT_DEACTIVATE;
+ server++;
+ * it all together and convert the rest of the arguments.
+ */
+
-+ /* can't modify a split entry that doesn't exist, so remap to activate */
++ /* cannot modify a split entry that does not exist - remap to activate */
+ if (!asplit && action == SPLIT_MODIFY)
+ action = SPLIT_ACTIVATE;
+
-+ /* OK, let's figure out what other parameters we may have... */
++ /* set all flags for modification */
++ if (asplit && action != SPLIT_REMOVE)
++ flags = SPLIT_UPDATE;
++
++ /* set the things we need */
+ creation = atoi(parv[2]);
+ expire = atoi(parv[3]);
+ lastmod = atoi(parv[4]);
+ lifetime = atoi(parv[5]);
-+ reason = parv[parc - 1];
+
++ /* got a reason too */
++ if (parc > 5)
++ reason = parv[parc - 1];
++ else
++ flags &= ~SPLIT_REASON;
++
++ /* debug */
+ Debug((DEBUG_DEBUG, "I have a SPLIT I am acting upon now; "
+ "server %s, action %s, creation %Tu, expire %Tu, "
+ "lastmod %Tu, lifetime %Tu, reason: %s; split %s!", server,
+ creation, expire, lastmod, lifetime, reason,
+ asplit ? "EXISTS" : "does not exist"));
+
-+ /* OK, at this point, we have converted all available parameters.
-+ * Let's actually do the action!
-+ */
++ /* modify or remove an existing SPLIT */
+ if (asplit) {
+ if (action == SPLIT_REMOVE)
+ return split_remove(cptr, sptr, asplit, reason);
+ lastmod, lifetime, flags);
+ }
+
++ /* desynch or cross - we do not have it so we cannot remove it */
++ /* TODO: manually propagate the message ?
++ *
++ * but if we do not have it, can our downlinks have it?
++ * they could if my oper force removed it earlier, and then my downlinks linked
++ * no, then they would have bursted it again to us.. argh
++ */
++ if (!asplit && action == SPLIT_REMOVE)
++ return 0;
++
++ /* this should not happen */
+ assert(action != SPLIT_MODIFY);
++ assert(action != SPLIT_REMOVE);
+
++ /* create a new SPLIT */
+ return split_add(cptr, sptr, server, reason, creation, expire, lastmod, lifetime,
-+ flags | ((action == SPLIT_ACTIVATE) ? SPLIT_ACTIVE : 0));
++ action == SPLIT_ACTIVATE ? SPLIT_ACTIVE : 0);
+}
+
+
+ * parv[0] = Send prefix
+ * parv[1] = [Server or mask to match]
+ *
-+ * Add or modify entry: 3, 4 or 5 params (3 is * then)
++ * Add or modify entry: 2, 3 or 4 params
+ * parv[0] = Send prefix
+ * parv[1] = [+|-]<server name>
+ * parv[2] = [Expiration offset] (required for new)
+ */
+int mo_split(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
-+ struct Client *acptr = 0;
+ struct Split *asplit = 0;
+ unsigned int flags = 0;
+ enum SplitAction action = SPLIT_MODIFY;
-+ time_t expire = 0, lastmod = CurrentTime, creation = CurrentTime;
-+ char *server = parv[1], *end;
++ time_t expire = 0, lastmod = TStime(), creation = TStime();
++ char *server, *end;
+ const char *reason = NULL;
+
-+ if (parc < 2) {
-+ if (!HasPriv(sptr, PRIV_ROUTEINFO))
-+ return send_reply(sptr, ERR_NOPRIVILEGES);
-+ else
-+ return split_list(sptr, 0);
-+ }
++ /* TODO: check PRIV_SPLIT here? */
++ /* check HIS and privs */
++ if (feature_bool(FEAT_HIS_SPLIT) && !HasPriv(sptr, PRIV_ROUTEINFO))
++ return send_reply(sptr, ERR_NOPRIVILEGES);
+
++ /* listing */
++ if (parc < 2)
++ return split_list(sptr, 0);
++
++ /* set server */
++ server = parv[1];
++
++ /* ! prefix - force removal */
+ if (*server == '!') {
+ server++;
-+ action = SPLIT_REMOVE; /* force removal */
++ action = SPLIT_REMOVE;
+ }
+
-+ switch (*server) { /* handle + and - */
-+ case '+': /* activate the split entry */
++ /* handle + and - */
++ switch (*server) {
++ case '+':
+ if (action != SPLIT_REMOVE)
+ action = SPLIT_ACTIVATE;
+ server++;
+ break;
+
-+ case '-': /* deactivate the split entry */
++ case '-':
+ if (action != SPLIT_REMOVE)
+ action = SPLIT_DEACTIVATE;
+ server++;
+ break;
+ }
-+
-+ /* OK, let's figure out the parameters... */
-+ switch (action) {
-+ /* no specific action */
-+ case SPLIT_MODIFY:
-+ /* user wants a listing of a specific SPLIT */
-+ if (parc == 2)
-+ return split_list(sptr, server);
-+ expire = strtol(parv[2], &end, 10) + CurrentTime; /* and the expiration */
-+ if (*end != '\0')
-+ return send_reply(sptr, SND_EXPLICIT | ERR_BADEXPIRE,
-+ "%s :Bad expire time", parv[2]);
+
-+ flags |= SPLIT_EXPIRE; /* remember that we got an expire time */
-+
-+ if (parc > 3) { /* also got a reason... */
-+ reason = parv[parc - 1];
++ /* user wants listing */
++ if (action == SPLIT_MODIFY && parc == 2)
++ return split_list(sptr, server);
++
++ /* TODO: but allow force removal when disabled? */
++ /* check feature and privs */
++ if (!feature_bool(FEAT_SPLIT))
++ return send_reply(sptr, ERR_DISABLED, "SPLIT");
++ else if (!HasPriv(sptr, PRIV_SPLIT))
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
++ /* if we have an expire, this must be it */
++ if (parc > 2)
++ expire = strtol(parv[2], &end, 10);
++
++ /* got reason and expire */
++ if (parc > 3) {
++ flags |= SPLIT_EXPIRE;
++ flags |= SPLIT_REASON;
++ }
++ /* got reason or expire */
++ else if (parc > 2) {
++ if (*end != '\0')
+ flags |= SPLIT_REASON;
-+ }
-+ break;
-+
-+ case SPLIT_REMOVE: /* TODO: require reason for this, but not expire? */
-+ if (parc < 4)
-+ return need_more_params(sptr, "SPLIT");
++ else
++ flags |= SPLIT_EXPIRE;
++ }
++
++ /* set reason */
++ if (flags & SPLIT_REASON) {
+ reason = parv[parc - 1];
-+ flags |= SPLIT_REASON;
-+ break;
-+
-+ case SPLIT_ACTIVATE: /* TODO: require expire and reason when new */
-+ if (parc > 2) {
-+ expire = strtol(parv[2], &end, 10) + CurrentTime; /* and the expiration */
-+ if (*end != '\0')
-+ return send_reply(sptr, SND_EXPLICIT | ERR_BADEXPIRE,
-+ "%s :Bad expire time", parv[2]);
-+ flags |= SPLIT_EXPIRE; /* remember that we got an expire time */
-+ }
-+
-+ if (parc > 3) { /* also got a reason... */
-+ reason = parv[parc - 1];
-+ flags |= SPLIT_REASON;
-+ }
-+ break;
-+
-+ case SPLIT_DEACTIVATE: /* TODO: duplicate code? must be a cleaner way */
-+ if (parc > 2) {
-+ expire = strtol(parv[2], &end, 10) + CurrentTime; /* and the expiration */
-+ if (*end != '\0')
-+ return send_reply(sptr, SND_EXPLICIT | ERR_BADEXPIRE,
-+ "%s :Bad expire time", parv[2]);
-+ flags |= SPLIT_EXPIRE; /* remember that we got an expire time */
-+ }
-+
-+ if (parc > 3) { /* also got a reason... */
-+ reason = parv[parc - 1];
-+ flags |= SPLIT_REASON;
-+ }
-+ break;
++ /* ignore empty reason */
++ if (EmptyString(reason))
++ flags &= ~SPLIT_REASON;
+ }
-+
+
-+ /* check for permissions... */
-+ if (!feature_bool(FEAT_SPLIT)) /* TODO: but allow force removal? */
-+ return send_reply(sptr, ERR_DISABLED, "SPLIT");
-+ else if (!HasPriv(sptr, PRIV_SERVERINFO)) /* TODO: create PRIV_SPLIT - need help there */
-+ return send_reply(sptr, ERR_NOPRIVILEGES);
++ /* bad expire */
++ if (flags & SPLIT_EXPIRE && *end != '\0')
++ return send_reply(sptr, SND_EXPLICIT | ERR_BADEXPIRE, "%s :Bad expire time", parv[2]);
+
-+ /* Next, try to find the SPLIT... */
-+ asplit = split_find(server);
++ /* require a reason for forced removal */
++ if (!(flags & SPLIT_REASON) && action == SPLIT_REMOVE)
++ return need_more_params(sptr, "SPLIT");
+
-+ /* We now have all the pieces to tell us what we've got; let's put
-+ * it all together and convert the rest of the arguments.
-+ */
++ /* we got expire */
++ if (flags & SPLIT_EXPIRE) {
++ if (expire == 0) /* dummy value 0 given, no change to expire */
++ flags &= ~SPLIT_EXPIRE;
++ else /* turn expire into timestamp */
++ expire += TStime();
++ }
++
++ /* we have all we need - find the split */
++ asplit = split_find(server);
+
-+ /* SPLIT not found and thus we:
-+ * cannot remove SPLIT we do not have
-+ * cannot add new SPLIT without expire and reason
++ /* SPLIT not found and thus we cannot:
++ * remove SPLIT we do not have
++ * add new SPLIT without expire and reason
+ */
+ if (!asplit &&
+ ((action == SPLIT_REMOVE) ||
+ (action == SPLIT_MODIFY && !reason)))
+ return send_reply(sptr, ERR_NOSUCHSPLIT, server);
+
-+ /* can't modify a split entry that doesn't exist, so remap to activate */
++ /* cannot modify a split entry that does not exist - remap to activate */
+ if (!asplit && action == SPLIT_MODIFY)
+ action = SPLIT_ACTIVATE;
+
++ /* debug */
+ Debug((DEBUG_DEBUG, "I have a SPLIT I am acting upon now; "
+ "server %s, action %s, expire %Tu, "
+ "reason: %s; split %s! (fields present: %s %s)", server,
+ flags & SPLIT_EXPIRE ? "expire" : "",
+ flags & SPLIT_REASON ? "reason" : ""));
+
-+ if (asplit) { /* modifying an existing SPLIT */
++ /* modify or remove an existing SPLIT */
++ if (asplit) {
+ if (action == SPLIT_REMOVE)
+ return split_remove(cptr, sptr, asplit, reason);
+ return split_modify(cptr, sptr, asplit, action, reason,
+ asplit->sp_creation, expire, lastmod, asplit->sp_lifetime, flags);
+ }
+
++ /* this should not happen */
+ assert(action != SPLIT_MODIFY);
+ assert(action != SPLIT_REMOVE);
+
+ /* create a new SPLIT */
+ return split_add(cptr, sptr, server, reason,
+ creation, expire, lastmod, expire,
-+ flags | ((action == SPLIT_ACTIVATE) ? SPLIT_ACTIVE : 0));
++ (action == SPLIT_ACTIVATE) ? SPLIT_ACTIVE : 0);
+}
+
++
+/*
+ * m_split - user message handler
+ *
+ * parv[0] = Send prefix
-+ *
-+ * From user:
-+ *
+ * parv[1] = [<server name>]
+ *
+ */
+int m_split(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
++
++ /* ordinary users are not allowed to see it when HIS_SPLIT is true
++ * and are not allowed to to give more than two parameters
++ * to make changes
++ */
++ if (feature_bool(FEAT_HIS_SPLIT) || parc > 2)
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
++ /* listing all */
+ if (parc < 2)
+ return split_list(sptr, 0);
+
++ /* looking for a match */
+ return split_list(sptr, parv[1]);
+}
-diff -r 2da61ac38fa1 ircd/parse.c
---- a/ircd/parse.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/parse.c Sun Jan 18 15:26:56 2009 +0100
-@@ -505,6 +505,13 @@
- 0, MAXPARA, MFLG_SLOW, 0, NULL,
- /* UNREG, CLIENT, SERVER, OPER, SERVICE */
- { m_unregistered, m_not_oper, ms_jupe, mo_jupe, m_ignore }
-+ },
-+ {
+diff -r 1c62939e612b ircd/parse.c
+--- a/ircd/parse.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/parse.c Wed Feb 04 18:04:57 2009 +0100
+@@ -513,6 +513,13 @@
+ { m_unregistered, m_not_oper, ms_jupe, mo_jupe, m_ignore, mh_jupe }
+ },
+ {
+ MSG_SPLIT,
+ TOK_SPLIT,
+ 0, MAXPARA, MFLG_SLOW, 0, NULL,
-+ /* UNREG, CLIENT, SERVER, OPER, SERVICE */
-+ { m_unregistered, m_not_oper, ms_split, mo_split, m_ignore }
- },
- {
++ /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
++ { m_unregistered, m_split, ms_split, mo_split, m_ignore, mh_nohelp }
++ },
++ {
MSG_OPMODE,
-diff -r 2da61ac38fa1 ircd/s_conf.c
---- a/ircd/s_conf.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/s_conf.c Sun Jan 18 15:26:56 2009 +0100
+ TOK_OPMODE,
+ 0, MAXPARA, MFLG_SLOW, 0, NULL,
+diff -r 1c62939e612b ircd/s_conf.c
+--- a/ircd/s_conf.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/s_conf.c Wed Feb 04 18:04:57 2009 +0100
@@ -53,6 +53,7 @@
#include "s_debug.h"
#include "s_misc.h"
return ret;
}
-diff -r 2da61ac38fa1 ircd/s_debug.c
---- a/ircd/s_debug.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/s_debug.c Sun Jan 18 15:26:57 2009 +0100
+diff -r 1c62939e612b ircd/s_debug.c
+--- a/ircd/s_debug.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/s_debug.c Wed Feb 04 18:04:57 2009 +0100
@@ -48,6 +48,7 @@
#include "s_user.h"
#include "s_stats.h"
gl = 0, /* glines */
- ju = 0; /* jupes */
+ ju = 0, /* jupes */
-+ sp = 0; /* split entries */
++ sp = 0; /* splits */
size_t chm = 0, /* memory used by channels */
chbm = 0, /* memory used by channel bans */
wwm = 0, /* whowas array memory used */
glm = 0, /* memory used by glines */
jum = 0, /* memory used by jupes */
-+ spm = 0, /* memory used by split entries */
++ spm = 0, /* memory used by splits */
com = 0, /* memory used by conf lines */
dbufs_allocated = 0, /* memory used by dbufs */
dbufs_used = 0, /* memory used by dbufs */
send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
":Hash: client %d(%zu), chan is the same", HASHSIZE,
-diff -r 2da61ac38fa1 ircd/s_err.c
---- a/ircd/s_err.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/s_err.c Sun Jan 18 15:26:57 2009 +0100
+diff -r 1c62939e612b ircd/s_err.c
+--- a/ircd/s_err.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/s_err.c Wed Feb 04 18:04:57 2009 +0100
@@ -490,7 +490,7 @@
/* 228 */
{ RPL_STATSQLINE, "Q %s :%s", "228" },
- { 0 },
+ { RPL_STATSSPLIT, "S %s %d %d %d %d %c :%s", "229" },
/* 230 */
- { 0 },
+ { RPL_STATSHEADER, 0, "230" },
/* 231 */
@@ -588,9 +588,9 @@
/* 277 */
- { 0 },
+ { RPL_ENDOFSPLITLIST, ":End of Split List", "279" },
/* 280 */
- { RPL_GLIST, "%s%s%s%s%s %Tu %Tu %Tu %s %s%c :%s", "280" },
+ { RPL_GLIST, "%s%s%s%s%s %Tu %Tu %Tu %s %s%s%c :%s", "280" },
/* 281 */
@@ -1052,7 +1052,7 @@
/* 509 */
- { 0 },
+ { ERR_NOSUCHWELCOME, "%s :No such welcome", "509" },
/* 510 */
- { 0 },
+ { ERR_NOSUCHSPLIT, "%s :No such split", "510" },
/* 511 */
{ ERR_SILELISTFULL, "%s :Your silence list is full", "511" },
/* 512 */
-diff -r 2da61ac38fa1 ircd/s_misc.c
---- a/ircd/s_misc.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/s_misc.c Sun Jan 18 15:26:57 2009 +0100
+diff -r 1c62939e612b ircd/s_misc.c
+--- a/ircd/s_misc.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/s_misc.c Wed Feb 04 18:04:57 2009 +0100
@@ -53,6 +53,7 @@
#include "s_stats.h"
#include "s_user.h"
assert(killer);
if (MyConnect(victim))
{
-@@ -497,6 +499,14 @@
+@@ -497,6 +499,15 @@
sendto_opmask_butone(0, SNO_NETWORK, "Net break: %C %C (%s)",
cli_serv(victim)->up, victim, comment);
dump_map(victim, "*", 0, report_lost_links, 0);
+ if (feature_bool(FEAT_SPLIT)) {
++ /* TODO: remote & local SQUIT ? servername oper is on? */
+ ircd_snprintf(0, splitreason, sizeof(splitreason),
+ "Net break: %C %C (%s%s%s%s)", cli_serv(victim)->up, victim,
+ IsUser(killer) ? "SQUIT by " : "", IsUser(killer) ? cli_name(killer) : "",
+ IsUser(killer) ? ": " : "", comment);
+ sendto_opmask_butone(0, SNO_NETWORK, "Created %d SPLIT entries.",
-+ split_break(victim, splitreason));
++ split_netbreak(victim, splitreason));
+ }
}
/*
-diff -r 2da61ac38fa1 ircd/s_serv.c
---- a/ircd/s_serv.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/s_serv.c Sun Jan 18 15:26:57 2009 +0100
+diff -r 1c62939e612b ircd/s_serv.c
+--- a/ircd/s_serv.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/s_serv.c Wed Feb 04 18:04:57 2009 +0100
@@ -54,6 +54,7 @@
#include "s_misc.h"
#include "s_user.h"
#include "struct.h"
#include "sys.h"
#include "userload.h"
-@@ -196,6 +197,7 @@
+@@ -197,6 +198,7 @@
*/
gline_burst(cptr);
jupe_burst(cptr);
+ split_burst(cptr);
+ welcome_burst(cptr);
/*
- * Pass on my client information to the new server
-diff -r 2da61ac38fa1 ircd/s_stats.c
---- a/ircd/s_stats.c Sun Jan 18 14:18:36 2009 +0100
-+++ b/ircd/s_stats.c Sun Jan 18 15:26:57 2009 +0100
+diff -r 1c62939e612b ircd/s_stats.c
+--- a/ircd/s_stats.c Wed Feb 04 17:58:50 2009 +0100
++++ b/ircd/s_stats.c Wed Feb 04 18:04:57 2009 +0100
@@ -52,6 +52,7 @@
#include "s_stats.h"
#include "s_user.h"
+#include "split.h"
#include "struct.h"
#include "userload.h"
-
-@@ -633,7 +634,10 @@
+ #include "welcome.h"
+@@ -669,7 +670,10 @@
send_usage, 0,
"System resource usage (Debug only)." },
#endif
stats_sline, 0,
"Spoofed hosts information." },
{ 'T', "motds", (STAT_FLAG_OPERFEAT | STAT_FLAG_CASESENS), FEAT_HIS_STATS_T,
-diff -r 2da61ac38fa1 ircd/split.c
+diff -r 1c62939e612b ircd/split.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/split.c Sun Jan 18 15:26:57 2009 +0100
-@@ -0,0 +1,746 @@
++++ b/ircd/split.c Wed Feb 04 18:04:57 2009 +0100
+@@ -0,0 +1,873 @@
+/*
+ * IRC - Internet Relay Chat, ircd/split.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ */
+/** @file
+ * @brief Implementation of split server handling functions.
-+ * @version $Id: split.c 1633 2006-03-25 03:46:56Z entrope $
+ */
+#include "config.h"
+
+#include "ircd_features.h"
+#include "ircd_log.h"
+#include "ircd_reply.h"
++#include "ircd_snprintf.h"
+#include "ircd_string.h"
+#include "list.h"
+#include "match.h"
+ unsigned int flags)
+{
+ struct Split *asplit;
++ char sp_server[HOSTLEN+1];
++ char sp_reason[TOPICLEN+1];
+
-+ asplit = (struct Split*) MyMalloc(sizeof(struct Split)); /* alloc memory */
++ /* alloc memory */
++ asplit = (struct Split*) MyMalloc(sizeof(struct Split));
++
++ /* we should have it now */
+ assert(0 != asplit);
+
+ memset(asplit, 0, sizeof(*asplit));
-+ /* TODO: some limit for servername length? HOSTLEN? */
-+ DupString(asplit->sp_server, server); /* copy vital information */
-+ /* TODO: some limit for reason length? QUITLEN TOPICLEN? */
-+ DupString(asplit->sp_reason, reason);
-+ /* TODO: what we use creation for and do we need it? */
++ ircd_strncpy(sp_server, server, HOSTLEN);
++ DupString(asplit->sp_server, sp_server);
++ /* TODO: prefix the reason here with the opername/ID? */
++ ircd_strncpy(sp_reason, reason, TOPICLEN);
++ DupString(asplit->sp_reason, sp_reason);
+ asplit->sp_creation = creation;
+ asplit->sp_expire = expire;
-+ /* TODO: are we using nettime etc.? CurrentTime is used. */
+ asplit->sp_lastmod = lastmod;
+ asplit->sp_lifetime = lifetime;
-+ /* CHECK: does this make it active upon creation regardless of the flags given? */
-+ asplit->sp_flags = flags & SPLIT_ACTIVE; /* set split flags */
++ /* set split flags - only save SPLIT_ACTIVE */
++ asplit->sp_flags = flags & SPLIT_ACTIVE;
+
-+ asplit->sp_next = GlobalSplitList; /* link it into the list */
++ /* link it into the list */
++ asplit->sp_next = GlobalSplitList;
+ asplit->sp_prev_p = &GlobalSplitList;
+ if (GlobalSplitList)
+ GlobalSplitList->sp_prev_p = &asplit->sp_next;
+ return asplit;
+}
+
++
+/** Forward a split entry to another server.
+ * @param[in] cptr Local client that sent us the split entry.
+ * @param[in] sptr Originator of the split entry.
+ SplitIsActive(split) && !SplitIsRemoving(split) ? '+' : '-', /* always !- not !+ */
+ split->sp_server, split->sp_creation, split->sp_expire,
+ split->sp_lastmod, split->sp_lifetime,
-+ reason != NULL ? reason : split->sp_reason);
++ EmptyString(reason) ? split->sp_reason : reason);
+}
+
++
+/** Add a new server split entry.
+ * @param[in] cptr Local client that sent us the split entry.
+ * @param[in] sptr Originator of the split entry.
+ unsigned int flags)
+{
+
-+ /* TODO: check for proper masks - at least one dot and no wildcards? */
-+ struct Split *asplit;
-+ struct Client *acptr;
++ struct Split *split;
++ char noreason[BUFSIZE];
++ static time_t rate;
+
-+ assert(0 != server);
-+ assert(0 != reason);
+ assert(NULL != cptr);
+ assert(NULL != sptr);
++ assert(NULL != server);
++ assert(NULL != reason);
+
++ /* debug */
+ Debug((DEBUG_DEBUG, "split_add(\"%s\", \"%s\", \"%s\", \"%s\", %Tu, %Tu, %Tu, "
+ "%Tu, 0x%04x)", cli_name(cptr), cli_name(sptr), server, reason,
+ creation, expire, lastmod, lifetime, flags));
+ * otherwise ignore - SERVER and SPLIT messages can cross,
+ * or a server is bursting and it will see our end and destroy the SPLITs
+ */
-+ if ((acptr = FindServer(server))) {
++ if (FindServer(server)) {
+ if (MyUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :Cannot add SPLIT %s - server is linked.", sptr, server);
++ "%C :SPLIT: Cannot add SPLIT %s - server is linked.", sptr, server);
+ return 0;
+ }
+
+ * You cannot set a negative (or zero) duration, nor can you set an
+ * duration greater than SPLIT_MAX_EXPIRE.
+ */
-+ if (expire - CurrentTime <= 0 || expire - CurrentTime > SPLIT_MAX_EXPIRE) {
-+ if (!IsServer(cptr) && MyConnect(cptr))
-+ return send_reply(cptr, ERR_BADEXPIRE, expire - CurrentTime);
-+ if (expire <= CurrentTime) /* no point going further */
-+ /* TODO: check lifetime then ? because the SPLIT may simply be deactivated
-+ * and we did not see it before
-+ * if it were to be activated again we would get it again
-+ * but should we not keep the same state on each server?
-+ */
++ if (expire - TStime() <= 0 || expire - TStime() > SPLIT_MAX_EXPIRE) {
++ if (MyUser(sptr))
++ return send_reply(cptr, ERR_BADEXPIRE, expire - TStime());
++ if (lifetime <= TStime()) /* no point going further */
+ /* CHECK: sptr may have the wrong idea about the nettime?
+ * or we could be wrong?
-+ * SETTIME ? could be dangerous and mess up things..
+ * perhaps raise some sort of warning to ops
-+ * maybe if the difference is larger than a poor RTT over the network?
-+ * 60 seconds?
-+ * no no no! - see above
+ */
+ return 0;
+ }
+
-+ /* inform ops and log it */
++ /* empty reason */
++ if (EmptyString(reason))
++ ircd_snprintf(0, noreason, sizeof(noreason), "%C gave no reason.", sptr);
++
++ /* lastmod is more than SPLIT_MAX_DRIFT seconds ahead of our idea of time
++ * correct and warn ops
++ */
++ if (lastmod - TStime() > SPLIT_MAX_DRIFT) {
++ sendto_opmask_butone_ratelimited(0, SNO_NETWORK, &rate,
++ "Possible timestamp drift from %C; lastmod in SPLIT message is %is ahead of time",
++ IsServer(sptr) ? sptr : cli_user(sptr)->server, lastmod - TStime());
++ lastmod = TStime() + SPLIT_MAX_DRIFT;
++ }
++
++ /* make the split entry */
++ split = split_make(server, EmptyString(reason) ? noreason : reason,
++ creation, expire, lastmod, lifetime, flags);
++
++ /* got to have it now */
++ assert(split);
++
++ /* inform ops */
+ sendto_opmask_butone(0, SNO_NETWORK, "%s adding%sSPLIT for %s, expiring at %Tu: %s",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-+ cli_name(sptr) : cli_name((cli_user(sptr))->server),
-+ !(flags & SPLIT_ACTIVE) ? " deactivated " : " ",
-+ server, expire, reason);
++ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
++ SplitIsActive(split) ? " " : " deactivated ",
++ split->sp_server, split->sp_expire, split->sp_reason);
+
-+ /* TODO: add SPLIT log stuff or use JUPE? */
-+ log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
++ /* log it */
++ log_write(LS_SPLIT, L_INFO, LOG_NOSNOTICE,
+ "%#C adding%sSPLIT for %s, expiring at %Tu: %s",
-+ sptr, !(flags & SPLIT_ACTIVE) ? " deactivated " : " ",
-+ server, expire, reason);
-+
-+ /* make the split entry */
-+ asplit = split_make(server, reason, creation, expire, lastmod, lifetime, flags);
-+
-+ assert(asplit);
++ sptr, SplitIsActive(split) ? " " : " deactivated ",
++ split->sp_server, split->sp_expire, split->sp_reason);
+
+ /* and propagate it */
-+ split_propagate(cptr, sptr, asplit, NULL);
++ split_propagate(cptr, sptr, split, NULL);
+
+ return 0;
+}
+ * @param[in] cptr Client that sent us the split modification.
+ * @param[in] sptr Client that originated the split modification.
+ * @param[in] split Split entry being modified.
-+ * @param[in] action Resultant status of the G-line.
++ * @param[in] action Resultant status of the SPLIT.
+ * @param[in] reason Reason.
+ * @param[in] expire Expiration time.
+ * @param[in] lastmod Last modification time.
+ time_t creation, time_t expire, time_t lastmod, time_t lifetime,
+ unsigned int flags)
+{
-+ struct Client* acptr;
+ char buf[BUFSIZE];
++ char sp_reason[TOPICLEN+1];
+ int pos = 0;
++ static time_t rate;
+
-+ assert(split);
+ assert(NULL != cptr);
+ assert(NULL != sptr);
++ assert(NULL != split);
+
-+ /* TODO: add action in the debug notice too */
-+ Debug((DEBUG_DEBUG, "split_modify(\"%s\", \"%s\", \"%s\", \"%s\", %Tu, %Tu, %Tu, "
-+ "%Tu, 0x%04x)", cli_name(cptr), cli_name(sptr), split->sp_server, reason,
++ /* debug */
++ Debug((DEBUG_DEBUG, "split_modify(cptr \"%s\", sptr \"%s\", split \"%s\", reason \"%s\","
++ " action %d, creation %Tu, expire %Tu, lastmod %Tu, lifetime %Tu, flags 0x%04x)",
++ cli_name(cptr), cli_name(sptr), split->sp_server, reason, action,
+ creation, expire, lastmod, lifetime, flags));
+
+ /* not modifying SPLIT for server that is linked
+ * and not when a server is introduced.
+ * so between net junction and end of burst,
+ * we can get SPLITs for a linked server.
++ * also more than one server can be bursting at a time.
+ */
-+ /* TODO: should we free it here or let that be done in end of burst?
-+ * only when that is the ONLY situation we can get to this point!
-+ * but if we free here and it is a burst, the count is incorrect in
-+ * split_netmerge
-+ * IsBurst() is that true for only that single server or for all its downlinks?
-+ * I would guess single server only.. argh!
-+ */
-+ if ((acptr = FindServer(split->sp_server))) {
++ if (FindServer(split->sp_server)) {
+ if (MyUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :Cannot modify SPLIT %s - server is linked.", sptr, split->sp_server);
-+ split_free(split); /* and free it */
++ "%C :SPLIT: Cannot modify SPLIT %s - server is linked.", sptr, split->sp_server);
++
++ /* SPLIT is not for a server part of a netmerge - free it */
++ if (!SplitIsBurst(split))
++ split_free(split);
+ return 0;
+ }
-+
-+ /* First, let's check lastmod... */
-+ if (SplitLastMod(split) > lastmod) { /* we have a more recent version */
++
++ /* check lastmod */
++ /* check if my oper modifies the SPLIT
++ * in which case use the greater of lastmod and split->sp_lastmod+1
++ *
++ * because if the lastmod of the split is in the future (greater than TStime())
++ * my oper cannot modify it when we use TStime() as lastmod
++ * therefore use split->sp_lastmod+1 - ugly hack, but the only way in that situation
++ * to modify it, apart from force removing it first..
++ */
++ if (MyUser(sptr))
++ lastmod = IRCD_MAX(lastmod, split->sp_lastmod + 1);
++ /* we have a more recent version */
++ if (split->sp_lastmod > lastmod) {
++ /* middle of a burst, it will resync on its own */
+ if (IsBurstOrBurstAck(cptr))
-+ return 0; /* middle of a burst, it'll resync on its own */
-+ return split_resend(cptr, split); /* resync the server */
-+ } else if (SplitLastMod(split) == lastmod)
-+ return 0; /* we have that version of the split entry... */
-+
-+ /* All right, we know that there's a change of some sort. What is it? */
-+ /* first, check out the expiration time... */
-+ /* TODO: expire != 0 or NULL - check that we have something? */
-+ if (expire != 0 && expire != split->sp_expire) {
-+ if (expire - CurrentTime <= 0 || expire - CurrentTime > SPLIT_MAX_EXPIRE) {
-+ if (!IsServer(sptr) && MyConnect(sptr)) /* bad expiration time */
-+ send_reply(sptr, ERR_BADEXPIRE, expire - CurrentTime);
-+ if (expire - CurrentTime <= 0) /* no point in going further */
-+ /* TODO: same as in split_add - check lifetime? */
-+ return 0;
-+ }
-+ flags |= SPLIT_EXPIRE;
-+ } else
-+ flags &= ~SPLIT_EXPIRE;
-+
-+ /* Next, check out lifetime */
++ return 0;
++ /* resync the server */
++ return split_resend(cptr, split);
++ /* same version */
++ } else if (split->sp_lastmod == lastmod)
++ return 0;
++
++ /* lastmod is more than SPLIT_MAX_DRIFT seconds ahead of our idea of time
++ * correct and warn ops
++ *
++ * not in case it is my oper
++ * we use the lastmod of either TStime() or the lastmod we have plus 1 second
++ * see above
++ */
++ if (lastmod - TStime() > SPLIT_MAX_DRIFT && !MyUser(sptr)) {
++ sendto_opmask_butone_ratelimited(0, SNO_NETWORK, &rate,
++ "Possible timestamp drift from %C; lastmod in SPLIT message is %is ahead of time",
++ IsServer(sptr) ? sptr : cli_user(sptr)->server, lastmod - TStime());
++ lastmod = TStime() + SPLIT_MAX_DRIFT;
++ }
++
++ /* we got here so there is a change of some sort */
++
++ /* check out the expiration time */
++ if (flags & SPLIT_EXPIRE) {
++ if (expire != split->sp_expire) {
++ /* bad expiration time */
++ if (MyUser(sptr) && (expire < TStime() || expire - TStime() > SPLIT_MAX_EXPIRE))
++ return send_reply(sptr, ERR_BADEXPIRE, expire - TStime());
++ /* expire timestamp is in the past, so remap to deactivate */
++ if (expire < TStime() && action == SPLIT_ACTIVATE)
++ action = SPLIT_DEACTIVATE;
++ } else
++ flags &= ~SPLIT_EXPIRE;
++ }
++
++ /* check out lifetime */
+ if (!(flags & SPLIT_LIFETIME) || !lifetime)
+ lifetime = split->sp_lifetime; /* use Split lifetime */
+
-+ lifetime = IRCD_MAX(lifetime, expire); /* set lifetime to the max */
++ /* raise lifetime when required */
++ lifetime = IRCD_MAX(lifetime, expire);
+
-+ /* OK, let's see which is greater... */
++ /* SPLIT already expired with this lifetime */
++ if (lifetime - TStime() <= 0)
++ return 0;
++
++ /* check if lifetime needs to be updated */
+ if (lifetime > split->sp_lifetime)
-+ flags |= SPLIT_LIFETIME; /* have to update lifetime */
++ flags |= SPLIT_LIFETIME;
+ else {
-+ flags &= ~SPLIT_LIFETIME; /* no change to lifetime */
++ flags &= ~SPLIT_LIFETIME;
+ lifetime = 0;
+ }
-+
-+ /* Finally, let's see if the reason needs to be updated */
-+ /* TODO: (reason) or use != NULL / 0 ? */
-+ if ((flags & SPLIT_REASON) && reason &&
-+ ircd_strcmp(split->sp_reason, reason) != 0)
-+ flags &= ~SPLIT_REASON; /* no changes to the reason */
+
-+ /* OK, now let's take a look at the action... */
++ /* no changes to the reason - empty or the same */
++ if ((flags & SPLIT_REASON) &&
++ (EmptyString(reason) || !ircd_strcmp(split->sp_reason, reason)))
++ flags &= ~SPLIT_REASON;
++
++ /* no status change
++ * activate but split is active
++ * deactivate but split is deactivated
++ * expire timestamp is in the past so it should be deactivated
++ * and cannot be activated anymore
++ */
+ if ((action == SPLIT_ACTIVATE && SplitIsActive(split)) ||
+ (action == SPLIT_DEACTIVATE && !SplitIsActive(split)) ||
-+ /* can't activate an expired split entry */
-+ (IRCD_MAX(split->sp_expire, expire) <= CurrentTime))
-+ action = SPLIT_MODIFY; /* no activity state modifications */
++ (IRCD_MAX(split->sp_expire, expire) <= TStime()))
++ action = SPLIT_MODIFY;
+
++ /* debug */
+ Debug((DEBUG_DEBUG, "About to perform changes; flags 0x%04x, action %s",
+ flags, action == SPLIT_ACTIVATE ? "SPLIT_ACTIVATE" :
+ (action == SPLIT_DEACTIVATE ? "SPLIT_DEACTIVATE" :
+ (action == SPLIT_MODIFY ? "SPLIT_MODIFY" : "<UNKNOWN>"))));
+
-+ /* If there are no changes to perform, do no changes */
-+ if (!(flags & SPLIT_UPDATE) && action == SPLIT_MODIFY)
++ /* nothing to change at all */
++ if (!(flags & SPLIT_UPDATE) && action == SPLIT_MODIFY) {
++ if (MyUser(sptr))
++ sendcmdto_one(&me, CMD_NOTICE, sptr,
++ "%C :SPLIT: Cannot modify SPLIT %s - nothing to change.", sptr, split->sp_server);
+ return 0;
++ }
+
-+ /* Start by updating lastmod, if indicated... */
++ /* update lastmod */
+ split->sp_lastmod = lastmod;
+
-+ /* Then move on to activity status changes... */
-+ switch (action) {
-+ case SPLIT_ACTIVATE: /* activating split entry */
-+ split->sp_flags |= SPLIT_ACTIVE; /* make it active... */
++
++ /* activating split entry */
++ if (action == SPLIT_ACTIVATE) {
++ split->sp_flags |= SPLIT_ACTIVE;
+ pos += ircd_snprintf(0, buf, sizeof(buf), " activating SPLIT");
-+ break;
++ }
+
-+ case SPLIT_DEACTIVATE: /* deactivating split entry */
-+ split->sp_flags &= ~SPLIT_ACTIVE; /* make it inactive... */
++ /* deactivating split entry */
++ if (action == SPLIT_DEACTIVATE) {
++ split->sp_flags &= ~SPLIT_ACTIVE;
+ pos += ircd_snprintf(0, buf, sizeof(buf), " deactivating SPLIT");
-+ break;
-+
-+ case SPLIT_MODIFY: /* no change to activity status */
-+ break;
+ }
+
-+ /* Handle expiration changes... */
++
++ /* update expire */
+ if (flags & SPLIT_EXPIRE) {
-+ split->sp_expire = expire; /* save new expiration time */
++ split->sp_expire = expire;
+ if (pos < BUFSIZE)
+ pos += ircd_snprintf(0, buf + pos, sizeof(buf) - pos,
+ "%s%s changing expiration time to %Tu",
+ " and" : "", expire);
+ }
+
-+ /* Next, handle lifetime changes... */
++ /* update lifetime */
+ if (flags & SPLIT_LIFETIME) {
-+ split->sp_lifetime = lifetime; /* save new lifetime */
++ split->sp_lifetime = lifetime;
+ if (pos < BUFSIZE)
+ pos += ircd_snprintf(0, buf + pos, sizeof(buf) - pos,
+ "%s%s extending record lifetime to %Tu",
+ " and" : "", lifetime);
+ }
+
-+ /* Now, handle reason changes... */
++ /* update reason */
+ if (flags & SPLIT_REASON) {
-+ MyFree(split->sp_reason); /* release old reason */
-+ DupString(split->sp_reason, reason); /* store new reason */
++ MyFree(split->sp_reason);
++ ircd_strncpy(sp_reason, reason, TOPICLEN);
++ DupString(split->sp_reason, sp_reason);
+ if (pos < BUFSIZE)
+ pos += ircd_snprintf(0, buf + pos, sizeof(buf) - pos,
+ "%s%s changing reason to \"%s\"",
-+ pos ? ";" : "", pos ? " and" : "", reason);
++ pos ? ";" : "", pos ? " and" : "", sp_reason);
+ }
+
-+ /* All right, inform ops... */
++ /* inform ops */
+ sendto_opmask_butone(0, SNO_NETWORK, "%s modifying SPLIT for %s:%s",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-+ cli_name(sptr) : cli_name((cli_user(sptr))->server),
++ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
+ split->sp_server, buf);
+
-+ /* TODO: add SPLIT log stuff or use JUPE? */
-+ /* and log the change */
-+ log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
++ /* log it */
++ log_write(LS_SPLIT, L_INFO, LOG_NOSNOTICE,
+ "%#C modifying SPLIT for %s:%s",
+ sptr, split->sp_server, buf);
+
+int
+split_remove(struct Client *cptr, struct Client *sptr, struct Split *split, const char *reason)
+{
-+ unsigned int saveflags = 0;
-+
-+ assert(0 != split);
+ assert(NULL != cptr);
+ assert(NULL != sptr);
++ assert(NULL != split);
++ assert(NULL != reason);
+
++ /* debug */
+ Debug((DEBUG_DEBUG, "split_remove(\"%s\", \"%s\", \"%s\", \"%s\")",
+ cli_name(cptr), cli_name(sptr), split->sp_server, reason));
+
+ /* deactivate entry and mark it for removal (used in split_propagate) */
+ split->sp_flags |= SPLIT_REMOVING;
-+ /* CHECK: turn bit SPLIT_ACTIVE off? */
-+ split->sp_flags |= SPLIT_ACTIVE;
++ split->sp_flags &= ~SPLIT_ACTIVE;
+
-+ /* inform ops and log it */
++ /* inform ops */
+ sendto_opmask_butone(0, SNO_NETWORK, "%s removing SPLIT for %s, expiring at %Tu: %s (%s)",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
-+ cli_name(sptr) : cli_name((cli_user(sptr))->server),
++ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
+ split->sp_server, split->sp_expire, split->sp_reason, reason);
+
-+ /* TODO: add SPLIT log stuff or use JUPE? */
-+ log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
++ /* log it */
++ log_write(LS_SPLIT, L_INFO, LOG_NOSNOTICE,
+ "%#C removing SPLIT for %s, expiring at %Tu: %s (%s)",
+ sptr, split->sp_server, split->sp_expire, split->sp_reason, reason);
+
-+ /* TODO: the reason supplied for removing this SPLIT does not go upstream
-+ * either propagate manually here, or update the record or?
-+ */
+ /* propagate it */
+ split_propagate(cptr, sptr, split, reason);
+
+ struct Split* split;
+ struct Split* ssplit;
+
-+ for (split = GlobalSplitList; split; split = ssplit) { /* go through splits */
++ /* go over SPLITs */
++ for (split = GlobalSplitList; split; split = ssplit) {
+ ssplit = split->sp_next;
+
-+ if (split_expire(split)) /* expire any that need expiring */
++ /* expire any that need expiring */
++ if (split_expire(split))
+ split_free(split);
-+ else if (0 == ircd_strcmp(server, split->sp_server)) /* found it yet? */
++
++ /* found it */
++ else if (0 == ircd_strcmp(server, split->sp_server))
+ return split;
+ }
-+ /* TODO: we return 0 not NULL? */
-+ return 0;
++
++ /* nothing found */
++ return NULL;
+}
+
++
+/** Unlink and free an unused split entry.
+ * @param[in] split Server split entry to free.
+ */
+void
+split_free(struct Split* split)
+{
-+ /* TODO: use 0 or NULL ? */
-+ assert(0 != split);
++ assert(NULL != split);
+
-+ *split->sp_prev_p = split->sp_next; /* squeeze this split entry out */
++ /* squeeze this split entry out */
++ *split->sp_prev_p = split->sp_next;
+ if (split->sp_next)
+ split->sp_next->sp_prev_p = split->sp_prev_p;
+
-+ /* CHECK: the other fields in this struct are destroyed with MyFree() call? */
-+ MyFree(split->sp_server); /* and free up the memory */
++ /* and free up the memory */
++ MyFree(split->sp_server);
+ MyFree(split->sp_reason);
+ MyFree(split);
+}
+int
+split_expire(struct Split* split)
+{
-+ assert(0 != split);
++ assert(NULL != split);
+
++ /* TODO: also check if the server in SPLIT entry is linked atm? */
+ /* past lifetime */
-+ if (split->sp_lifetime <= CurrentTime)
++ if (split->sp_lifetime <= TStime())
+ return 1;
+
+ /* past expire time, deactivate entry if it is active */
-+ if ((split->sp_expire <= CurrentTime) && SplitIsActive(split))
-+ /* CHECK: turn bit SPLIT_ACTIVE off */
-+ split->sp_flags &= SPLIT_ACTIVE;
++ if ((split->sp_expire <= TStime()) && SplitIsActive(split))
++ split->sp_flags &= ~SPLIT_ACTIVE;
+
+ return 0;
+}
+
++
+/** Send the full list of split entries to \a cptr.
+ * @param[in] cptr Local server to send split entries to.
+ */
+
+ assert(NULL != cptr);
+
-+ for (split = GlobalSplitList; split; split = ssplit) { /* go through splits */
++ /* go over SPLITs */
++ for (split = GlobalSplitList; split; split = ssplit) {
+ ssplit = split->sp_next;
+
+ /* expire any that need expiring */
-+ if (split_expire(split))
++ if (split_expire(split)) {
+ split_free(split);
++ continue;
++ }
++
+ /* if we have an entry for cptr, dont send it - but do not free here yet
+ * free it at end of burst, to get the correct count for SPLITs removed.
+ */
-+ else if (ircd_strcmp(split->sp_server, cli_name(cptr)) == 0)
++ if (ircd_strcmp(split->sp_server, cli_name(cptr)) == 0)
+ continue;
-+ else
-+ sendcmdto_one(&me, CMD_SPLIT, cptr, "%c%s %Tu %Tu %Tu %Tu :%s",
-+ SplitIsActive(split) ? '+' : '-', split->sp_server,
-+ split->sp_creation, split->sp_expire,
-+ split->sp_lastmod, split->sp_lifetime,
-+ split->sp_reason);
++
++ /* send it */
++ sendcmdto_one(&me, CMD_SPLIT, cptr, "%c%s %Tu %Tu %Tu %Tu :%s",
++ SplitIsActive(split) ? '+' : '-', split->sp_server,
++ split->sp_creation, split->sp_expire,
++ split->sp_lastmod, split->sp_lifetime,
++ split->sp_reason);
+ }
+}
+
++
+/** Forward a split to another server.
+ * @param[in] cptr Server to send split entries to.
+ * @param[in] split Split to forward.
+ return 0;
+}
+
-+/** Send a split entry (or a list of split entries) to a server.
++
++/** List split entries to a client.
+ * @param[in] sptr Client searching for split entries.
+ * @param[in] server Name of split entry to search for (if NULL, list all).
+ * @return Zero.
+split_list(struct Client *sptr, char *server)
+{
+ struct Split *split;
-+ struct Split *ssplit;
++ int count = 0;
+
+ assert(NULL != sptr);
+
-+ /* TODO: wildcard matching? */
-+ if (server) {
-+ if (!(split = split_find(server))) /* no such split */
-+ return send_reply(sptr, ERR_NOSUCHSPLIT, server);
++ /* go through SPLITs */
++ for (split = GlobalSplitList; split; split = split->sp_next) {
++
++ /* expire any that need expiring */
++ if (split_expire(split)) {
++ split_free(split);
++ continue;
++ }
+
-+ /* send split information along */
++ /* server given and does not match */
++ if (server && match(server, split->sp_server))
++ continue;
++
++ /* got one */
++ count++;
+ send_reply(sptr, RPL_SPLITLIST, split->sp_server,
-+ split->sp_creation, split->sp_expire,
-+ split->sp_lastmod, split->sp_lifetime,
++ split->sp_creation, split->sp_expire, split->sp_lastmod, split->sp_lifetime,
+ SplitIsActive(split) ? '+' : '-', split->sp_reason);
-+ } else {
-+ for (split = GlobalSplitList; split; split = ssplit) { /* go through splits */
-+ ssplit = split->sp_next;
-+
-+ if (split_expire(split)) /* expire any that need expiring */
-+ split_free(split);
-+ else /* send split information along */
-+ send_reply(sptr, RPL_SPLITLIST, split->sp_server,
-+ split->sp_creation, split->sp_expire,
-+ split->sp_lastmod, split->sp_lifetime,
-+ SplitIsActive(split) ? '+' : '-', split->sp_reason);
-+ }
+ }
+
++ /* server given and nothing found */
++ if (server && !count)
++ return send_reply(sptr, ERR_NOSUCHSPLIT, server);
++
+ /* end of splitlist information */
+ return send_reply(sptr, RPL_ENDOFSPLITLIST);
+}
+
+
++/** Mark SPLIT for new server with SPLIT_BURST
++ * @param[in] acptr Server introduced to the network
++ */
++void
++split_newserver(struct Client *acptr)
++{
++ struct Split *split;
++
++ assert(NULL != acptr);
++
++ /* debug */
++ Debug((DEBUG_DEBUG, "split_newserver(\"%s\")", cli_name(acptr)));
++
++ /* mark the SPLIT with SPLIT_BURST
++ * so we know this SPLIT is marked for removal already
++ * but not remove it just yet to get the correct count
++ * of SPLITs removed at the end of burst.
++ *
++ * also we need the SPLIT in case the net breaks again
++ * before end of burst?
++ */
++ if ((split = split_find(cli_name(acptr))))
++ split->sp_flags |= SPLIT_BURST;
++}
++
++
+/** Auto destroy SPLITs for servers gained in a netmerge
-+ * @param[in] cptr Server that link to the network
++ * @param[in] sptr Server that has linked to the network
+ * @return Number of destroyed SPLITs
+ */
+int
-+split_merge(struct Client *server)
++split_netmerge(struct Client *sptr)
+{
+ struct DLink *lp;
+ struct Split *split;
+ int count = 0;
+
-+ assert(NULL != server);
++ assert(NULL != sptr);
+
-+ Debug((DEBUG_DEBUG, "split_merge(\"%s\")", cli_name(server)));
++ /* debug */
++ Debug((DEBUG_DEBUG, "split_netmerge(\"%s\")", cli_name(sptr)));
+
+ /* find the SPLIT for this server */
-+ if ((split = split_find(cli_name(server)))) {
++ if ((split = split_find(cli_name(sptr)))) {
+ split_free(split);
+ count++;
+ }
+
+ /* go over its downlinks */
-+ for (lp = cli_serv(server)->down; lp; lp = lp->next)
-+ count += split_merge(lp->value.cptr);
++ for (lp = cli_serv(sptr)->down; lp; lp = lp->next)
++ count += split_netmerge(lp->value.cptr);
++
++ /* return the number of SPLITs removed */
+ return count;
+}
+
+
+/** Auto create SPLITs for servers lost in a netbreak
-+ * @param[in] server Server that lost link to network
++ * @param[in] victim Server that lost link to network
+ * @param[in] reason Reason to add to SPLITs
+ * @return Number of created SPLITs
+ */
+int
-+split_break(struct Client *server, const char *reason)
++split_netbreak(struct Client *victim, const char *reason)
+{
+ struct DLink *lp;
+ struct Split *split;
+ int count = 0;
-+ time_t creation = CurrentTime, expire = CurrentTime + SPLIT_AUTO_EXPIRE,
-+ lastmod = CurrentTime, lifetime = expire;
++ time_t creation = TStime(), expire = TStime() + feature_int(FEAT_SPLIT_AUTO_EXPIRE),
++ lastmod = TStime(), lifetime = expire;
+ unsigned int flags = SPLIT_ACTIVE;
+
-+ assert(NULL != server);
++ assert(NULL != victim);
+
-+ Debug((DEBUG_DEBUG, "split_break(\"%s\", \"%s\")", cli_name(server), reason));
++ /* debug */
++ Debug((DEBUG_DEBUG, "split_netbreak(\"%s\", \"%s\")", cli_name(victim), reason));
+
++ /* bad auto expire value */
++ if (feature_int(FEAT_SPLIT_AUTO_EXPIRE) <= 0)
++ return 0;
++
++ /* TODO: what if we do have a SPLIT for this server?
++ * we remove splits in end of burst
++ * and if the netbreaks again before that
++ * free the SPLIT and create a new one?
++ * or simply update lastmod/lifetime/reason but leave the status?
++ */
+ /* find the SPLIT for this server */
-+ if (!(split = split_find(cli_name(server)))) {
-+ split_make(cli_name(server), reason, creation, expire, lastmod, lifetime, flags);
++ if (!(split = split_find(cli_name(victim)))) {
++ split_make(cli_name(victim), reason, creation, expire, lastmod, lifetime, flags);
+ count++;
-+ }
++ } else
++ /* clear the burst flag for it */
++ split->sp_flags &= SPLIT_BURST;
+
+ /* go over its downlinks */
-+ for (lp = cli_serv(server)->down; lp; lp = lp->next)
-+ count += split_break(lp->value.cptr, reason);
++ for (lp = cli_serv(victim)->down; lp; lp = lp->next)
++ count += split_netbreak(lp->value.cptr, reason);
++
++ /* return the number of SPLITs created */
+ return count;
+}
+
+split_conf()
+{
+ struct ConfItem *conf;
-+ struct Client *server;
+ struct Split *split;
-+ struct Split *asplit;
-+ time_t creation = CurrentTime, expire = CurrentTime + SPLIT_AUTO_EXPIRE,
-+ lastmod = CurrentTime, lifetime = expire;
++ time_t creation = TStime(), expire = TStime() + feature_int(FEAT_SPLIT_AUTO_EXPIRE),
++ lastmod = TStime(), lifetime = expire;
+ unsigned int flags = SPLIT_ACTIVE;
+ char reason[BUFSIZE];
+
++ /* debug */
+ Debug((DEBUG_DEBUG, "split_conf()"));
+
+ /* we are not set to generate SPLITs */
+ if (!feature_bool(FEAT_SPLIT))
+ return;
+
++ /* TODO: log this problem? */
++ /* bad auto expire value */
++ if (feature_int(FEAT_SPLIT_AUTO_EXPIRE) <= 0)
++ return;
++
+ ircd_snprintf(0, reason, sizeof(reason),
-+ "Generated upon loading conf file on %s", cli_name(&me));
++ "Generated upon loading conf file on %C", &me);
+
+ /* go over the conf contents */
+ for (conf = GlobalConfList; conf; conf = conf->next) {
++
+ /* not a Connect Block */
+ if (CONF_SERVER != conf->status)
+ continue;
++
+ /* server is linked */
-+ if (server = FindServer(conf->name))
++ if (FindServer(conf->name))
+ continue;
++
+ /* we have a SPLIT for this server already */
-+ if (split = split_find(conf->name))
++ if (split_find(conf->name))
+ continue;
-+ /* inform ops and log it */
++
++ /* TODO: use SNO_OLDSNO here?
++ * just like nickcollisions on local users go there?
++ * or at least change the source / message format?
++ * /REHASH goes to SNO_OLDSNO? so this too?
++ * if oper did rehash, add his name here?
++ */
++ /* inform ops */
+ sendto_opmask_butone(0, SNO_NETWORK, "%C adding SPLIT for %s, expiring at %Tu: %s",
+ &me, conf->name, expire, reason);
+
-+ /* TODO: add SPLIT log stuff or use JUPE? */
-+ log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
++ /* log it */
++ log_write(LS_SPLIT, L_INFO, LOG_NOSNOTICE,
+ "%C adding SPLIT for %s, expiring at %Tu: %s",
+ &me, conf->name, expire, reason);
+
+ /* make the split entry */
-+ asplit = split_make(conf->name, reason, creation, expire, lastmod, lifetime, flags);
-+
-+ assert(asplit);
++ split = split_make(conf->name, reason, creation, expire, lastmod, lifetime, flags);
++
++ /* got to have it now */
++ assert(split);
+
+ /* and propagate it */
-+ split_propagate(&me, &me, asplit, NULL);
++ split_propagate(&me, &me, split, NULL);
+ }
+}
+
+ * @param[in] param Extra parameter from user (ignored).
+ */
+void
-+split_stats(struct Client *sptr, const struct StatDesc *sd,
-+ char *param)
++split_stats(struct Client *sptr, const struct StatDesc *sd, char *param)
+{
+ struct Split *split;
-+ struct Split *ssplit;
+
-+ send_reply(sptr, SND_EXPLICIT | RPL_STATSSPLIT,
-+ "S servername creation expire lastmod lifetime active :reason");
-+ for (split = GlobalSplitList; split; split = split->sp_next)
++ /* send header so the client knows what we are showing */
++ send_reply(sptr, SND_EXPLICIT | RPL_STATSHEADER,
++ "S Server Creation Expire Lastmod Lifetime Status :Reason");
++
++ /* go over SPLIT entries */
++ for (split = GlobalSplitList; split; split = split->sp_next) {
++
++ /* does not match */
++ if (param && match(param, split->sp_server))
++ continue;
++
++ /* send it */
+ send_reply(sptr, RPL_STATSSPLIT, split->sp_server,
+ split->sp_creation, split->sp_expire, split->sp_lastmod, split->sp_lifetime,
+ SplitIsActive(split) ? '+' : '-', split->sp_reason);
++ }
+}
+
+
+ struct Split *split;
+ unsigned int sp = 0;
+
-+ /* TODO: check for expired entries? */
-+ for (split = GlobalSplitList; split; split = split->sp_next)
-+ {
++ for (split = GlobalSplitList; split; split = split->sp_next) {
+ sp++;
+ *sp_size += sizeof(struct Split);
+ *sp_size += split->sp_server ? (strlen(split->sp_server) + 1) : 0;
+ }
+ return sp;
+}
-+
projects / irc / quakenet / snircd-patchqueue.git / blobdiff