Resolve shfit/reduce conflict in timespec production (#54)

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 4fc639cc368575b1c19cc620acaeb583ba2c5231..118fc50422e304d9a67bd414b31903c23bf74f0c 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -28,8 +28,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: s_newconf.h 1747 2006-07-25 21:22:45Z jilles $
  */
 
 #ifndef INCLUDED_s_newconf_h
@@ -45,7 +43,6 @@
 struct ConfItem;
 
 extern rb_dlink_list cluster_conf_list;
-extern rb_dlink_list shared_conf_list;
 extern rb_dlink_list oper_conf_list;
 extern rb_dlink_list hubleaf_conf_list;
 extern rb_dlink_list server_conf_list;
@@ -133,8 +130,6 @@ struct oper_conf
 extern struct remote_conf *make_remote_conf(void);
 extern void free_remote_conf(struct remote_conf *);
 
-extern int find_shared_conf(const char *username, const char *host,
-                       const char *server, int flags);
 extern void propagate_generic(struct Client *source_p, const char *command,
                const char *target, int cap, const char *format, ...);
 extern void cluster_generic(struct Client *, const char *, int cltype,
@@ -142,17 +137,16 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 
 #define OPER_ENCRYPTED 0x00001
 #define OPER_NEEDSSL    0x80000
-/* 0x400000 and above are in client.h */
 
-#define OPER_FLAGS     0 /* no oper privs in Client.flags2/oper_conf.flags currently */
+#define OPER_FLAGS     0        /* no oper privs in Client.flags/oper_conf.flags currently */
 
 #define IsOperConfEncrypted(x) ((x)->flags & OPER_ENCRYPTED)
 #define IsOperConfNeedSSL(x)   ((x)->flags & OPER_NEEDSSL)
 
-#define HasPrivilege(x, y)     ((x)->localClient != NULL && (x)->localClient->privset != NULL && privilegeset_in_set((x)->localClient->privset, (y)))
+#define HasPrivilege(x, y)     ((x)->user != NULL && (x)->user->privset != NULL && privilegeset_in_set((x)->user->privset, (y)))
+#define MayHavePrivilege(x, y) (HasPrivilege((x), (y)) || (IsOper((x)) && (x)->user != NULL && (x)->user->privset == NULL))
 
-#define IsOperGlobalKill(x)     (HasPrivilege((x), "oper:global_kill"))
-#define IsOperLocalKill(x)      (HasPrivilege((x), "oper:local_kill"))
+#define IsOperKill(x)           (HasPrivilege((x), "oper:kill"))
 #define IsOperRemote(x)         (HasPrivilege((x), "oper:routing"))
 #define IsOperUnkline(x)        (HasPrivilege((x), "oper:unkline"))
 #define IsOperN(x)              (HasPrivilege((x), "snomask:nick_changes"))
@@ -166,8 +160,11 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperOperwall(x)       (HasPrivilege((x), "oper:operwall"))
 #define IsOperSpy(x)            (HasPrivilege((x), "oper:spy"))
 #define IsOperInvis(x)          (HasPrivilege((x), "oper:hidden"))
-#define IsOperRemoteBan(x)     (HasPrivilege((x), "oper:remoteban"))
-#define IsOperMassNotice(x)    (HasPrivilege((x), "oper:mass_notice"))
+#define IsOperRemoteBan(x)      (HasPrivilege((x), "oper:remoteban"))
+#define IsOperMassNotice(x)     (HasPrivilege((x), "oper:mass_notice"))
+#define IsOperGeneral(x)        (MayHavePrivilege((x), "oper:general"))
+
+#define SeesOper(target, source)       (IsOper((target)) && ((!ConfigFileEntry.hide_opers && !HasPrivilege((target), "oper:hidden")) || HasPrivilege((source), "auspex:oper")))
 
 extern struct oper_conf *make_oper_conf(void);
 extern void free_oper_conf(struct oper_conf *);
@@ -181,7 +178,11 @@ 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;
+       struct rb_sockaddr_storage connect6;
+       uint16_t dns_query_connect6;
        char *passwd;
        char *spasswd;
        char *certfp;
@@ -191,30 +192,34 @@ 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;
+       struct rb_sockaddr_storage bind6;
+       uint16_t dns_query_bind6;
 
        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
 #define SERVER_AUTOCONN                0x0020
 #define SERVER_SSL             0x0040
+#define SERVER_NO_EXPORT       0x0080
+#define SERVER_SCTP            0x0100
 
 #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)
 #define ServerConfAutoconn(x)  ((x)->flags & SERVER_AUTOCONN)
+#define ServerConfSCTP(x)      ((x)->flags & SERVER_SCTP)
 #define ServerConfSSL(x)       ((x)->flags & SERVER_SSL)
+#define ServerConfNoExport(x)  ((x)->flags & SERVER_NO_EXPORT)
 
 extern struct server_conf *make_server_conf(void);
 extern void free_server_conf(struct server_conf *);