X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_create.c;h=df2085e1415e3a61fff32391a3bc8cdf9916c45b;hb=refs%2Fheads%2Fupstream-ssl;hp=05bacc8c31b4715dc699ab28579cf81f16f1194f;hpb=ae91ef6320f611af74e70a0db2620c338fbaa7d5;p=ircu2.10.12-pk.git diff --git a/ircd/m_create.c b/ircd/m_create.c index 05bacc8..df2085e 100644 --- a/ircd/m_create.c +++ b/ircd/m_create.c @@ -79,241 +79,155 @@ * note: it is guaranteed that parv[0]..parv[parc-1] are all * non-NULL pointers. */ -#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 "config.h" + #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 "numeric.h" #include "numnicks.h" +#include "s_debug.h" +#include "s_misc.h" +#include "s_user.h" #include "send.h" -#include +/* #include -- Now using assert in ircd_log.h */ #include #include -/* - * m_create - generic message handler - */ -int m_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) -{ - return 0; -} - /* * ms_create - server message handler */ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) { - char cbuf[BUFSIZE]; /* Buffer for list with channels - that `sptr' really creates */ - time_t chanTS; /* Creation time for all channels - in the comma seperated list */ - char* p; - char* name; - struct Channel* chptr; - int badop; + time_t chanTS; /* channel creation time */ + char *p; /* strtok state */ + char *name; /* channel name */ + struct Channel *chptr; /* channel */ + struct JoinBuf join; /* join and create buffers */ + struct JoinBuf create; + struct ModeBuf mbuf; /* a mode buffer */ + int badop; /* a flag */ + + if (IsServer(sptr)) + return protocol_violation(sptr,"%s tried to CREATE a channel", cli_name(sptr)); - if (IsServer(sptr)) { - /* PROTOCOL WARNING */ - /* bail, don't core */ - return 0; - } /* sanity checks: Only accept CREATE messages from servers */ - if (!IsServer(cptr) || parc < 3 || *parv[2] == '\0') - return 0; + if (parc < 3 || *parv[2] == '\0') + return need_more_params(sptr,"CREATE"); chanTS = atoi(parv[2]); /* 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) - sptr->user->server->serv->lag = TStime() - chanTS; - - *cbuf = '\0'; /* Start with empty buffer */ - - /* For each channel in the comma seperated list: */ - for (name = ircd_strtok(&p, parv[1], ","); name; name = ircd_strtok(&p, 0, ",")) - { - badop = 0; /* Default is to accept the op */ - if ((chptr = FindChannel(name))) - { - name = chptr->chname; - if (TStime() - chanTS > TS_LAG_TIME) - { - /* A bounce would not be accepted anyway - if we get here something - is wrong with the TS clock syncing (or we have more then - TS_LAG_TIME lag, or an admin is hacking */ - badop = 2; - /* This causes a HACK notice on all upstream servers: */ - sendto_one(cptr, "%s " TOK_MODE " %s -o %s%s 0", NumServ(&me), name, NumNick(sptr)); - /* This causes a WALLOPS on all downstream servers and a notice to our - own opers: */ - parv[1] = name; /* Corrupt parv[1], it is not used anymore anyway */ - send_hack_notice(cptr, sptr, parc, parv, badop, 2); - } - else if (chptr->creationtime && chanTS > chptr->creationtime && - chptr->creationtime != MAGIC_REMOTE_JOIN_TS) - { - /* We (try) to bounce the mode, because the CREATE is used on an older - channel, probably a net.ride */ - badop = 1; - /* Send a deop upstream: */ - sendto_one(cptr, "%s " TOK_MODE " %s -o %s%s " TIME_T_FMT, NumServ(&me), - name, NumNick(sptr), chptr->creationtime); - } - } - else /* Channel doesn't exist: create it */ - chptr = get_channel(sptr, name, CGT_CREATE); - - /* Add and mark ops */ - add_user_to_channel(chptr, sptr, - (badop || IsModelessChannel(name)) ? CHFL_DEOPPED : CHFL_CHANOP); - - /* Send user join to the local clients (if any) */ - sendto_channel_butserv(chptr, sptr, ":%s " MSG_JOIN " :%s", parv[0], name); - - if (badop) /* handle badop: convert CREATE into JOIN */ - sendto_serv_butone(cptr, "%s%s " TOK_JOIN " %s " TIME_T_FMT, - NumNick(sptr), name, chptr->creationtime); - else - { - /* Send the op to local clients: - (if any; extremely unlikely, but it CAN happen) */ - if (!IsModelessChannel(name)) - sendto_channel_butserv(chptr, sptr, ":%s MODE %s +o %s", - sptr->user->server->name, name, parv[0]); - - /* Set/correct TS and add the channel to the - buffer for accepted channels: */ - chptr->creationtime = chanTS; - if (*cbuf) - strcat(cbuf, ","); - strcat(cbuf, name); - } - } + if (!IsBurstOrBurstAck(sptr) && 0 != chanTS) + cli_serv(cli_user(sptr)->server)->lag = TStime() - chanTS; - if (*cbuf) /* Any channel accepted with ops ? */ + /* If this server is >1 minute fast, warn */ + if (TStime() - chanTS<-60) { - sendto_serv_butone(cptr, "%s%s " TOK_CREATE " %s " TIME_T_FMT, - NumNick(sptr), cbuf, chanTS); + 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); } - return 0; -} + joinbuf_init(&join, sptr, cptr, JOINBUF_TYPE_JOIN, 0, 0); + joinbuf_init(&create, sptr, cptr, JOINBUF_TYPE_CREATE, 0, chanTS); -#if 0 -/* - * m_create - * - * parv[0] = sender prefix - * parv[1] = channel names - * parv[2] = channel time stamp - */ -int m_create(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) -{ - char cbuf[BUFSIZE]; /* Buffer for list with channels - that `sptr' really creates */ - time_t chanTS; /* Creation time for all channels - in the comma seperated list */ - char* p; - char* name; - struct Channel* chptr; - int badop; - - /* sanity checks: Only accept CREATE messages from servers */ - if (!IsServer(cptr) || parc < 3 || *parv[2] == '\0') - return 0; + /* For each channel in the comma separated list: */ + for (name = ircd_strtok(&p, parv[1], ","); name; + name = ircd_strtok(&p, 0, ",")) { + badop = 0; - chanTS = atoi(parv[2]); + if (IsLocalChannel(name)) + continue; - /* 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) - sptr->user->server->serv->lag = TStime() - chanTS; - - *cbuf = '\0'; /* Start with empty buffer */ - - /* For each channel in the comma seperated list: */ - for (name = ircd_strtok(&p, parv[1], ","); name; name = ircd_strtok(&p, 0, ",")) - { - badop = 0; /* Default is to accept the op */ if ((chptr = FindChannel(name))) { - name = chptr->chname; - if (TStime() - chanTS > TS_LAG_TIME) - { - /* A bounce would not be accepted anyway - if we get here something - is wrong with the TS clock syncing (or we have more then - TS_LAG_TIME lag, or an admin is hacking */ - badop = 2; - /* This causes a HACK notice on all upstream servers: */ - sendto_one(cptr, "%s " TOK_MODE " %s -o %s%s 0", NumServ(&me), name, NumNick(sptr)); - /* This causes a WALLOPS on all downstream servers and a notice to our - own opers: */ - parv[1] = name; /* Corrupt parv[1], it is not used anymore anyway */ - send_hack_notice(cptr, sptr, parc, parv, badop, 2); + /* 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; } - else if (chptr->creationtime && chanTS > chptr->creationtime && - chptr->creationtime != MAGIC_REMOTE_JOIN_TS) - { - /* We (try) to bounce the mode, because the CREATE is used on an older - channel, probably a net.ride */ - badop = 1; - /* Send a deop upstream: */ - sendto_one(cptr, "%s " TOK_MODE " %s -o %s%s " TIME_T_FMT, NumServ(&me), - name, NumNick(sptr), chptr->creationtime); + + /* Check if we need to bounce a mode */ + if (TStime() - chanTS > TS_LAG_TIME || + (chptr->creationtime && chanTS > chptr->creationtime && + /* 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); - /* Add and mark ops */ - add_user_to_channel(chptr, sptr, - (badop || IsModelessChannel(name)) ? CHFL_DEOPPED : CHFL_CHANOP); - - /* Send user join to the local clients (if any) */ - sendto_channel_butserv(chptr, sptr, ":%s " MSG_JOIN " :%s", parv[0], name); - - if (badop) /* handle badop: convert CREATE into JOIN */ - sendto_serv_butone(cptr, "%s%s " TOK_JOIN " %s " TIME_T_FMT, - NumNick(sptr), name, chptr->creationtime); - else - { - /* Send the op to local clients: - (if any; extremely unlikely, but it CAN happen) */ - if (!IsModelessChannel(name)) - sendto_channel_butserv(chptr, sptr, ":%s MODE %s +o %s", - sptr->user->server->name, name, parv[0]); - - /* Set/correct TS and add the channel to the - buffer for accepted channels: */ + if (!badop) { + /* Set (or correct) our copy of the TS */ chptr->creationtime = chanTS; - if (*cbuf) - strcat(cbuf, ","); - strcat(cbuf, name); + joinbuf_join(&create, chptr, CHFL_CHANOP); } } - if (*cbuf) /* Any channel accepted with ops ? */ - { - sendto_serv_butone(cptr, "%s%s " TOK_CREATE " %s " TIME_T_FMT, - NumNick(sptr), cbuf, chanTS); - } + joinbuf_flush(&join); /* flush out the joins and creates */ + joinbuf_flush(&create); return 0; } -#endif /* 0 */ -