X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0eceaff17a0fd935caa086ee43b328b0ea9282a5..34d8ef4d14dfcef13f8aab3746b30c6f8cacb4a1:/src/channel.c diff --git a/src/channel.c b/src/channel.c index fab6c92..ff77a3a 100644 --- a/src/channel.c +++ b/src/channel.c @@ -42,6 +42,7 @@ #include "s_newconf.h" #include "logger.h" #include "packet.h" +#include "irc_dictionary.h" struct config_channel_entry ConfigChannel; rb_dlink_list global_channel_list; @@ -92,14 +93,19 @@ struct Channel * allocate_channel(const char *chname) { struct Channel *chptr; + struct Dictionary *metadata; chptr = rb_bh_alloc(channel_heap); chptr->chname = rb_strdup(chname); + + metadata = irc_dictionary_create(irccmp); + chptr->metadata = metadata; return (chptr); } void free_channel(struct Channel *chptr) { + channel_metadata_clear(chptr); rb_free(chptr->chname); rb_bh_free(channel_heap, chptr); } @@ -820,14 +826,25 @@ 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(""); 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)) + { + 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]", + use_id(source_p), get_oper_name(source_p), chptr->chname); 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); @@ -851,6 +868,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_sprintf(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())) + 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())) + channel_metadata_delete(chptr, md->name, 0); + } + if(chptr->mode.mode & MODE_INVITEONLY) { RB_DLINK_FOREACH(invite, source_p->user->invited.head) @@ -1029,9 +1057,7 @@ find_nonickchange_channel(struct Client *client_p) { msptr = ptr->data; chptr = msptr->chptr; - if (is_any_op(msptr)) - continue; - if (chptr->mode.mode & MODE_NONICK) + if (chptr->mode.mode & MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr))) return chptr; } return NULL; @@ -1254,8 +1280,12 @@ channel_modes(struct Channel *chptr, struct Client *client_p) *pbuf = '\0'; for (i = 0; i < 256; i++) + { + if(chmode_table[i].set_func == chm_hidden && !IsOper(client_p) && IsClient(client_p)) + continue; if(chptr->mode.mode & chmode_flags[i]) *mbuf++ = i; + } if(chptr->mode.limit) { @@ -1889,3 +1919,122 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * return; } + +/* + * channel_metadata_add + * + * inputs - pointer to channel struct + * - name of metadata item you wish to add + * - value of metadata item + * - 1 if metadata should be propegated, 0 if not + * output - none + * side effects - metadata is added to the channel in question + * - metadata is propegated if propegate is set. + */ +struct Metadata * +channel_metadata_add(struct Channel *target, const char *name, const char *value, int propegate) +{ + struct Metadata *md; + + md = rb_malloc(sizeof(struct Metadata)); + md->name = rb_strdup(name); + md->value = rb_strdup(value); + + irc_dictionary_add(target->metadata, md->name, md); + + if(propegate) + sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA ADD %s %s :%s", + target->chname, name, 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 + * + * inputs - pointer to channel struct + * - name of metadata item you wish to delete + * output - none + * side effects - metadata is deleted from the channel in question + * - deletion is propegated if propegate is set + */ +void +channel_metadata_delete(struct Channel *target, const char *name, int propegate) +{ + struct Metadata *md = channel_metadata_find(target, name); + + if(!md) + return; + + irc_dictionary_delete(target->metadata, md->name); + + rb_free(md); + + if(propegate) + sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA DELETE %s %s", + target->chname, name); +} + +/* + * channel_metadata_find + * + * inputs - pointer to channel struct + * - name of metadata item you wish to read + * output - the requested metadata, if it exists, elsewise null. + * side effects - + */ +struct Metadata * +channel_metadata_find(struct Channel *target, const char *name) +{ + if(!target) + return NULL; + + if(!target->metadata) + return NULL; + + 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); + } +}