X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9230426e7a899ed8856cf5299aa982afb052c790..b3b2ed9780cba27094b31440e8c2fee12cc3dd45:/src/channel.c diff --git a/src/channel.c b/src/channel.c index b342492..c3e8cd9 100644 --- a/src/channel.c +++ b/src/channel.c @@ -41,6 +41,7 @@ #include "s_conf.h" /* ConfigFileEntry, ConfigChannel */ #include "s_newconf.h" #include "logger.h" +#include "packet.h" struct config_channel_entry ConfigChannel; rb_dlink_list global_channel_list; @@ -193,6 +194,54 @@ find_channel_status(struct membership *msptr, int combine) return buffer; } +/* is_any_op() + * + * input - membership to check for ops + * output - 1 if the user is op, halfop, or owner, 0 elsewise + * side effects - + */ +int +is_any_op(struct membership *msptr) +{ + /* Checks for +ah will go here when +ah are implemented */ + if(is_chanop(msptr)) + return 1; + else + return 0; +} + +/* is_chanop_voiced() + * + * input - memebership to check for status + * output - 1 if the user is op, halfop, owner, or voice, 0 elsewise + * side effects - + */ +int +is_chanop_voiced(struct membership *msptr) +{ + /* Checks for +ah will go here when +ah are implemented */ + if(is_chanop(msptr) || is_voiced(msptr)) + return 1; + else + return 0; +} + +/* can_kick_deop() + * + * input - two memeberships + * output - 1 if the first memebership can kick/deop the second, 0 elsewise + * side effects - + */ +int +can_kick_deop(struct membership *source, struct membership *target) +{ + /* This does not do much yet. That will change when +ah is in. */ + if(!is_any_op(source)) + return 0; + else + return 1; +} + /* add_user_to_channel() * * input - channel to add client to, client to add, channel flags @@ -724,6 +773,9 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) s_assert(source_p->localClient != NULL); + if(IsOverride(source_p)) + return 0; + rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host); rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost); if(source_p->localClient->mangledhost != NULL) @@ -846,6 +898,9 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt if(is_chanop_voiced(msptr)) return CAN_SEND_OPV; + if(IsOverride(source_p)) + return CAN_SEND_NONOP; + if(chptr->mode.mode & MODE_MODERATED) return CAN_SEND_NO; @@ -878,7 +933,7 @@ find_bannickchange_channel(struct Client *client_p) char src_host[NICKLEN + USERLEN + HOSTLEN + 6]; char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6]; - if (!MyClient(client_p)) + if (!MyClient(client_p) || IsOverride(client_p)) return NULL; rb_sprintf(src_host, "%s!%s@%s", client_p->name, client_p->username, client_p->host); @@ -903,6 +958,32 @@ find_bannickchange_channel(struct Client *client_p) return NULL; } +/* find_nonickchange_channel() + * Input: client to check + * Output: channel preventing nick change + */ +struct Channel * +find_nonickchange_channel(struct Client *client_p) +{ + struct Channel *chptr; + struct membership *msptr; + rb_dlink_node *ptr; + + if (!MyClient(client_p)) + return NULL; + + RB_DLINK_FOREACH(ptr, client_p->user->channel.head) + { + msptr = ptr->data; + chptr = msptr->chptr; + if (is_any_op(msptr)) + continue; + if (chptr->mode.mode & MODE_NONICK) + return chptr; + } + return NULL; +} + /* void check_spambot_warning(struct Client *source_p) * Input: Client to check, channel name or NULL if this is a part. * Output: none @@ -1077,6 +1158,26 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in } } +/* has_common_channel() + * + * input - pointer to client + * - pointer to another client + * output - 1 if the two have a channel in common, 0 elsewise + * side effects - none + */ +int +has_common_channel(struct Client *client1, struct Client *client2) +{ + rb_dlink_node *ptr; + + RB_DLINK_FOREACH(ptr, client1->user->channel.head) + { + if(IsMember(client2, ((struct membership *)ptr->data)->chptr)) + return 1; + } + return 0; +} + /* channel_modes() * * inputs - pointer to channel @@ -1408,8 +1509,6 @@ check_forward(struct Client *source_p, struct Channel *chptr, * output - NONE * side effects - Use has decided to join 0. This is legacy * from the days when channels were numbers not names. *sigh* - * There is a bunch of evilness necessary here due to - * anti spambot code. */ void do_join_0(struct Client *client_p, struct Client *source_p) @@ -1424,12 +1523,12 @@ do_join_0(struct Client *client_p, struct Client *source_p) sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p)); + while((ptr = source_p->user->channel.head)) + { if(source_p->user->channel.head && MyConnect(source_p) && !IsOper(source_p) && !IsExemptSpambot(source_p)) check_spambot_warning(source_p, NULL); - while((ptr = source_p->user->channel.head)) - { msptr = ptr->data; chptr = msptr->chptr; sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s", @@ -1442,31 +1541,41 @@ do_join_0(struct Client *client_p, struct Client *source_p) int check_channel_name_loc(struct Client *source_p, const char *name) { + const char *p; + s_assert(name != NULL); if(EmptyString(name)) return 0; if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p)) { - for(; *name; ++name) + for(p = name; *p; ++p) { - if(!IsChanChar(*name) || IsFakeChanChar(*name)) + if(!IsChanChar(*p) || IsFakeChanChar(*p)) return 0; } } else { - for(; *name; ++name) + for(p = name; *p; ++p) { - if(!IsChanChar(*name)) + if(!IsChanChar(*p)) return 0; } } + if(ConfigChannel.only_ascii_channels) + { + for(p = name; *p; ++p) + if(*p < 33 || *p > 126) + return 0; + } + + return 1; } -void user_join(struct Client * client_p, struct Client * source_p, char * channels, char * keys) +void user_join(struct Client * client_p, struct Client * source_p, const char * channels, const char * keys) { static char jbuf[BUFSIZE]; struct Channel *chptr = NULL; @@ -1478,7 +1587,6 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe char *p = NULL, *p2 = NULL; char *chanlist; char *mykey; - int successful_join_count = 0; /* Number of channels successfully joined */ jbuf[0] = '\0'; @@ -1612,14 +1720,9 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe { 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); @@ -1628,15 +1731,10 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe { 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))) { @@ -1650,13 +1748,15 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe 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); } + + 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); @@ -1679,8 +1779,22 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe if(flags & CHFL_CHANOP) { chptr->channelts = rb_current_time(); - chptr->mode.mode |= MODE_TOPICLIMIT; - chptr->mode.mode |= MODE_NOPRIVMSGS; + + /* autochanmodes stuff */ + if(ConfigChannel.autochanmodes) + { + char * ch; + for(ch = ConfigChannel.autochanmodes; *ch; *ch++) + { + chptr->mode.mode |= chmode_table[*ch].mode_type; + } + } + else + { + 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", @@ -1713,9 +1827,6 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe 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;