Add .travis.yml

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 916cf77e3a1115f68d07989e81f355cf1f311c70..4fc639cc368575b1c19cc620acaeb583ba2c5231 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -60,9 +60,6 @@ extern void init_s_newconf(void);
 extern void clear_s_newconf(void);
 extern void clear_s_newconf_bans(void);
 
-#define FREE_TARGET(x) ((x)->localClient->targinfo[0])
-#define USED_TARGETS(x) ((x)->localClient->targinfo[1])
-
 typedef struct
 {
        char *ip;
@@ -85,24 +82,27 @@ struct remote_conf
 };
 
 /* flags used in shared/cluster */
-#define SHARED_TKLINE  0x0001
-#define SHARED_PKLINE  0x0002
-#define SHARED_UNKLINE 0x0004
-#define SHARED_LOCOPS  0x0008
-#define SHARED_TXLINE  0x0010
-#define SHARED_PXLINE  0x0020
-#define SHARED_UNXLINE 0x0040
-#define SHARED_TRESV   0x0080
-#define SHARED_PRESV   0x0100
-#define SHARED_UNRESV  0x0200
-#define SHARED_REHASH  0x0400
-#define SHARED_TDLINE  0x0800
-#define SHARED_PDLINE  0x1000
-#define SHARED_UNDLINE 0x2000
+#define SHARED_TKLINE  0x00001
+#define SHARED_PKLINE  0x00002
+#define SHARED_UNKLINE 0x00004
+#define SHARED_LOCOPS  0x00008
+#define SHARED_TXLINE  0x00010
+#define SHARED_PXLINE  0x00020
+#define SHARED_UNXLINE 0x00040
+#define SHARED_TRESV   0x00080
+#define SHARED_PRESV   0x00100
+#define SHARED_UNRESV  0x00200
+#define SHARED_REHASH  0x00400
+#define SHARED_TDLINE  0x00800
+#define SHARED_PDLINE  0x01000
+#define SHARED_UNDLINE 0x02000
+#define SHARED_GRANT   0x04000
+#define SHARED_DIE     0x08000
+#define SHARED_MODULE  0x10000
 
 #define SHARED_ALL     (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
                        SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
-                       SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV)
+                       SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV | SHARED_GRANT)
 #define CLUSTER_ALL    (SHARED_ALL | SHARED_LOCOPS)
 
 /* flags used in hub/leaf */
@@ -115,6 +115,7 @@ struct oper_conf
        char *username;
        char *host;
        char *passwd;
+       char *certfp;
 
        int flags;
        int umodes;
@@ -183,6 +184,7 @@ struct server_conf
        char *host;
        char *passwd;
        char *spasswd;
+       char *certfp;
        int port;
        int flags;
        int servers;
@@ -194,6 +196,8 @@ struct server_conf
        char *class_name;
        struct Class *class;
        rb_dlink_node node;
+
+       uint16_t dns_query;
 };
 
 #define SERVER_ILLEGAL         0x0001
@@ -221,8 +225,9 @@ extern struct server_conf *find_server_conf(const char *name);
 
 extern void attach_server_conf(struct Client *, struct server_conf *);
 extern void detach_server_conf(struct Client *);
-extern void set_server_conf_autoconn(struct Client *source_p, const char *name, 
+extern void set_server_conf_autoconn(struct Client *source_p, const char *name,
                                        int newval);
+extern void disable_server_conf_autoconn(const char *name);
 
 
 extern struct ConfItem *find_xline(const char *, int);