assert(0 != jbuf);
- if (chan) {
- if (jbuf->jb_type == JOINBUF_TYPE_PART ||
- jbuf->jb_type == JOINBUF_TYPE_PARTALL) {
- /* Send notification to channel */
- if (!(flags & CHFL_ZOMBIE))
- sendcmdto_channel_butserv(jbuf->jb_source, CMD_PART, chan,
- (flags & CHFL_BANNED || !jbuf->jb_comment) ?
- ":%H" : "%H :%s", chan, jbuf->jb_comment);
- else if (MyUser(jbuf->jb_source))
- sendcmdto_one(jbuf->jb_source, CMD_PART, jbuf->jb_source,
- (flags & CHFL_BANNED || !jbuf->jb_comment) ?
- ":%H" : "%H :%s", chan, jbuf->jb_comment);
- /* XXX: Shouldn't we send a PART here anyway? */
- /* to users on the channel? Why? From their POV, the user isn't on
- * the channel anymore anyway. We don't send to servers until below,
- * when we gang all the channel parts together. Note that this is
- * exactly the same logic, albeit somewhat more concise, as was in
- * the original m_part.c */
-
- if (jbuf->jb_type == JOINBUF_TYPE_PARTALL ||
- IsLocalChannel(chan->chname)) /* got to remove user here */
- remove_user_from_channel(jbuf->jb_source, chan);
- } else {
- /* Add user to channel */
- add_user_to_channel(chan, jbuf->jb_source, flags);
+ if (!chan) {
+ if (jbuf->jb_type == JOINBUF_TYPE_JOIN)
+ sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect, "0");
- /* Send the notification to the channel */
- sendcmdto_channel_butserv(jbuf->jb_source, CMD_JOIN, chan, ":%H", chan);
+ return;
+ }
- /* send an op, too, if needed */
- if (!MyUser(jbuf->jb_source) && jbuf->jb_type == JOINBUF_TYPE_CREATE &&
- !IsModelessChannel(chan->chname))
- sendcmdto_channel_butserv(jbuf->jb_source, CMD_MODE, chan, "%H +o %C",
- chan, jbuf->jb_source);
- }
+ if (jbuf->jb_type == JOINBUF_TYPE_PART ||
+ jbuf->jb_type == JOINBUF_TYPE_PARTALL) {
+ /* Send notification to channel */
+ if (!(flags & CHFL_ZOMBIE))
+ sendcmdto_channel_butserv(jbuf->jb_source, CMD_PART, chan,
+ (flags & CHFL_BANNED || !jbuf->jb_comment) ?
+ ":%H" : "%H :%s", chan, jbuf->jb_comment);
+ else if (MyUser(jbuf->jb_source))
+ sendcmdto_one(jbuf->jb_source, CMD_PART, jbuf->jb_source,
+ (flags & CHFL_BANNED || !jbuf->jb_comment) ?
+ ":%H" : "%H :%s", chan, jbuf->jb_comment);
+ /* XXX: Shouldn't we send a PART here anyway? */
+ /* to users on the channel? Why? From their POV, the user isn't on
+ * the channel anymore anyway. We don't send to servers until below,
+ * when we gang all the channel parts together. Note that this is
+ * exactly the same logic, albeit somewhat more concise, as was in
+ * the original m_part.c */
+
+ if (jbuf->jb_type == JOINBUF_TYPE_PARTALL ||
+ IsLocalChannel(chan->chname)) /* got to remove user here */
+ remove_user_from_channel(jbuf->jb_source, chan);
+ } else {
+ /* Add user to channel */
+ add_user_to_channel(chan, jbuf->jb_source, flags);
- if (jbuf->jb_type == JOINBUF_TYPE_PARTALL || IsLocalChannel(chan->chname))
- return; /* don't send to remote */
+ /* send notification to all servers */
+ if (jbuf->jb_type != JOINBUF_TYPE_CREATE && !IsLocalChannel(chan->chname))
+ sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
+ "%H %Tu", chan, chan->creationtime);
+
+ /* Send the notification to the channel */
+ sendcmdto_channel_butserv(jbuf->jb_source, CMD_JOIN, chan, ":%H", chan);
+
+ /* send an op, too, if needed */
+ if (!MyUser(jbuf->jb_source) && jbuf->jb_type == JOINBUF_TYPE_CREATE &&
+ !IsModelessChannel(chan->chname))
+ sendcmdto_channel_butserv(jbuf->jb_source, CMD_MODE, chan, "%H +o %C",
+ chan, jbuf->jb_source);
}
+ if (jbuf->jb_type == JOINBUF_TYPE_PARTALL || IsLocalChannel(chan->chname))
+ return; /* don't send to remote */
+
/* figure out if channel name will cause buffer to be overflowed */
len = chan ? strlen(chan->chname) + 1 : 2;
if (jbuf->jb_strlen + len > IRC_BUFSIZE)
int chanlist_i = 0;
int i;
- if (!jbuf->jb_count || jbuf->jb_type == JOINBUF_TYPE_PARTALL)
+ if (!jbuf->jb_count || jbuf->jb_type == JOINBUF_TYPE_PARTALL ||
+ jbuf->jb_type == JOINBUF_TYPE_JOIN)
return 0; /* no joins to process */
for (i = 0; i < jbuf->jb_count; i++) { /* build channel list */
}
jbuf->jb_count = 0; /* reset base counters */
- jbuf->jb_strlen = ((jbuf->jb_type == JOINBUF_TYPE_JOIN ||
- jbuf->jb_type == JOINBUF_TYPE_PART ?
+ jbuf->jb_strlen = ((jbuf->jb_type == JOINBUF_TYPE_PART ?
STARTJOINLEN : STARTCREATELEN) +
(jbuf->jb_comment ? strlen(jbuf->jb_comment) + 2 : 0));
/* and send the appropriate command */
switch (jbuf->jb_type) {
- case JOINBUF_TYPE_JOIN:
- sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
- "%s", chanlist);
- break;
-
case JOINBUF_TYPE_CREATE:
sendcmdto_serv_butone(jbuf->jb_source, CMD_CREATE, jbuf->jb_connect,
"%s %Tu", chanlist, jbuf->jb_create);
chptr->topic_time);
}
- parv[1] = name;
- m_names(cptr, sptr, 2, parv); /* XXX find a better way */
+ do_names(sptr, chptr, NAMES_ALL); /* send /names list */
}
joinbuf_flush(&join); /* must be first, if there's a JOIN 0 */
struct Membership *member;
struct Channel *chptr;
struct JoinBuf join;
- struct JoinBuf create;
unsigned int flags = 0;
+ time_t creation = 0;
char *p = 0;
char *chanlist;
char *name;
if (parc < 2 || *parv[1] == '\0')
return need_more_params(sptr, "JOIN");
+ if (parc > 2 && parv[2])
+ creation = atoi(parv[2]);
+
joinbuf_init(&join, sptr, cptr, JOINBUF_TYPE_JOIN, 0, 0);
- joinbuf_init(&create, sptr, cptr, JOINBUF_TYPE_CREATE, 0, TStime());
chanlist = last0(parv[1]); /* find last "JOIN 0" */
chptr = FindChannel(name);
} else
flags = CHFL_DEOPPED | ((sptr->flags & FLAGS_TS8) ? CHFL_SERVOPOK : 0);
- } else
- flags = IsModelessChannel(name) ? CHFL_DEOPPED : CHFL_CHANOP;
+ } else {
+ flags = CHFL_DEOPPED | ((sptr->flags & FLAGS_TS8) ? CHFL_SERVOPOK : 0);
- if (chptr)
- joinbuf_join(&join, chptr, flags);
- /* Strange that a channel should get created by a JOIN, but as long
- * as there are desynchs, we have to assume it's possible. Previous
- * solutions involved sending a TS with the JOIN, but that seems
- * unworkable to me; my solution is to transmute the JOIN into a
- * CREATE, and let the next BURST try to fix the problem. Another
- * solution would be to simply issue an upstream KICK, but that
- * won't currently be accepted. Is this what DESTRUCT is for?
- */
- else if (!(chptr = get_channel(sptr, name, CGT_CREATE)))
- continue; /* couldn't get channel */
- else {
- chptr->creationtime = TStime(); /* have to set the creation TS */
- joinbuf_join(&create, chptr, flags);
+ if ((chptr = get_channel(sptr, name, CGT_CREATE)))
+ chptr->creationtime = creation ? creation : MAGIC_REMOTE_JOIN_TS;
+ else
+ continue; /* couldn't get channel */
}
+
+ joinbuf_join(&join, chptr, flags);
}
- joinbuf_flush(&join); /* must be first, if there's a JOIN 0 */
- joinbuf_flush(&create);
+ joinbuf_flush(&join); /* flush joins... */
return 0;
}
projects / ircu2.10.12-pk.git / commitdiff