MbedTLS: Misc backend cleanups

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index a1858b7f8724b08e11d1d2f24a6723db972480ba..4218a8282d635475468e01a805ebdbe5ae511f80 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -138,9 +138,8 @@ extern void propagate_generic(struct Client *source_p, const char *command,
 extern void cluster_generic(struct Client *, const char *, int cltype,
                        int cap, const char *format, ...);
 
-/* Other client flags are in client.h */
-#define OPER_ENCRYPTED 0x10000000
-#define OPER_NEEDSSL   0x20000000
+#define OPER_ENCRYPTED 0x00001
+#define OPER_NEEDSSL    0x80000
 
 #define OPER_FLAGS     0        /* no oper privs in Client.flags/oper_conf.flags currently */
 
@@ -179,7 +178,13 @@ extern const char *get_oper_privs(int flags);
 struct server_conf
 {
        char *name;
-       char *host;
+       char *connect_host;
+       struct rb_sockaddr_storage connect4;
+       uint16_t dns_query_connect4;
+#ifdef RB_IPV6
+       struct rb_sockaddr_storage connect6;
+       uint16_t dns_query_connect6;
+#endif
        char *passwd;
        char *spasswd;
        char *certfp;
@@ -189,17 +194,20 @@ struct server_conf
        time_t hold;
 
        int aftype;
-       struct rb_sockaddr_storage my_ipnum;
+       char *bind_host;
+       struct rb_sockaddr_storage bind4;
+       uint16_t dns_query_bind4;
+#ifdef RB_IPV6
+       struct rb_sockaddr_storage bind6;
+       uint16_t dns_query_bind6;
+#endif
 
        char *class_name;
        struct Class *class;
        rb_dlink_node node;
-
-       uint16_t dns_query;
 };
 
 #define SERVER_ILLEGAL         0x0001
-#define SERVER_VHOSTED         0x0002
 #define SERVER_ENCRYPTED       0x0004
 #define SERVER_COMPRESSED      0x0008
 #define SERVER_TB              0x0010
@@ -207,7 +215,6 @@ struct server_conf
 #define SERVER_SSL             0x0040
 
 #define ServerConfIllegal(x)   ((x)->flags & SERVER_ILLEGAL)
-#define ServerConfVhosted(x)   ((x)->flags & SERVER_VHOSTED)
 #define ServerConfEncrypted(x) ((x)->flags & SERVER_ENCRYPTED)
 #define ServerConfCompressed(x)        ((x)->flags & SERVER_COMPRESSED)
 #define ServerConfTb(x)                ((x)->flags & SERVER_TB)