static rb_bh *lclient_heap = NULL;
static rb_bh *pclient_heap = NULL;
static rb_bh *user_heap = NULL;
-static rb_bh *away_heap = NULL;
+static rb_bh *metadata_heap = NULL;
static char current_uid[IDLEN];
struct Dictionary *nd_dict = NULL;
lclient_heap = rb_bh_create(sizeof(struct LocalUser), LCLIENT_HEAP_SIZE, "lclient_heap");
pclient_heap = rb_bh_create(sizeof(struct PreClient), PCLIENT_HEAP_SIZE, "pclient_heap");
user_heap = rb_bh_create(sizeof(struct User), USER_HEAP_SIZE, "user_heap");
- away_heap = rb_bh_create(AWAYLEN, AWAY_HEAP_SIZE, "away_heap");
+ metadata_heap = rb_bh_create(sizeof(struct MetadataEntry), USER_HEAP_SIZE, "metadata_heap");
rb_event_addish("check_pings", check_pings, NULL, 30);
rb_event_addish("free_exited_clients", &free_exited_clients, NULL, 4);
rb_free(client_p->localClient->fullcaps);
rb_free(client_p->localClient->opername);
rb_free(client_p->localClient->mangledhost);
+ if (client_p->localClient->privset)
+ privilegeset_unref(client_p->localClient->privset);
- ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+ if(IsSSL(client_p))
+ ssld_decrement_clicount(client_p->localClient->ssl_ctl);
+
+ if(IsCapable(client_p, CAP_ZIP))
+ ssld_decrement_clicount(client_p->localClient->z_ctl);
rb_bh_free(lclient_heap, client_p->localClient);
client_p->localClient = NULL;
void
check_banned_lines(void)
{
- struct Client *client_p; /* current local client_p being examined */
- struct ConfItem *aconf = NULL;
- rb_dlink_node *ptr, *next_ptr;
-
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
- {
- client_p = ptr->data;
-
- if(IsMe(client_p))
- continue;
-
- /* if there is a returned struct ConfItem then kill it */
- if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, client_p->localClient->ip.ss_family)))
- {
- if(aconf->status & CONF_EXEMPTDLINE)
- continue;
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "DLINE active for %s",
- get_client_name(client_p, HIDE_IP));
-
- notify_banned_client(client_p, aconf, D_LINED);
- continue; /* and go examine next fd/client_p */
- }
-
- if(!IsPerson(client_p))
- continue;
-
- if((aconf = find_kline(client_p)) != NULL)
- {
- if(IsExemptKline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
- get_client_name(client_p, HIDE_IP),
- aconf->user, aconf->host);
- continue;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "KLINE active for %s",
- get_client_name(client_p, HIDE_IP));
- notify_banned_client(client_p, aconf, K_LINED);
- continue;
- }
- else if((aconf = find_xline(client_p->info, 1)) != NULL)
- {
- if(IsExemptKline(client_p))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "XLINE over-ruled for %s, client is kline_exempt [%s]",
- get_client_name(client_p, HIDE_IP),
- aconf->name);
- continue;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "XLINE active for %s",
- get_client_name(client_p, HIDE_IP));
-
- (void) exit_client(client_p, client_p, &me, "Bad user info");
- continue;
- }
- }
-
- /* also check the unknowns list for new dlines */
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
- {
- client_p = ptr->data;
-
- if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)))
- {
- if(aconf->status & CONF_EXEMPTDLINE)
- continue;
-
- notify_banned_client(client_p, aconf, D_LINED);
- }
- }
-
+ check_dlines();
+ check_klines();
+ check_xlines();
}
/* check_klines_event()
if(IsExemptKline(client_p))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "KLINE over-ruled for %s, client is kline_exempt",
- get_client_name(client_p, HIDE_IP));
+ "KLINE over-ruled for %s, client is kline_exempt [%s@%s]",
+ get_client_name(client_p, HIDE_IP),
+ aconf->user, aconf->host);
continue;
}
if(IsExemptKline(client_p))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "XLINE over-ruled for %s, client is kline_exempt",
- get_client_name(client_p, HIDE_IP));
+ "XLINE over-ruled for %s, client is kline_exempt [%s]",
+ get_client_name(client_p, HIDE_IP),
+ aconf->name);
continue;
}
{
user = (struct User *) rb_bh_alloc(user_heap);
user->refcnt = 1;
+ user->metadata = irc_dictionary_create(irccmp);
client_p->user = user;
}
+
return user;
}
void
free_user(struct User *user, struct Client *client_p)
{
- free_away(client_p);
-
if(--user->refcnt <= 0)
{
- if(user->away)
- rb_free((char *) user->away);
/*
* sanity check
*/
}
}
-void
-allocate_away(struct Client *client_p)
+const char *
+get_metadata(struct Client *client_p, const char *key)
{
- if(client_p->user->away == NULL)
- client_p->user->away = rb_bh_alloc(away_heap);
+ struct MetadataEntry *md;
+
+ if (client_p->user != NULL)
+ {
+ md = irc_dictionary_retrieve(client_p->user->metadata, key);
+ if (md == NULL)
+ return NULL;
+
+ return md->value;
+ }
+
+ return NULL;
}
+void
+set_metadata(struct Client *client_p, const char *key, const char *value)
+{
+ struct MetadataEntry *md;
+
+ if(client_p->user != NULL)
+ {
+ md = irc_dictionary_retrieve(client_p->user->metadata, key);
+ if (md == NULL)
+ {
+ md = rb_bh_alloc(metadata_heap);
+ rb_strlcpy(md->key, key, sizeof md->key);
+ irc_dictionary_add(client_p->user->metadata, md->key, md);
+ }
+ else if (!strcmp(md->key, key) && !strcmp(md->value, value))
+ return;
+ else
+ rb_strlcpy(md->key, key, sizeof md->key);
+
+ rb_strlcpy(md->value, value, sizeof md->value);
+ }
+
+ sendto_common_channels_local_with_capability(client_p, CLICAP_PRESENCE, form_str(RPL_METADATACHG), me.name, client_p->name, key, value);
+}
void
-free_away(struct Client *client_p)
+delete_metadata(struct Client *client_p, const char *key)
{
- if(client_p->user != NULL && client_p->user->away != NULL) {
- rb_bh_free(away_heap, client_p->user->away);
- client_p->user->away = NULL;
+ struct MetadataEntry *md;
+
+ if(client_p->user != NULL)
+ {
+ md = irc_dictionary_delete(client_p->user->metadata, key);
+ if (md == NULL)
+ return;
+
+ rb_bh_free(metadata_heap, md);
}
+
+ sendto_common_channels_local_with_capability(client_p, CLICAP_PRESENCE, form_str(RPL_METADATACHG), me.name, client_p->name, key, "");
}
void
projects / irc / rqf / shadowircd.git / blobdiff