presence: send..._with_capability...(): don't send if the client does not have the...

[irc/rqf/shadowircd.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 2aa84520c51417d6641758e5cf28a6768e0a991c..5cee85867cb2f6074de948a072bbcb8324ececdf 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -76,7 +76,7 @@ static rb_bh *client_heap = NULL;
 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;
@@ -120,7 +120,7 @@ init_client(void)
        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);
@@ -447,81 +447,9 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
 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)) && !(aconf->status & CONF_EXEMPTDLINE))
-               {
-                       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()
@@ -1729,8 +1657,10 @@ make_user(struct Client *client_p)
        {
                user = (struct User *) rb_bh_alloc(user_heap);
                user->refcnt = 1;
+               user->metadata = irc_dictionary_create(irccmp);
                client_p->user = user;
        }
+
        return user;
 }
 
@@ -1767,12 +1697,8 @@ make_server(struct Client *client_p)
 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
                 */
@@ -1799,21 +1725,56 @@ free_user(struct User *user, struct Client *client_p)
        }
 }
 
-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;
+
+       delete_metadata(client_p, key);
+       if(client_p->user != NULL)
+       {
+               md = rb_bh_alloc(metadata_heap);
+               rb_strlcpy(md->key, key, NICKLEN);
+               rb_strlcpy(md->value, value, TOPICLEN);
+
+               irc_dictionary_add(client_p->user->metadata, md->key, md);
+       }
+
+       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