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;
extern rb_dlink_list xline_conf_list;
extern rb_dlink_list resv_conf_list;
void add_tgchange(const char *host);
tgchange *find_tgchange(const char *host);
-/* shared/cluster/hub/leaf confs */
+/* cluster confs */
struct remote_conf
{
char *username;
SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV | SHARED_GRANT)
#define CLUSTER_ALL (SHARED_ALL | SHARED_LOCOPS)
-/* flags used in hub/leaf */
-#define CONF_HUB 0x0001
-#define CONF_LEAF 0x0002
-
struct oper_conf
{
char *name;
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,
#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"))
#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 *);
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;
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 *);