*/
#include "config.h"
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
#include "channel.h"
#include "client.h"
#include "hash.h"
#include "ircd.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "msg.h"
#include "s_user.h"
#include "send.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <stdlib.h>
#include <string.h>
chanTS = atoi(parv[2]);
- joinbuf_init(&join, sptr, cptr, JOINBUF_TYPE_JOIN, 0, 0);
- joinbuf_init(&create, sptr, cptr, JOINBUF_TYPE_CREATE, 0, chanTS);
-
/* A create that didn't appear during a burst has that servers idea of
* the current time. Use it for lag calculations.
*/
- if (!IsBurstOrBurstAck(sptr) && 0 != chanTS &&
- MAGIC_REMOTE_JOIN_TS != chanTS)
+ if (!IsBurstOrBurstAck(sptr) && 0 != chanTS)
cli_serv(cli_user(sptr)->server)->lag = TStime() - chanTS;
-#if 1
- /* If this server is >5 minutes fast, squit it */
- if (TStime() - chanTS<-5*60*60)
- return exit_client(sptr, sptr, &me, "Timestamp Drift/Bogus TS");
-#endif
-#if 0
- /* If we recieve a CREATE for a channel from a server before that server
- * was linked, then it's a HACK
- */
- if (MyConnect(sptr) && chanTS<cli_timestamp(sptr)+5*60*60)
- return exit_client(sptr,sptr,"HACK: Bogus TS on CREATE before server link");
-#endif
+ /* If this server is >1 minute fast, warn */
+ if (TStime() - chanTS<-60)
+ {
+ static time_t rate;
+ sendto_opmask_butone_ratelimited(0, SNO_NETWORK, &rate,
+ "Timestamp drift from %C (%is); issuing "
+ "SETTIME to correct this",
+ cli_user(sptr)->server,
+ chanTS - TStime());
+ /* Now issue a SETTIME to resync. If we're in the wrong, our
+ * (RELIABLE_CLOCK) hub will bounce a SETTIME back to us.
+ */
+ sendcmdto_prio_one(&me, CMD_SETTIME, cli_user(sptr)->server,
+ "%Tu %C", TStime(), cli_user(sptr)->server);
+ }
- /* For each channel in the comma seperated list: */
+ joinbuf_init(&join, sptr, cptr, JOINBUF_TYPE_JOIN, 0, 0);
+ joinbuf_init(&create, sptr, cptr, JOINBUF_TYPE_CREATE, 0, chanTS);
+
+ /* For each channel in the comma separated list: */
for (name = ircd_strtok(&p, parv[1], ","); name;
name = ircd_strtok(&p, 0, ",")) {
badop = 0;
if (IsLocalChannel(name))
continue;
- if ((chptr = FindChannel(name))) {
- name = chptr->chname;
+ if ((chptr = FindChannel(name)))
+ {
+ /* Is the remote server confused? */
+ if (find_member_link(chptr, sptr)) {
+ protocol_violation(sptr, "%s tried to CREATE a channel already joined (%s)", cli_name(sptr), chptr->chname);
+ continue;
+ }
/* Check if we need to bounce a mode */
if (TStime() - chanTS > TS_LAG_TIME ||
(chptr->creationtime && chanTS > chptr->creationtime &&
- chptr->creationtime != MAGIC_REMOTE_JOIN_TS)) {
- modebuf_init(&mbuf, sptr, cptr, chptr,
- (MODEBUF_DEST_SERVER | /* Send mode to server */
- MODEBUF_DEST_HACK2 | /* Send a HACK(2) message */
- MODEBUF_DEST_BOUNCE)); /* And bounce the mode */
-
- modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr);
-
- modebuf_flush(&mbuf);
-
- badop = 1;
+ /* Accept CREATE for zannels. This is only really necessary on a network
+ with servers prior to 2.10.12.02: we just accept their TS and ignore
+ the fact that it was a zannel. The influence of this on a network
+ that is completely 2.10.12.03 or higher is neglectable: Normally
+ a server only sends a CREATE after first sending a DESTRUCT. Thus,
+ by receiving a CREATE for a zannel one of three things happened:
+ 1. The DESTRUCT was sent during a net.break; this could mean that
+ our zannel is at the verge of expiring too, it should have been
+ destructed. It is correct to copy the newer TS now, all modes
+ already have been reset, so it will be as if it was destructed
+ and immediately recreated. In order to avoid desyncs of modes,
+ we don't accept a CREATE for channels that have +A set.
+ 2. The DESTRUCT passed, then someone created the channel on our
+ side and left it again. In this situation we have a near
+ simultaneous creation on two servers; the person on our side
+ already left within the time span of a message propagation.
+ The channel will therefore be less than 48 hours old and no
+ 'protection' is necessary.
+ 3. The source server sent the CREATE while linking,
+ before it got the BURST for our zannel. If this
+ happens, we should reset the channel back to the old
+ timestamp. This can be distinguished from case #1 by
+ checking IsBurstOrBurstAck(cli_user(sptr)->server).
+ */
+ !(chptr->users == 0 && !chptr->mode.apass[0]))) {
+ if (!IsBurstOrBurstAck(cli_user(sptr)->server)) {
+ modebuf_init(&mbuf, sptr, cptr, chptr,
+ (MODEBUF_DEST_SERVER | /* Send mode to server */
+ MODEBUF_DEST_HACK2 | /* Send a HACK(2) message */
+ MODEBUF_DEST_BOUNCE)); /* And bounce the mode */
+
+ modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr, MAXOPLEVEL + 1);
+
+ modebuf_flush(&mbuf);
+
+ badop = 1;
+ } else if (chanTS > chptr->creationtime + 4) {
+ /* If their handling of the BURST will lead to deopping the
+ * user, have the user join without getting ops (if the
+ * server's handling of the BURST keeps their ops, the channel
+ * will use our timestamp).
+ */
+ badop = 1;
+ }
+
+ if (badop)
+ joinbuf_join(&join, chptr, 0);
}
- } else /* Channel doesn't exist: create it */
+ }
+ else /* Channel doesn't exist: create it */
chptr = get_channel(sptr, name, CGT_CREATE);
- if (!badop) /* Set/correct TS */
+ if (!badop) {
+ /* Set (or correct) our copy of the TS */
chptr->creationtime = chanTS;
-
- joinbuf_join(badop ? &join : &create, chptr,
- (badop || IsModelessChannel(name)) ?
- CHFL_DEOPPED : CHFL_CHANOP);
+ joinbuf_join(&create, chptr, CHFL_CHANOP);
+ }
}
joinbuf_flush(&join); /* flush out the joins and creates */
projects / ircu2.10.12-pk.git / blobdiff