Automated merge with ssh://hg.atheme.org//hg/charybdis

[irc/rqf/shadowircd.git] / include / client.h

diff --git a/include/client.h b/include/client.h
index 598108ccc522939f99692a23d706aad305ceb5bf..13bd0966543772f02be0e112f956e886db51f038 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -96,7 +96,6 @@ struct User
        int refcnt;             /* Number of times this block is referenced */
 
        char suser[NICKLEN+1];
-       struct Dictionary *metadata;
 };
 
 struct Server
@@ -120,12 +119,6 @@ struct ZipStats
        double out_ratio;
 };
 
-struct MetadataEntry
-{
-       char key[NICKLEN+1];
-       char value[TOPICLEN];
-};
-
 struct Client
 {
        rb_dlink_node node;
@@ -408,7 +401,6 @@ struct ListClient
 #define FLAGS_GOTID        0x0080      /* successful ident lookup achieved */
 #define FLAGS_FLOODDONE    0x0100      /* flood grace period over / reported */
 #define FLAGS_NORMALEX     0x0400      /* Client exited normally */
-#define FLAGS_SENDQEX      0x0800      /* Sendq exceeded */
 #define FLAGS_MARK        0x10000      /* marked client */
 #define FLAGS_HIDDEN       0x20000     /* hidden server */
 #define FLAGS_EOB          0x40000     /* EOB */
@@ -599,7 +591,7 @@ extern client_t *next_client(struct Client *, const char *);
 #define accept_message(s, t) ((s) == (t) || (rb_dlinkFind((s), &((t)->localClient->allow_list))))
 extern void del_all_accepts(struct Client *client_p);
 
-extern void dead_link(struct Client *client_p);
+extern void dead_link(struct Client *client_p, int sendqex);
 extern int show_ip(struct Client *source_p, struct Client *target_p);
 extern int show_ip_conf(struct ConfItem *aconf, struct Client *target_p);
 
@@ -614,8 +606,4 @@ 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 */