From 67b90240c4f15588f944de99391b2f98bc9cb0f7 Mon Sep 17 00:00:00 2001 From: JD Horelick Date: Tue, 23 Feb 2010 02:48:33 -0500 Subject: [PATCH] move user_join() to channels.c --- include/channel.h | 3 +- modules/core/m_join.c | 250 +-------------------------------------- src/channel.c | 263 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 267 insertions(+), 249 deletions(-) diff --git a/include/channel.h b/include/channel.h index 6dca63a..c95b566 100644 --- a/include/channel.h +++ b/include/channel.h @@ -271,7 +271,8 @@ extern int match_extban(const char *banstr, struct Client *client_p, struct Chan extern int valid_extban(const char *banstr, struct Client *client_p, struct Channel *chptr, long mode_type); const char * get_extban_string(void); -extern struct Channel * check_forward(struct Client *source_p, struct Channel *chptr, char *key) +extern struct Channel * check_forward(struct Client *source_p, struct Channel *chptr, char *key); +extern void user_join(struct Client * source_p, char * channels, char * keys); #endif /* INCLUDED_channel_h */ diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 257efbf..d245023 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -46,9 +46,6 @@ 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 int h_can_create_channel; -static int h_channel_join; - struct Message join_msgtab = { "JOIN", 0, 0, 0, MFLG_SLOW, {mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}} @@ -61,13 +58,7 @@ struct Message sjoin_msgtab = { mapi_clist_av1 join_clist[] = { &join_msgtab, &sjoin_msgtab, NULL }; -mapi_hlist_av1 join_hlist[] = { - { "can_create_channel", &h_can_create_channel }, - { "channel_join", &h_channel_join }, - { NULL, NULL }, -}; - -DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $"); +DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, NULL, NULL, "$Revision: 3494 $"); 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); @@ -92,244 +83,7 @@ static int pargs; static int m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { - static char jbuf[BUFSIZE]; - struct Channel *chptr = NULL; - struct ConfItem *aconf; - char *name; - char *key = NULL; - const char *modes; - int i, flags = 0; - char *p = NULL, *p2 = NULL; - char *chanlist; - char *mykey; - - jbuf[0] = '\0'; - - /* rebuild the list of channels theyre supposed to be joining. - * this code has a side effect of losing keys, but.. - */ - chanlist = LOCAL_COPY(parv[1]); - for(name = rb_strtok_r(chanlist, ",", &p); name; name = rb_strtok_r(NULL, ",", &p)) - { - /* check the length and name of channel is ok */ - if(!check_channel_name_loc(source_p, name) || (strlen(name) > LOC_CHANNELLEN)) - { - sendto_one_numeric(source_p, ERR_BADCHANNAME, - form_str(ERR_BADCHANNAME), (unsigned char *) name); - continue; - } - - /* join 0 parts all channels */ - if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist) - { - (void) strcpy(jbuf, "0"); - continue; - } - - /* check it begins with # or &, and local chans are disabled */ - else if(!IsChannelName(name)) - { - sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, - form_str(ERR_NOSUCHCHANNEL), name); - continue; - } - - /* see if its resv'd */ - if(!IsExemptResv(source_p) && (aconf = hash_find_resv(name))) - { - sendto_one_numeric(source_p, ERR_BADCHANNAME, - form_str(ERR_BADCHANNAME), name); - - /* dont warn for opers */ - if(!IsExemptJupe(source_p) && !IsOper(source_p)) - sendto_realops_snomask(SNO_SPY, L_NETWIDE, - "User %s (%s@%s) is attempting to join locally juped channel %s (%s)", - source_p->name, source_p->username, - source_p->orighost, name, aconf->passwd); - /* dont update tracking for jupe exempt users, these - * are likely to be spamtrap leaves - */ - else if(IsExemptJupe(source_p)) - aconf->port--; - - continue; - } - - if(splitmode && !IsOper(source_p) && (*name != '&') && - ConfigChannel.no_join_on_split) - { - sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), - me.name, source_p->name, name); - continue; - } - - if(*jbuf) - (void) strcat(jbuf, ","); - (void) rb_strlcat(jbuf, name, sizeof(jbuf)); - } - - if(parc > 2) - { - mykey = LOCAL_COPY(parv[2]); - key = rb_strtok_r(mykey, ",", &p2); - } - - for(name = rb_strtok_r(jbuf, ",", &p); name; - key = (key) ? rb_strtok_r(NULL, ",", &p2) : NULL, name = rb_strtok_r(NULL, ",", &p)) - { - hook_data_channel_activity hook_info; - - /* JOIN 0 simply parts all channels the user is in */ - if(*name == '0' && !atoi(name)) - { - if(source_p->user->channel.head == NULL) - continue; - - do_join_0(&me, source_p); - continue; - } - - /* look for the channel */ - if((chptr = find_channel(name)) != NULL) - { - if(IsMember(source_p, chptr)) - continue; - - flags = 0; - } - else - { - hook_data_client_approval moduledata; - - moduledata.client = source_p; - moduledata.approved = 0; - - call_hook(h_can_create_channel, &moduledata); - - if(moduledata.approved != 0) - { - sendto_one(source_p, form_str(moduledata.approved), - me.name, source_p->name, name); - continue; - } - - if(splitmode && !IsOper(source_p) && (*name != '&') && - ConfigChannel.no_create_on_split) - { - sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), - me.name, source_p->name, name); - continue; - } - - flags = CHFL_CHANOP; - } - - if((rb_dlink_list_length(&source_p->user->channel) >= - (unsigned long) ConfigChannel.max_chans_per_user) && - (!IsOper(source_p) || - (rb_dlink_list_length(&source_p->user->channel) >= - (unsigned long) ConfigChannel.max_chans_per_user * 3))) - { - sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS), - me.name, source_p->name, name); - return 0; - } - - if(chptr == NULL) /* If I already have a chptr, no point doing this */ - { - chptr = get_or_create_channel(source_p, name, NULL); - - if(chptr == NULL) - { - sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), - me.name, source_p->name, name); - continue; - } - } - - /* can_join checks for +i key, bans etc */ - if((i = can_join(source_p, chptr, key))) - { - if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || - (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) - { - /* might be wrong, but is there any other better location for such? - * see extensions/chm_operonly.c for other comments on this - * -- dwr - */ - if(i != ERR_CUSTOM) - sendto_one(source_p, form_str(i), me.name, source_p->name, name); - - continue; - } - - sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); - } - - if(flags == 0 && - !IsOper(source_p) && !IsExemptSpambot(source_p)) - check_spambot_warning(source_p, name); - - /* add the user to the channel */ - add_user_to_channel(chptr, source_p, flags); - if (chptr->mode.join_num && - rb_current_time() - chptr->join_delta >= chptr->mode.join_time) - { - chptr->join_count = 0; - chptr->join_delta = rb_current_time(); - } - chptr->join_count++; - - /* we send the user their join here, because we could have to - * send a mode out next. - */ - sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s", - source_p->name, - source_p->username, source_p->host, chptr->chname); - - /* its a new channel, set +nt and burst. */ - if(flags & CHFL_CHANOP) - { - chptr->channelts = rb_current_time(); - chptr->mode.mode |= MODE_TOPICLIMIT; - chptr->mode.mode |= MODE_NOPRIVMSGS; - modes = channel_modes(chptr, &me); - - sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s", - me.name, chptr->chname, modes); - - sendto_server(client_p, chptr, CAP_TS6, NOCAPS, - ":%s SJOIN %ld %s %s :@%s", - me.id, (long) chptr->channelts, - chptr->chname, modes, source_p->id); - } - else - { - sendto_server(client_p, chptr, CAP_TS6, NOCAPS, - ":%s JOIN %ld %s +", - use_id(source_p), (long) chptr->channelts, - chptr->chname); - } - - del_invite(chptr, source_p); - - if(chptr->topic != NULL) - { - sendto_one(source_p, form_str(RPL_TOPIC), me.name, - source_p->name, chptr->chname, chptr->topic); - - sendto_one(source_p, form_str(RPL_TOPICWHOTIME), - me.name, source_p->name, chptr->chname, - chptr->topic_info, chptr->topic_time); - } - - channel_member_names(chptr, source_p, 1); - - hook_info.client = source_p; - hook_info.chptr = chptr; - hook_info.key = key; - call_hook(h_channel_join, &hook_info); - } + user_join(source_p, parv[1], parc > 2 ? parv[2] : NULL); /* channel.c */ return 0; } diff --git a/src/channel.c b/src/channel.c index 61332aa..1f0c9c1 100644 --- a/src/channel.c +++ b/src/channel.c @@ -62,6 +62,8 @@ static struct ChCapCombo chcap_combos[NCHCAP_COMBOS]; static void free_topic(struct Channel *chptr); static int h_can_join; +static int h_can_create_channel; +static int h_channel_join; /* init_channels() * @@ -78,6 +80,8 @@ init_channels(void) member_heap = rb_bh_create(sizeof(struct membership), MEMBER_HEAP_SIZE, "member_heap"); h_can_join = register_hook("can_join"); + h_channel_join = register_hook("channel_join"); + h_can_create_channel = register_hook("can_create_channel"); } /* @@ -1396,3 +1400,262 @@ check_forward(struct Client *source_p, struct Channel *chptr, return NULL; } + +void user_join(struct Client * source_p, char * channels, char * keys) +{ + static char jbuf[BUFSIZE]; + struct Channel *chptr = NULL; + struct ConfItem *aconf; + char *name; + char *key = NULL; + const char *modes; + int i, flags = 0; + char *p = NULL, *p2 = NULL; + char *chanlist; + char *mykey; + int successful_join_count = 0; /* Number of channels successfully joined */ + + jbuf[0] = '\0'; + + if(channels == NULL) + return; + + /* rebuild the list of channels theyre supposed to be joining. + * this code has a side effect of losing keys, but.. + */ + chanlist = LOCAL_COPY(channels); + for(name = rb_strtok_r(chanlist, ",", &p); name; name = rb_strtok_r(NULL, ",", &p)) + { + /* check the length and name of channel is ok */ + if(!check_channel_name_loc(source_p, name) || (strlen(name) > LOC_CHANNELLEN)) + { + sendto_one_numeric(source_p, ERR_BADCHANNAME, + form_str(ERR_BADCHANNAME), (unsigned char *) name); + continue; + } + + /* join 0 parts all channels */ + if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist) + { + (void) strcpy(jbuf, "0"); + continue; + } + + /* check it begins with # or &, and local chans are disabled */ + else if(!IsChannelName(name)) + { + sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, + form_str(ERR_NOSUCHCHANNEL), name); + continue; + } + + /* see if its resv'd */ + if(!IsExemptResv(source_p) && (aconf = hash_find_resv(name))) + { + sendto_one_numeric(source_p, ERR_BADCHANNAME, + form_str(ERR_BADCHANNAME), name); + + /* dont warn for opers */ + if(!IsExemptJupe(source_p) && !IsOper(source_p)) + sendto_realops_snomask(SNO_SPY, L_NETWIDE, + "User %s (%s@%s) is attempting to join locally juped channel %s (%s)", + source_p->name, source_p->username, + source_p->orighost, name, aconf->passwd); + /* dont update tracking for jupe exempt users, these + * are likely to be spamtrap leaves + */ + else if(IsExemptJupe(source_p)) + aconf->port--; + + continue; + } + + if(splitmode && !IsOper(source_p) && (*name != '&') && + ConfigChannel.no_join_on_split) + { + sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), + me.name, source_p->name, name); + continue; + } + + if(*jbuf) + (void) strcat(jbuf, ","); + (void) rb_strlcat(jbuf, name, sizeof(jbuf)); + } + + if(keys != NULL) + { + mykey = LOCAL_COPY(keys); + key = rb_strtok_r(mykey, ",", &p2); + } + + for(name = rb_strtok_r(jbuf, ",", &p); name; + key = (key) ? rb_strtok_r(NULL, ",", &p2) : NULL, name = rb_strtok_r(NULL, ",", &p)) + { + hook_data_channel_activity hook_info; + + /* JOIN 0 simply parts all channels the user is in */ + if(*name == '0' && !atoi(name)) + { + if(source_p->user->channel.head == NULL) + continue; + + do_join_0(&me, source_p); + continue; + } + + /* look for the channel */ + if((chptr = find_channel(name)) != NULL) + { + if(IsMember(source_p, chptr)) + continue; + + flags = 0; + } + else + { + hook_data_client_approval moduledata; + + moduledata.client = source_p; + moduledata.approved = 0; + + call_hook(h_can_create_channel, &moduledata); + + if(moduledata.approved != 0) + { + sendto_one(source_p, form_str(moduledata.approved), + me.name, source_p->name, name); + continue; + } + + if(splitmode && !IsOper(source_p) && (*name != '&') && + ConfigChannel.no_create_on_split) + { + sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), + me.name, source_p->name, name); + continue; + } + + flags = CHFL_CHANOP; + } + + if((rb_dlink_list_length(&source_p->user->channel) >= + (unsigned long) ConfigChannel.max_chans_per_user) && + (!IsOper(source_p) || + (rb_dlink_list_length(&source_p->user->channel) >= + (unsigned long) ConfigChannel.max_chans_per_user * 3))) + { + sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS), + me.name, source_p->name, name); + if(successful_join_count) + source_p->localClient->last_join_time = rb_current_time(); + return; + } + + if(flags == 0) /* if channel doesn't exist, don't penalize */ + successful_join_count++; + + if(chptr == NULL) /* If I already have a chptr, no point doing this */ + { + chptr = get_or_create_channel(source_p, name, NULL); + + if(chptr == NULL) + { + sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), + me.name, source_p->name, name); + if(successful_join_count > 0) + successful_join_count--; + continue; + } + } + + if(!IsOper(source_p) && !IsExemptSpambot(source_p)) + check_spambot_warning(source_p, name); + + /* can_join checks for +i key, bans etc */ + if((i = can_join(source_p, chptr, key))) + { + if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || + (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) + { + /* might be wrong, but is there any other better location for such? + * see extensions/chm_operonly.c for other comments on this + * -- dwr + */ + if(i != ERR_CUSTOM) + sendto_one(source_p, form_str(i), me.name, source_p->name, name); + + if(successful_join_count > 0) + successful_join_count--; + continue; + } + + sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); + } + + /* add the user to the channel */ + add_user_to_channel(chptr, source_p, flags); + if (chptr->mode.join_num && + rb_current_time() - chptr->join_delta >= chptr->mode.join_time) + { + chptr->join_count = 0; + chptr->join_delta = rb_current_time(); + } + chptr->join_count++; + + /* we send the user their join here, because we could have to + * send a mode out next. + */ + sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s", + source_p->name, + source_p->username, source_p->host, chptr->chname); + + /* its a new channel, set +nt and burst. */ + if(flags & CHFL_CHANOP) + { + chptr->channelts = rb_current_time(); + chptr->mode.mode |= MODE_TOPICLIMIT; + chptr->mode.mode |= MODE_NOPRIVMSGS; + modes = channel_modes(chptr, &me); + + sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s", + me.name, chptr->chname, modes); + + sendto_server(client_p, chptr, CAP_TS6, NOCAPS, + ":%s SJOIN %ld %s %s :@%s", + me.id, (long) chptr->channelts, + chptr->chname, modes, source_p->id); + } + else + { + sendto_server(client_p, chptr, CAP_TS6, NOCAPS, + ":%s JOIN %ld %s +", + use_id(source_p), (long) chptr->channelts, + chptr->chname); + } + + del_invite(chptr, source_p); + + if(chptr->topic != NULL) + { + sendto_one(source_p, form_str(RPL_TOPIC), me.name, + source_p->name, chptr->chname, chptr->topic); + + sendto_one(source_p, form_str(RPL_TOPICWHOTIME), + me.name, source_p->name, chptr->chname, + chptr->topic_info, chptr->topic_time); + } + + channel_member_names(chptr, source_p, 1); + + if(successful_join_count) + source_p->localClient->last_join_time = rb_current_time(); + + hook_info.client = source_p; + hook_info.chptr = chptr; + hook_info.key = key; + call_hook(h_channel_join, &hook_info); + } + + return; +}