X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9a4dc29c68f79ee01ac81862fe80cd7b8b37951c..b72bd23a03fa5236e1e96baa693fe0549f0f2609:/src/channel.c diff --git a/src/channel.c b/src/channel.c index 156b6df..9cb71e8 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" @@ -67,6 +66,8 @@ static int h_can_join; static int h_can_create_channel; static int h_channel_join; +struct module_modes ModuleModes; + /* init_channels() * * input - @@ -86,6 +87,40 @@ init_channels(void) h_can_create_channel = register_hook("can_create_channel"); } +/* is this the best place to put this? */ +/* init_module_modes() + * + * input - + * output - + * side effects - various MODE_ values are set to 0 + */ +void +init_module_modes() +{ + ModuleModes.MODE_REGONLY = 0; + ModuleModes.MODE_NOCTCP = 0; + ModuleModes.MODE_NOCOLOR = 0; + ModuleModes.MODE_EXLIMIT = 0; + ModuleModes.MODE_PERMANENT = 0; + ModuleModes.MODE_OPMODERATE = 0; + ModuleModes.MODE_FREEINVITE = 0; + ModuleModes.MODE_FREETARGET = 0; + ModuleModes.MODE_DISFORWARD = 0; + ModuleModes.MODE_THROTTLE = 0; + ModuleModes.MODE_FORWARD = 0; + ModuleModes.MODE_NONOTICE = 0; + ModuleModes.MODE_NOACTION = 0; + ModuleModes.MODE_NOKICK = 0; + ModuleModes.MODE_NONICK = 0; + ModuleModes.MODE_NOCAPS = 0; + ModuleModes.MODE_NOREJOIN = 0; + ModuleModes.MODE_NOREPEAT = 0; + ModuleModes.MODE_NOOPERKICK = 0; + + ModuleModes.CHFL_QUIET = 0; +} + + /* * allocate_channel - Allocates a channel */ @@ -93,20 +128,21 @@ struct Channel * allocate_channel(const char *chname) { struct Channel *chptr; - struct Dictionary *c_metadata; + struct Dictionary *metadata; chptr = rb_bh_alloc(channel_heap); chptr->chname = rb_strdup(chname); - c_metadata = irc_dictionary_create(irccmp); - chptr->c_metadata = c_metadata; + metadata = irc_dictionary_create(irccmp); + chptr->metadata = metadata; return (chptr); } void free_channel(struct Channel *chptr) { - channel_metadata_delete(chptr, "NOREPEAT", 0); + channel_metadata_clear(chptr); rb_free(chptr->chname); + rb_free(chptr->mode_lock); rb_bh_free(channel_heap, chptr); } @@ -186,7 +222,7 @@ find_channel_status(struct membership *msptr, int combine) p = buffer; - if(is_owner(msptr)) + if(is_admin(msptr)) { if(!combine) return "!"; @@ -233,18 +269,18 @@ is_halfop(struct membership *msptr) return 0; } -/* is_owner() +/* is_admin() * - * input - membership to check for owner - * output - 1 if the user is an owner, 0 if the user is not or owner + * input - membership to check for admin + * output - 1 if the user is an admin, 0 if the user is not or admin * is disabled. * side effects - * */ int -is_owner(struct membership *msptr) +is_admin(struct membership *msptr) { - if(!ConfigChannel.use_owner) + if(!ConfigChannel.use_admin) return 0; if(is_chmode_a(msptr)) return 1; @@ -255,13 +291,13 @@ is_owner(struct membership *msptr) /* is_any_op() * * input - membership to check for ops - * output - 1 if the user is op, halfop, or owner, 0 elsewise + * output - 1 if the user is op, halfop, or admin, 0 elsewise * side effects - */ int is_any_op(struct membership *msptr) { - if(is_chanop(msptr) || is_halfop(msptr) || is_owner(msptr)) + if(is_chanop(msptr) || is_halfop(msptr) || is_admin(msptr)) return 1; else return 0; @@ -270,13 +306,13 @@ is_any_op(struct membership *msptr) /* is_chanop_voiced() * * input - memebership to check for status - * output - 1 if the user is op, halfop, owner, or voice, 0 elsewise + * output - 1 if the user is op, halfop, admin, or voice, 0 elsewise * side effects - */ int is_chanop_voiced(struct membership *msptr) { - if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_owner(msptr)) + if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_admin(msptr)) return 1; else return 0; @@ -291,11 +327,11 @@ is_chanop_voiced(struct membership *msptr) int can_kick_deop(struct membership *source, struct membership *target) { - if(is_chanop(source) && !is_owner(target)) + if(is_chanop(source) && !is_admin(target)) return 1; else if(is_halfop(source) && !is_any_op(target)) return 1; - else if(is_owner(source)) + else if(is_admin(source)) return 1; return 0; @@ -353,7 +389,7 @@ remove_user_from_channel(struct membership *msptr) if(client_p->servptr == &me) rb_dlinkDelete(&msptr->locchannode, &chptr->locmembers); - if(!(chptr->mode.mode & MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) + if(!(chptr->mode.mode & ModuleModes.MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) destroy_channel(chptr); rb_bh_free(member_heap, msptr); @@ -388,7 +424,7 @@ remove_user_from_channels(struct Client *client_p) if(client_p->servptr == &me) rb_dlinkDelete(&msptr->locchannode, &chptr->locmembers); - if(!(chptr->mode.mode & MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) + if(!(chptr->mode.mode & ModuleModes.MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) destroy_channel(chptr); rb_bh_free(member_heap, msptr); @@ -724,6 +760,10 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr, struct Ban *actualBan = NULL; struct Ban *actualExcept = NULL; + /* check to make sure quiets even exist on this server first */ + if(ModuleModes.CHFL_QUIET == 0) + return 0; + if(!MyClient(who)) return 0; @@ -759,7 +799,7 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr, if(match(actualBan->banstr, s) || match(actualBan->banstr, s2) || match_cidr(actualBan->banstr, s2) || - match_extban(actualBan->banstr, who, chptr, CHFL_QUIET) || + match_extban(actualBan->banstr, who, chptr, ModuleModes.CHFL_QUIET) || (s3 != NULL && match(actualBan->banstr, s3))) break; else @@ -826,15 +866,15 @@ 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[10]; int use_althost = 0; int i = 0; hook_data_channel moduledata; + struct Metadata *md; + struct DictionaryIter iter; 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) @@ -857,6 +897,17 @@ 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_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 + 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 + 2 > rb_current_time())) + channel_metadata_delete(chptr, md->name, 0); + } + if(chptr->mode.mode & MODE_INVITEONLY) { RB_DLINK_FOREACH(invite, source_p->user->invited.head) @@ -889,15 +940,19 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) if(chptr->mode.limit && rb_dlink_list_length(&chptr->members) >= (unsigned long) chptr->mode.limit) i = ERR_CHANNELISFULL; - if(chptr->mode.mode & MODE_REGONLY && EmptyString(source_p->user->suser)) + if(chptr->mode.mode & ModuleModes.MODE_REGONLY && EmptyString(source_p->user->suser)) i = ERR_NEEDREGGEDNICK; /* join throttling stuff --nenolod */ - else if(chptr->mode.join_num > 0 && chptr->mode.join_time > 0) + /* only check for throttles if they exist on this server --Taros */ + else if(ModuleModes.MODE_THROTTLE) { - if ((rb_current_time() - chptr->join_delta <= - chptr->mode.join_time) && (chptr->join_count >= - chptr->mode.join_num)) - i = ERR_THROTTLE; + if(chptr->mode.join_num > 0 && chptr->mode.join_time > 0) + { + if ((rb_current_time() - chptr->join_delta <= + chptr->mode.join_time) && (chptr->join_count >= + chptr->mode.join_num)) + i = ERR_THROTTLE; + } } /* allow /invite to override +l/+r/+j also -- jilles */ @@ -957,9 +1012,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; @@ -1035,7 +1087,7 @@ find_nonickchange_channel(struct Client *client_p) { msptr = ptr->data; chptr = msptr->chptr; - if (chptr->mode.mode & MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr))) + if (chptr->mode.mode & ModuleModes.MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr))) return chptr; } return NULL; @@ -1290,7 +1342,7 @@ channel_modes(struct Channel *chptr, struct Client *client_p) chptr->mode.join_time); } - if(*chptr->mode.forward && (ConfigChannel.use_forward || !IsClient(client_p))) + if(*chptr->mode.forward && (ModuleModes.MODE_FORWARD || !IsClient(client_p))) { *mbuf++ = 'f'; @@ -1524,6 +1576,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 */ @@ -1550,7 +1653,7 @@ check_forward(struct Client *source_p, struct Channel *chptr, if (hash_find_resv(chptr->chname)) return NULL; /* Don't forward to +Q channel */ - if (chptr->mode.mode & MODE_DISFORWARD) + if (chptr->mode.mode & ModuleModes.MODE_DISFORWARD) return NULL; i = can_join(source_p, chptr, key); if (i == 0) @@ -1771,7 +1874,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) >= @@ -1800,8 +1906,17 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * /* 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)) + if(IsOverride(source_p)) + { + sendto_wallops_flags(UMODE_WALLOP, &me, + "%s is overriding JOIN to [%s]", + get_oper_name(source_p), chptr->chname); + sendto_server(NULL, chptr, NOCAPS, NOCAPS, + ":%s WALLOPS :%s is overriding JOIN to [%s]", + me.name, get_oper_name(source_p), chptr->chname); + } + else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || + (!ModuleModes.MODE_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 @@ -1812,8 +1927,8 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * continue; } - - sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); + else + sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); } if(flags == 0 && @@ -1918,7 +2033,7 @@ channel_metadata_add(struct Channel *target, const char *name, const char *value md->name = rb_strdup(name); md->value = rb_strdup(value); - irc_dictionary_add(target->c_metadata, md->name, md); + irc_dictionary_add(target->metadata, md->name, md); if(propegate) sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA ADD %s %s :%s", @@ -1927,6 +2042,31 @@ channel_metadata_add(struct Channel *target, const char *name, const char *value return md; } +/* + * channel_metadata_time_add + * + * inputs - pointer to channel struct + * - name of metadata item you wish to add + * - time_t you wish to add + * - value you wish to add + * output - none + * side effects - metadata is added to the channel in question + */ +struct Metadata * +channel_metadata_time_add(struct Channel *target, const char *name, time_t timevalue, const char *value) +{ + struct Metadata *md; + + md = rb_malloc(sizeof(struct Metadata)); + md->name = rb_strdup(name); + md->value = rb_strdup(value); + md->timevalue = timevalue; + + irc_dictionary_add(target->metadata, md->name, md); + + return md; +} + /* * channel_metadata_delete * @@ -1944,7 +2084,7 @@ channel_metadata_delete(struct Channel *target, const char *name, int propegate) if(!md) return; - irc_dictionary_delete(target->c_metadata, md->name); + irc_dictionary_delete(target->metadata, md->name); rb_free(md); @@ -1967,8 +2107,27 @@ channel_metadata_find(struct Channel *target, const char *name) if(!target) return NULL; - if(!target->c_metadata) + if(!target->metadata) return NULL; - return irc_dictionary_retrieve(target->c_metadata, name); + return irc_dictionary_retrieve(target->metadata, name); +} + +/* + * channel_metadata_clear + * + * inputs - pointer to channel struct + * output - none + * side effects - metadata is cleared from the channel in question + */ +void +channel_metadata_clear(struct Channel *chptr) +{ + struct Metadata *md; + struct DictionaryIter iter; + + DICTIONARY_FOREACH(md, &iter, chptr->metadata) + { + channel_metadata_delete(chptr, md->name, 0); + } }