cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

There's no reason to have two nearly identical structs for metadata, move metadata struct to ircd.h and use it for both channel and user metadata.

This commit is contained in:
B.Greenham 2010-03-05 00:51:40 -05:00
parent 07b7b659c1
commit 0b370fcc63
5 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/channel.h
View File

@ -72,7 +72,7 @@ struct Channel
unsigned int join_count; /* joins within delta */
unsigned int join_delta; /* last ts of join */
struct Dictionary *c_metadata;
struct Dictionary *metadata;
unsigned long bants;
time_t channelts;
@ -92,13 +92,6 @@ struct membership
unsigned long bants;
};
struct c_Metadata
{
const char *name;
const char *value;
time_t timevalue;
};
#define BANLEN 195
struct Ban
{

6
include/client.h
View File

@ -313,12 +313,6 @@ struct ListClient
*/
};
struct Metadata
{
const char *name;
const char *value;
};
/*
* status macros.
*/

7
include/ircd.h
View File

@ -47,6 +47,13 @@ struct SetOptions
char adminstring[REALLEN];
};
struct Metadata
{
const char *name;
const char *value;
time_t timevalue;
};
struct Counter
{
int oper; /* Opers */

30
src/channel.c
View File

@ -93,12 +93,12 @@ 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);
}
@ -829,7 +829,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
int use_althost = 0;
int i = 0;
hook_data_channel moduledata;
struct c_Metadata *md;
struct Metadata *md;
struct DictionaryIter iter;
char *text = rb_strdup("");
@ -869,7 +869,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
return ERR_KICKNOREJOIN;
}
/* cleanup the channel's kicknorejoin metadata. */
DICTIONARY_FOREACH(md, &iter, chptr->c_metadata)
DICTIONARY_FOREACH(md, &iter, chptr->metadata)
{
text = rb_strdup(md->name);
if((text[0] == 'K') && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))
@ -1933,13 +1933,13 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
struct Metadata *
channel_metadata_add(struct Channel *target, const char *name, const char *value, int propegate)
{
struct c_Metadata *md;
struct Metadata *md;
md = rb_malloc(sizeof(struct Metadata));
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",
@ -1960,13 +1960,13 @@ channel_metadata_add(struct Channel *target, const char *name, const char *value
struct Metadata *
channel_metadata_time_add(struct Channel *target, const char *name, time_t value)
{
struct c_Metadata *md;
struct Metadata *md;
md = rb_malloc(sizeof(struct c_Metadata));
md = rb_malloc(sizeof(struct Metadata));
md->name = rb_strdup(name);
md->timevalue = value;
irc_dictionary_add(target->c_metadata, md->name, md);
irc_dictionary_add(target->metadata, md->name, md);
return md;
}
@ -1983,12 +1983,12 @@ channel_metadata_time_add(struct Channel *target, const char *name, time_t value
void
channel_metadata_delete(struct Channel *target, const char *name, int propegate)
{
struct c_Metadata *md = channel_metadata_find(target, name);
struct Metadata *md = channel_metadata_find(target, name);
if(!md)
return;
irc_dictionary_delete(target->c_metadata, md->name);
irc_dictionary_delete(target->metadata, md->name);
rb_free(md);
@ -2011,10 +2011,10 @@ 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);
}
/*
@ -2030,7 +2030,7 @@ channel_metadata_clear(struct Channel *chptr)
struct Metadata *md;
struct DictionaryIter iter;
DICTIONARY_FOREACH(md, &iter, chptr->c_metadata)
DICTIONARY_FOREACH(md, &iter, chptr->metadata)
{
channel_metadata_delete(chptr, md->name, 0);
}

2
src/s_serv.c
View File

@ -587,7 +587,7 @@ burst_TS6(struct Client *client_p)
}
sendto_one(client_p, "%s", buf);
DICTIONARY_FOREACH(md, &iter, chptr->c_metadata)
DICTIONARY_FOREACH(md, &iter, chptr->metadata)
{
/* don't bother bursting +J metadata */
if(!(md->name[0] == 'K'))