presence: Remove user.away, replaced by a metadata entry.

[solanum.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 02b39f908139b28c4d2c3939648c56e7305a415b..c7df24d7cbe33fc6fabebe90b85b3c8d6d398628 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -40,6 +40,7 @@
 #include "snomask.h"
 #include "match.h"
 #include "ircd.h"
+#include "privilege.h"
 
 /* other structs */
 struct Blacklist;
@@ -91,10 +92,10 @@ struct User
 {
        rb_dlink_list channel;  /* chain of channel pointer blocks */
        rb_dlink_list invited;  /* chain of invite pointer blocks */
-       char *away;             /* pointer to away message */
        int refcnt;             /* Number of times this block is referenced */
 
        char suser[NICKLEN+1];
+       struct Dictionary *metadata;
 };
 
 struct Server
@@ -118,6 +119,12 @@ struct ZipStats
        double out_ratio;
 };
 
+struct MetadataEntry
+{
+       char key[NICKLEN+1];
+       char value[TOPICLEN];
+};
+
 struct Client
 {
        rb_dlink_node node;
@@ -174,6 +181,8 @@ struct Client
 
        local_user_t *localClient;
        pre_client_t *preClient;
+
+       time_t large_ctcp_sent; /* ctcp to large group sent, relax flood checks */
 };
 
 struct LocalUser
@@ -277,10 +286,13 @@ struct LocalUser
                              applicable to this client */
 
        struct _ssl_ctl *ssl_ctl;               /* which ssl daemon we're associate with */
+       struct _ssl_ctl *z_ctl;                 /* second ctl for ssl+zlib */
        uint32_t localflags;
        struct ZipStats *zipstats;              /* zipstats */
        uint16_t cork_count;                    /* used for corking/uncorking connections */
        struct ev_entry *event;                 /* used for associated events */
+
+       struct PrivilegeSet *privset;           /* privset... */
 };
 
 struct PreClient
@@ -295,6 +307,8 @@ struct PreClient
 
        rb_dlink_list dnsbl_queries; /* list of struct BlacklistClient * */
        struct Blacklist *dnsbl_listed; /* first dnsbl where it's listed */
+
+       struct rb_sockaddr_storage lip; /* address of our side of the connection */
 };
 
 struct ListClient
@@ -307,12 +321,6 @@ struct ListClient
         */
 };
 
-struct exit_client_hook
-{
-       struct Client *client_p;
-       char exit_message[TOPICLEN];
-};
-
 /*
  * status macros.
  */
@@ -408,7 +416,6 @@ struct exit_client_hook
 #define FLAGS_SERVICE     0x200000     /* network service */
 #define FLAGS_TGCHANGE     0x400000    /* we're allowed to clear something */
 #define FLAGS_DYNSPOOF     0x800000    /* dynamic spoof, only opers see ip */
-#define FLAGS_EXUNKNOWN           0x1000000    /* too many unknowns exit.. */
 
 /* flags for local clients, this needs stuff moved from above to here at some point */
 #define LFLAGS_SSL             0x00000001
@@ -483,8 +490,6 @@ struct exit_client_hook
 #define IsDynSpoof(x)          ((x)->flags & FLAGS_DYNSPOOF)
 #define SetDynSpoof(x)         ((x)->flags |= FLAGS_DYNSPOOF)
 #define ClearDynSpoof(x)       ((x)->flags &= ~FLAGS_DYNSPOOF)
-#define IsExUnknown(x)         ((x)->flags & FLAGS_EXUNKNOWN)
-#define SetExUnknown(x)                ((x)->flags |= FLAGS_EXUNKNOWN)
 
 /* local flags */
 
@@ -608,4 +613,8 @@ extern char *generate_uid(void);
 void allocate_away(struct Client *);
 void free_away(struct Client *);
 
+const char *get_metadata(struct Client *, const char *);
+void set_metadata(struct Client *, const char *, const char *);
+void delete_metadata(struct Client *, const char *);
+
 #endif /* INCLUDED_client_h */