X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/71ea606903ce615dc33557331efcca834988b4e9..255130dde8eed921fea4b23786a5743fbd50cbda:/src/channel.c diff --git a/src/channel.c b/src/channel.c index 0191f1f..a2e6fa6 100644 --- a/src/channel.c +++ b/src/channel.c @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: channel.c 3580 2007-11-07 23:45:14Z jilles $ */ #include "stdinc.h" @@ -107,6 +106,7 @@ free_channel(struct Channel *chptr) { channel_metadata_clear(chptr); rb_free(chptr->chname); + rb_free(chptr->mode_lock); rb_bh_free(channel_heap, chptr); } @@ -826,7 +826,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) char src_host[NICKLEN + USERLEN + HOSTLEN + 6]; char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6]; char src_althost[NICKLEN + USERLEN + HOSTLEN + 6]; - char *text = rb_strdup(""); + char text[10]; int use_althost = 0; int i = 0; hook_data_channel moduledata; @@ -857,14 +857,14 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN) return (ERR_BANNEDFROMCHAN); - rb_sprintf(text, "K%s", source_p->id); + rb_snprintf(text, sizeof(text), "K%s", source_p->id); DICTIONARY_FOREACH(md, &iter, chptr->metadata) { - if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time())) + if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time())) return ERR_KICKNOREJOIN; /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */ - if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time())) + if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time())) channel_metadata_delete(chptr, md->name, 0); } @@ -968,9 +968,6 @@ 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; @@ -990,6 +987,62 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt return CAN_SEND_NONOP; } +/* + * flood_attack_channel + * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC + * says NOTICE must not auto reply + * - pointer to source Client + * - pointer to target channel + * output - 1 if target is under flood attack + * side effects - check for flood attack on target chptr + */ +int +flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, char *chname) +{ + int delta; + + if(GlobalSetOptions.floodcount && MyClient(source_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood)) + { + if((chptr->first_received_message_time + 1) < rb_current_time()) + { + delta = rb_current_time() - chptr->first_received_message_time; + chptr->received_number_of_privmsgs -= delta; + chptr->first_received_message_time = rb_current_time(); + if(chptr->received_number_of_privmsgs <= 0) + { + chptr->received_number_of_privmsgs = 0; + chptr->flood_noticed = 0; + } + } + + if((chptr->received_number_of_privmsgs >= GlobalSetOptions.floodcount) + || chptr->flood_noticed) + { + if(chptr->flood_noticed == 0) + { + sendto_realops_snomask(SNO_BOTS, *chptr->chname == '&' ? L_ALL : L_NETWIDE, + "Possible Flooder %s[%s@%s] on %s target: %s", + source_p->name, source_p->username, + source_p->orighost, + source_p->servptr->name, chptr->chname); + chptr->flood_noticed = 1; + + /* Add a bit of penalty */ + chptr->received_number_of_privmsgs += 2; + } + if(MyClient(source_p) && (p_or_n != 1)) + sendto_one(source_p, + ":%s NOTICE %s :*** Message to %s throttled due to flooding", + me.name, source_p->name, chptr->chname); + return 1; + } + else + chptr->received_number_of_privmsgs++; + } + + return 0; +} + /* find_bannickchange_channel() * Input: client to check * Output: channel preventing nick change @@ -1535,6 +1588,57 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p, } } +void +resv_chan_forcepart(const char *name, const char *reason, int temp_time) +{ + rb_dlink_node *ptr; + rb_dlink_node *next_ptr; + struct Channel *chptr; + struct membership *msptr; + struct Client *target_p; + + if(!ConfigChannel.resv_forcepart) + return; + + /* for each user on our server in the channel list + * send them a PART, and notify opers. + */ + chptr = find_channel(name); + if(chptr != NULL) + { + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head) + { + msptr = ptr->data; + target_p = msptr->client_p; + + if(IsExemptResv(target_p)) + continue; + + sendto_server(target_p, chptr, CAP_TS6, NOCAPS, + ":%s PART %s", target_p->id, chptr->chname); + + sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s", + target_p->name, target_p->username, + target_p->host, chptr->chname, target_p->name); + + remove_user_from_channel(msptr); + + /* notify opers & user they were removed from the channel */ + sendto_realops_snomask(SNO_GENERAL, L_ALL, + "Forced PART for %s!%s@%s from %s (%s)", + target_p->name, target_p->username, + target_p->host, name, reason); + + if(temp_time > 0) + sendto_one_notice(target_p, ":*** Channel %s is temporarily unavailable on this server.", + name); + else + sendto_one_notice(target_p, ":*** Channel %s is no longer available on this server.", + name); + } + } +} + /* Check what we will forward to, without sending any notices to the user * -- jilles */ @@ -1782,7 +1886,10 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * continue; } - flags = CHFL_CHANOP; + if(ConfigChannel.admin_on_channel_create && ConfigChannel.use_admin) + flags = CHFL_ADMIN | CHFL_CHANOP; + else + flags = CHFL_CHANOP; } if((rb_dlink_list_length(&source_p->user->channel) >=