X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/14f12985df1d081387a92b816042e43bf4fca03c..3ef1213be4da2d49c21f544cd6a3277b10b26399:/include/s_newconf.h diff --git a/include/s_newconf.h b/include/s_newconf.h index 916cf77e..4decc5a3 100644 --- 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 @@ -60,9 +58,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 +80,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 +113,7 @@ struct oper_conf char *username; char *host; char *passwd; + char *certfp; int flags; int umodes; @@ -132,7 +131,7 @@ 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, +extern bool 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, ...); @@ -141,14 +140,13 @@ 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 IsOperGlobalKill(x) (HasPrivilege((x), "oper:global_kill")) #define IsOperLocalKill(x) (HasPrivilege((x), "oper:local_kill")) @@ -168,6 +166,8 @@ extern void cluster_generic(struct Client *, const char *, int cltype, #define IsOperRemoteBan(x) (HasPrivilege((x), "oper:remoteban")) #define IsOperMassNotice(x) (HasPrivilege((x), "oper:mass_notice")) +#define SeesOper(target, source) (IsOper((target)) && ((!ConfigFileEntry.hide_opers && !HasPrivilege((target), "oper:hidden")) || IsOper((source)))) + extern struct oper_conf *make_oper_conf(void); extern void free_oper_conf(struct oper_conf *); extern void clear_oper_conf(void); @@ -180,16 +180,25 @@ 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; int port; int flags; int servers; 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; @@ -197,20 +206,22 @@ struct server_conf }; #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 *); @@ -221,8 +232,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);