X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/22e4a9bc2b34915bf6e907e90d60bf7d002c7dc5..de36941445d328fd7038589b70422a3a766fe3f7:/modules/core/m_join.c diff --git a/modules/core/m_join.c b/modules/core/m_join.c index b1892141..ae75f86f 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -20,14 +20,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id: m_join.c 3494 2007-05-27 13:07:27Z jilles $ */ #include "stdinc.h" #include "channel.h" #include "client.h" -#include "common.h" #include "hash.h" #include "match.h" #include "ircd.h" @@ -44,20 +41,22 @@ #include "ratelimit.h" #include "s_assert.h" -static int m_join(struct Client *, struct Client *, int, const char **); -static int ms_join(struct Client *, struct Client *, int, const char **); -static int ms_sjoin(struct Client *, struct Client *, int, const char **); +static const char join_desc[] = "Provides the JOIN and TS6 SJOIN commands to facilitate joining and creating channels"; + +static void m_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void ms_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void ms_sjoin(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int h_can_create_channel; static int h_channel_join; struct Message join_msgtab = { - "JOIN", 0, 0, 0, MFLG_SLOW, + "JOIN", 0, 0, 0, 0, {mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}} }; struct Message sjoin_msgtab = { - "SJOIN", 0, 0, 0, MFLG_SLOW, + "SJOIN", 0, 0, 0, 0, {mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore} }; @@ -69,24 +68,18 @@ mapi_hlist_av1 join_hlist[] = { { NULL, NULL }, }; -DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $"); +DECLARE_MODULE_AV2(join, NULL, NULL, join_clist, join_hlist, NULL, NULL, NULL, join_desc); static void do_join_0(struct Client *client_p, struct Client *source_p); -static int check_channel_name_loc(struct Client *source_p, const char *name); +static bool check_channel_name_loc(struct Client *source_p, const char *name); static void send_join_error(struct Client *source_p, int numeric, const char *name); -static void set_final_mode(struct Mode *mode, struct Mode *oldmode); +static char *set_final_mode(char *mbuf, char *parabuf, struct Mode *mode, struct Mode *oldmode); static void remove_our_modes(struct Channel *chptr, struct Client *source_p); static void remove_ban_list(struct Channel *chptr, struct Client *source_p, rb_dlink_list * list, char c, int mems); -static char modebuf[MODEBUFLEN]; -static char parabuf[MODEBUFLEN]; -static const char *para[MAXMODEPARAMS]; -static char *mbuf; -static int pargs; - /* Check what we will forward to, without sending any notices to the user * -- jilles */ @@ -111,19 +104,28 @@ check_forward(struct Client *source_p, struct Channel *chptr, { if (next == NULL) return NULL; + chptr = find_channel(next); /* Can only forward to existing channels */ if (chptr == NULL) return NULL; - /* Already on there, show original error message */ + /* Already on there... but don't send the original reason for + * being unable to join. It isn't their fault they're already + * on the channel, and it looks hostile otherwise. + * --Elizafox + */ if (IsMember(source_p, chptr)) + { + *err = ERR_USERONCHANNEL; /* I'm borrowing this for now. --Elizafox */ return NULL; + } /* Juped. Sending a warning notice would be unfair */ if (hash_find_resv(chptr->chname)) return NULL; /* Don't forward to +Q channel */ if (chptr->mode.mode & MODE_DISFORWARD) return NULL; + i = can_join(source_p, chptr, key, &next); if (i == 0) return chptr; @@ -138,8 +140,8 @@ check_forward(struct Client *source_p, struct Channel *chptr, * parv[1] = channel * parv[2] = channel password (key) */ -static int -m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char jbuf[BUFSIZE]; struct Channel *chptr = NULL, *chptr2 = NULL; @@ -171,13 +173,12 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p /* join 0 parts all channels */ if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist) { - (void) strcpy(jbuf, "0"); + rb_strlcpy(jbuf, "0", sizeof(jbuf)); continue; } - /* check it begins with # or &, and local chans are disabled */ - else if(!IsChannelName(name) || - ( ConfigChannel.disable_local_channels && name[0] == '&')) + /* check it begins with a valid channel prefix per policy. */ + else if (!IsChannelName(name)) { sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, form_str(ERR_NOSUCHCHANNEL), name); @@ -278,9 +279,9 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p if((rb_dlink_list_length(&source_p->user->channel) >= (unsigned long) ConfigChannel.max_chans_per_user) && - (!IsOper(source_p) || + (!IsExtendChans(source_p) || (rb_dlink_list_length(&source_p->user->channel) >= - (unsigned long) ConfigChannel.max_chans_per_user * 3))) + (unsigned long) ConfigChannel.max_chans_per_user_large))) { sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS), me.name, source_p->name, name); @@ -300,7 +301,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p } /* If check_forward returns NULL, they couldn't join and there wasn't a usable forward channel. */ - if(!(chptr2 = check_forward(source_p, chptr, key, &i))) + if((chptr2 = check_forward(source_p, chptr, key, &i)) == NULL) { /* might be wrong, but is there any other better location for such? * see extensions/chm_operonly.c for other comments on this @@ -341,8 +342,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p if(flags & CHFL_CHANOP) { chptr->channelts = rb_current_time(); - chptr->mode.mode |= MODE_TOPICLIMIT; - chptr->mode.mode |= MODE_NOPRIVMSGS; + chptr->mode.mode |= ConfigChannel.autochanmodes; modes = channel_modes(chptr, &me); sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s", @@ -381,8 +381,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p hook_info.key = key; call_hook(h_channel_join, &hook_info); } - - return 0; } /* @@ -392,53 +390,47 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p * parv[3] = "+", formerly channel modes but now unused * alternatively, a single "0" parameter parts all channels */ -static int -ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { + static char modebuf[MODEBUFLEN]; + static char parabuf[MODEBUFLEN]; struct Channel *chptr; static struct Mode mode; time_t oldts; time_t newts; - int isnew; - int keep_our_modes = YES; + bool isnew; + bool keep_our_modes = true; rb_dlink_node *ptr, *next_ptr; + char *mbuf; /* special case for join 0 */ if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2) { do_join_0(client_p, source_p); - return 0; + return; } if(parc < 4) - return 0; + return; if(!IsChannelName(parv[2]) || !check_channel_name(parv[2])) - return 0; + return; /* joins for local channels cant happen. */ if(parv[2][0] == '&') - return 0; + return; mbuf = modebuf; mode.key[0] = mode.forward[0] = '\0'; mode.mode = mode.limit = mode.join_num = mode.join_time = 0; if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL) - return 0; + return; newts = atol(parv[1]); oldts = chptr->channelts; -#ifdef IGNORE_BOGUS_TS - if(newts < 800000000) - { - sendto_realops_snomask(SNO_DEBUG, L_ALL, - "*** Bogus TS %ld on %s ignored from %s", - (long) newts, chptr->chname, client_p->name); - newts = (oldts == 0) ? oldts : 800000000; - } -#else /* making a channel TS0 */ if(!isnew && !newts && oldts) { @@ -449,7 +441,6 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * "Server %s changing TS on %s from %ld to 0", source_p->name, chptr->chname, (long) oldts); } -#endif if(isnew) chptr->channelts = newts; @@ -459,14 +450,14 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * ; else if(newts < oldts) { - keep_our_modes = NO; + keep_our_modes = false; chptr->channelts = newts; } /* Lost the TS, other side wins, so remove modes on this side */ if(!keep_our_modes) { - set_final_mode(&mode, &chptr->mode); + mbuf = set_final_mode(mbuf, parabuf, &mode, &chptr->mode); chptr->mode = mode; remove_our_modes(chptr, source_p); RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head) @@ -490,7 +481,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * *modebuf = *parabuf = '\0'; /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */ - set_channel_mlock(client_p, source_p, chptr, NULL, FALSE); + set_channel_mlock(client_p, source_p, chptr, NULL, false); } if(!IsMember(source_p, chptr)) @@ -509,12 +500,13 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * sendto_server(client_p, chptr, CAP_TS6, NOCAPS, ":%s JOIN %ld %s +", source_p->id, (long) chptr->channelts, chptr->chname); - return 0; } -static int -ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { + static char modebuf[MODEBUFLEN]; + static char parabuf[MODEBUFLEN]; static char buf_uid[BUFSIZE]; static const char empty_modes[] = "0"; struct Channel *chptr; @@ -524,10 +516,10 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char static struct Mode mode, *oldmode; const char *modes; int args = 0; - int keep_our_modes = 1; - int keep_new_modes = 1; + bool keep_our_modes = true; + bool keep_new_modes = true; int fl; - int isnew; + bool isnew; int mlen_uid; int len_uid; int len; @@ -538,16 +530,19 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char int i, joinc = 0, timeslice = 0; static char empty[] = ""; rb_dlink_node *ptr, *next_ptr; + char *mbuf; + int pargs; + const char *para[MAXMODEPARAMS]; if(parc < 5) - return 0; + return; if(!IsChannelName(parv[2]) || !check_channel_name(parv[2])) - return 0; + return; /* SJOIN's for local channels can't happen. */ if(*parv[2] == '&') - return 0; + return; modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0'; pargs = mode.mode = mode.limit = mode.join_num = mode.join_time = 0; @@ -570,7 +565,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char rb_strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward)); args++; if(parc < 5 + args) - return 0; + return; break; case 'j': sscanf(parv[4 + args], "%d:%d", &joinc, ×lice); @@ -578,19 +573,19 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char mode.join_num = joinc; mode.join_time = timeslice; if(parc < 5 + args) - return 0; + return; break; case 'k': rb_strlcpy(mode.key, parv[4 + args], sizeof(mode.key)); args++; if(parc < 5 + args) - return 0; + return; break; case 'l': mode.limit = atoi(parv[4 + args]); args++; if(parc < 5 + args) - return 0; + return; break; default: if(chmode_flags[(int) *s] != 0) @@ -612,22 +607,12 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char s = ""; if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL) - return 0; /* channel name too long? */ + return; /* channel name too long? */ oldts = chptr->channelts; oldmode = &chptr->mode; -#ifdef IGNORE_BOGUS_TS - if(newts < 800000000) - { - sendto_realops_snomask(SNO_DEBUG, L_ALL, - "*** Bogus TS %ld on %s ignored from %s", - (long) newts, chptr->chname, client_p->name); - - newts = (oldts == 0) ? oldts : 800000000; - } -#else if(!isnew && !newts && oldts) { sendto_channel_local(ALL_MEMBERS, chptr, @@ -638,7 +623,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char "Server %s changing TS on %s from %ld to 0", source_p->name, chptr->chname, (long) oldts); } -#endif if(isnew) chptr->channelts = newts; @@ -685,16 +669,16 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char { /* Channel was emptied, create a new one */ if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL) - return 0; /* oops! */ + return; /* oops! */ oldmode = &chptr->mode; } } - keep_our_modes = NO; + keep_our_modes = false; chptr->channelts = newts; } else - keep_new_modes = NO; + keep_new_modes = false; if(!keep_new_modes) mode = *oldmode; @@ -704,7 +688,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char if(oldmode->limit > mode.limit) mode.limit = oldmode->limit; if(strcmp(mode.key, oldmode->key) < 0) - strcpy(mode.key, oldmode->key); + rb_strlcpy(mode.key, oldmode->key, sizeof(mode.key)); if(oldmode->join_num > mode.join_num || (oldmode->join_num == mode.join_num && oldmode->join_time > mode.join_time)) @@ -713,7 +697,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char mode.join_time = oldmode->join_time; } if(irccmp(mode.forward, oldmode->forward) < 0) - strcpy(mode.forward, oldmode->forward); + rb_strlcpy(mode.forward, oldmode->forward, sizeof(mode.forward)); } else { @@ -722,7 +706,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char chptr->join_count = chptr->join_delta = 0; } - set_final_mode(&mode, oldmode); + mbuf = set_final_mode(mbuf, parabuf, &mode, oldmode); chptr->mode = mode; /* Lost the TS, other side wins, so remove modes on this side */ @@ -756,7 +740,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char strcpy(chptr->chname, parv[2]); /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */ - set_channel_mlock(client_p, source_p, chptr, NULL, FALSE); + set_channel_mlock(client_p, source_p, chptr, NULL, false); } if(*modebuf != '\0') @@ -770,7 +754,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char else modes = empty_modes; - mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :", + mlen_uid = sprintf(buf_uid, ":%s SJOIN %ld %s %s :", use_id(source_p), (long) chptr->channelts, parv[2], modes); ptr_uid = buf_uid + mlen_uid; @@ -839,7 +823,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char } /* copy the nick to the two buffers */ - len = rb_sprintf(ptr_uid, "%s ", use_id(target_p)); + len = sprintf(ptr_uid, "%s ", use_id(target_p)); ptr_uid += len; len_uid += len; @@ -937,7 +921,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char { destroy_channel(chptr); - return 0; + return; } /* Keep the colon if we're sending an SJOIN without nicks -- jilles */ @@ -947,8 +931,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char } sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid); - - return 0; } /* @@ -987,21 +969,21 @@ do_join_0(struct Client *client_p, struct Client *source_p) } } -static int +static bool check_channel_name_loc(struct Client *source_p, const char *name) { const char *p; s_assert(name != NULL); if(EmptyString(name)) - return 0; + return false; if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p)) { for(p = name; *p; ++p) { if(!IsChanChar(*p) || IsFakeChanChar(*p)) - return 0; + return false; } } else @@ -1009,7 +991,7 @@ check_channel_name_loc(struct Client *source_p, const char *name) for(p = name; *p; ++p) { if(!IsChanChar(*p)) - return 0; + return false; } } @@ -1017,10 +999,10 @@ check_channel_name_loc(struct Client *source_p, const char *name) { for(p = name; *p; ++p) if(*p < 33 || *p > 126) - return 0; + return false; } - return 1; + return true; } /* send_join_error() @@ -1057,8 +1039,8 @@ send_join_error(struct Client *source_p, int numeric, const char *name) } } -static void -set_final_mode(struct Mode *mode, struct Mode *oldmode) +static char * +set_final_mode(char *mbuf, char *parabuf, struct Mode *mode, struct Mode *oldmode) { int dir = MODE_QUERY; char *pbuf = parabuf; @@ -1110,7 +1092,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) dir = MODE_DEL; } *mbuf++ = 'k'; - len = rb_sprintf(pbuf, "%s ", oldmode->key); + len = sprintf(pbuf, "%s ", oldmode->key); pbuf += len; } if(oldmode->join_num && !mode->join_num) @@ -1139,7 +1121,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) dir = MODE_ADD; } *mbuf++ = 'l'; - len = rb_sprintf(pbuf, "%d ", mode->limit); + len = sprintf(pbuf, "%d ", mode->limit); pbuf += len; } if(mode->key[0] && strcmp(oldmode->key, mode->key)) @@ -1150,7 +1132,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) dir = MODE_ADD; } *mbuf++ = 'k'; - len = rb_sprintf(pbuf, "%s ", mode->key); + len = sprintf(pbuf, "%s ", mode->key); pbuf += len; } if(mode->join_num && (oldmode->join_num != mode->join_num || oldmode->join_time != mode->join_time)) @@ -1161,7 +1143,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) dir = MODE_ADD; } *mbuf++ = 'j'; - len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time); + len = sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time); pbuf += len; } if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && @@ -1173,10 +1155,12 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) dir = MODE_ADD; } *mbuf++ = 'f'; - len = rb_sprintf(pbuf, "%s ", mode->forward); + len = sprintf(pbuf, "%s ", mode->forward); pbuf += len; } *mbuf = '\0'; + + return mbuf; } /* @@ -1195,8 +1179,8 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p) char *lpara[MAXMODEPARAMS]; int count = 0; int i; + char *mbuf = lmodebuf; - mbuf = lmodebuf; *mbuf++ = '-'; for(i = 0; i < MAXMODEPARAMS; i++) @@ -1295,10 +1279,11 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p, char *pbuf; int count = 0; int cur_len, mlen, plen; + char *mbuf; pbuf = lparabuf; - cur_len = mlen = rb_sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname); + cur_len = mlen = sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname); mbuf = lmodebuf + mlen; RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head) @@ -1326,9 +1311,9 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p, *mbuf++ = c; cur_len += plen; if (banptr->forward) - pbuf += rb_sprintf(pbuf, "%s$%s ", banptr->banstr, banptr->forward); + pbuf += sprintf(pbuf, "%s$%s ", banptr->banstr, banptr->forward); else - pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr); + pbuf += sprintf(pbuf, "%s ", banptr->banstr); count++; free_ban(banptr);