ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/conf.h

Comparing:
ircd-hybrid-7.2/include/s_conf.h (file contents), Revision 56 by michael, Mon Oct 3 11:33:30 2005 UTC vs.
ircd-hybrid/trunk/include/conf.h (file contents), Revision 2196 by michael, Tue Jun 4 18:30:12 2013 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_conf.h: A header for the configuration functions.
3	>	*  conf.h: A header for the configuration functions.
4		*
5		*  Copyright (C) 2005 by the past and present ircd coders, and others.
6		*
#	Line 24 | Line 24
24
25		#ifndef INCLUDED_s_conf_h
26		#define INCLUDED_s_conf_h
27	<	#include "setup.h"
28	<	#ifdef HAVE_LIBCRYPTO
29	<	#include <openssl/rsa.h>
30	<	#endif
31	<	#include "fileio.h"             /* FBFILE */
27	>	#include "config.h"
28		#include "ircd_defs.h"
33	–	#include "motd.h"               /* MessageFile */
29		#include "client.h"
30		#include "hook.h"
31	<	#include "pcre.h"
31	>	#include "conf_class.h"
32
38	–	struct Client;
39	–	struct DNSReply;
40	–	struct hostent;
41	–
42	–	extern FBFILE *conf_fbfile_in;
43	–	extern struct Callback *client_check_cb;
44	–
45	–	typedef enum
46	–	{
47	–	CONF_TYPE,
48	–	CLASS_TYPE,
49	–	OPER_TYPE,
50	–	CLIENT_TYPE,
51	–	SERVER_TYPE,
52	–	HUB_TYPE,
53	–	LEAF_TYPE,
54	–	KLINE_TYPE,
55	–	DLINE_TYPE,
56	–	EXEMPTDLINE_TYPE,
57	–	CLUSTER_TYPE,
58	–	RKLINE_TYPE,
59	–	RXLINE_TYPE,
60	–	XLINE_TYPE,
61	–	ULINE_TYPE,
62	–	GLINE_TYPE,
63	–	CRESV_TYPE,
64	–	NRESV_TYPE,
65	–	GDENY_TYPE
66	–	} ConfType;
67	–
68	–	struct ConfItem
69	–	{
70	–	char *name;           /* Primary key */
71	–	pcre *regexpname;
72	–	dlink_node node;      /* link into known ConfItems of this type */
73	–	unsigned int flags;
74	–	ConfType type;
75	–	};
76	–
77	–	/*
78	–	* MatchItem - used for XLINE and ULINE types
79	–	*/
80	–	struct MatchItem
81	–	{
82	–	char *user;           /* Used for ULINE only */
83	–	char *host;           /* Used for ULINE only */
84	–	char *reason;
85	–	char *oper_reason;
86	–	int action;           /* used for uline */
87	–	int count;            /* How many times this matchitem has been matched */
88	–	int ref_count;        /* How many times is this matchitem in use */
89	–	int illegal;          /* Should it be deleted when possible? */
90	–	time_t           hold;     /* Hold action until this time (calendar time) */
91	–	};
92	–
93	–	struct AccessItem
94	–	{
95	–	dlink_node node;
96	–	unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
97	–	unsigned int     flags;
98	–	unsigned int     modes;
99	–	int              clients;  /* Number of *LOCAL* clients using this */
100	–	struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
101	–	struct irc_ssaddr ipnum;      /* ip to connect to */
102	–	char *           host;     /* host part of user@host */
103	–	char *           passwd;
104	–	char *           spasswd;  /* Password to send. */
105	–	char *           reason;
106	–	char *           oper_reason;
107	–	char *           user;     /* user part of user@host */
108	–	int              port;
109	–	char *           fakename;   /* Mask name */
110	–	time_t           hold;     /* Hold action until this time (calendar time) */
111	–	struct ConfItem *class_ptr;  /* Class of connection */
112	–	struct DNSQuery* dns_query;
113	–	int              aftype;
114	–	#ifdef HAVE_LIBCRYPTO
115	–	char *           rsa_public_key_file;
116	–	RSA *            rsa_public_key;
117	–	struct EncCapability *cipher_preference;
118	–	#endif
119	–	pcre *regexuser;
120	–	pcre *regexhost;
121	–	};
122	–
123	–	struct ClassItem
124	–	{
125	–	long max_sendq;
126	–	int con_freq;
127	–	int ping_freq;
128	–	int ping_warning;
129	–	int max_total;
130	–	int max_local;
131	–	int max_global;
132	–	int max_ident;
133	–	int max_perip;
134	–	int curr_user_count;
135	–	int cidr_bitlen_ipv4;
136	–	int cidr_bitlen_ipv6;
137	–	int number_per_cidr;
138	–	dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
139	–	dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
140	–	};
141	–
142	–	struct CidrItem
143	–	{
144	–	struct irc_ssaddr mask;
145	–	int number_on_this_cidr;
146	–	dlink_node node;
147	–	};
33
34	<	#define ConFreq(x)      ((x)->con_freq)
150	<	#define PingFreq(x)     ((x)->ping_freq)
151	<	#define PingWarning(x)  ((x)->ping_warning)
152	<	#define MaxTotal(x)     ((x)->max_total)
153	<	#define MaxGlobal(x)    ((x)->max_global)
154	<	#define MaxLocal(x)     ((x)->max_local)
155	<	#define MaxIdent(x)     ((x)->max_ident)
156	<	#define MaxPerIp(x)     ((x)->max_perip)
157	<	#define MaxSendq(x)     ((x)->max_sendq)
158	<	#define CurrUserCount(x) ((x)->curr_user_count)
159	<	#define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
160	<	#define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
161	<	#define NumberPerCidr(x) ((x)->number_per_cidr)
162	<
163	<	#define ClassPtr(x)      ((x)->class_ptr)
164	<
165	<
166	<	#define CONF_ILLEGAL            0x80000000
167	<	#define CONF_RESERVED           0x00000001
168	<	#define CONF_CLIENT             0x00000002
169	<	#define CONF_SERVER             0x00000004
170	<	#define CONF_OPERATOR           0x00000008
171	<	#define CONF_KILL               0x00000010
172	<	#define CONF_KLINE              CONF_KILL
173	<	#define CONF_CLASS              0x00000020
174	<	#define CONF_LEAF               0x00000040
175	<	#define CONF_LISTEN_PORT        0x00000080
176	<	#define CONF_HUB                0x00000100
177	<	#define CONF_EXEMPTKLINE        0x00000200
178	<	#define CONF_NOLIMIT            0x00000400
179	<	#define CONF_DLINE              0x00000800
180	<	#define CONF_XLINE              0x00001000
181	<	#define CONF_ULINE              0x00002000
182	<	#define CONF_EXEMPTDLINE        0x00004000
183	<	#define CONF_GLINE              0x00008000
184	<
185	<	#define CONF_SERVER_MASK       CONF_SERVER
186	<	#define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
187	<
188	<	/* XXX temporary hack */
189	<	#define CONF_CRESV              0x80000001
190	<	#define CONF_NRESV              0x80000002
191	<
192	<	#define IsConfIllegal(x)        ((x)->status & CONF_ILLEGAL)
193	<	#define SetConfIllegal(x)       ((x)->status |= CONF_ILLEGAL)
194	<	#define IsConfServer(x)         ((x)->status == CONF_SERVER)
195	<	#define SetConfServer(x)        ((x)->status = CONF_SERVER)
196	<	#define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
197	<	#define IsConfHub(x)            ((x)->status == CONF_HUB)
198	<	#define SetConfHub(x)           ((x)->status = CONF_HUB)
199	<	#define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
200	<	#define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
201	<	#define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
202	<	#define IsConfKill(x)           ((x)->status == CONF_KILL)
203	<	#define IsConfClient(x)         ((x)->status & CONF_CLIENT)
204	<	#define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
205	<	#define IsConfUline(x)          ((x)->status & CONF_ULINE)
206	<	#define IsConfXline(x)          ((x)->status & CONF_XLINE)
207	<	#define IsConfGline(x)          ((x)->status == CONF_GLINE)
34	>	#define CONF_NOREASON "<No reason supplied>"
35
36	<	/* AccessItem->flags */
36	>	#define IsConfOperator(x)       ((x)->type == CONF_OPER)
37	>	#define IsConfKill(x)           ((x)->type == CONF_KLINE)
38	>	#define IsConfClient(x)         ((x)->type == CONF_CLIENT)
39	>	#define IsConfGline(x)          ((x)->type == CONF_GLINE)
40
41	<	/* Generic flags... */
212	<	/* access flags... */
41	>	/* MaskItem->flags */
42		#define CONF_FLAGS_DO_IDENTD            0x00000001
43		#define CONF_FLAGS_LIMIT_IP             0x00000002
44		#define CONF_FLAGS_NO_TILDE             0x00000004
45		#define CONF_FLAGS_NEED_IDENTD          0x00000008
46	<	/*                                      0x00000010 */
47	<	#define CONF_FLAGS_NOMATCH_IP           0x00000020
48	<	#define CONF_FLAGS_EXEMPTKLINE          0x00000040
49	<	#define CONF_FLAGS_NOLIMIT              0x00000080
50	<	#define CONF_FLAGS_IDLE_LINED           0x00000100
51	<	#define CONF_FLAGS_SPOOF_IP             0x00000200
52	<	#define CONF_FLAGS_SPOOF_NOTICE         0x00000400
53	<	#define CONF_FLAGS_REDIR                0x00000800
54	<	#define CONF_FLAGS_EXEMPTGLINE          0x00001000
55	<	#define CONF_FLAGS_RESTRICTED           0x00002000
56	<	#define CONF_FLAGS_CAN_FLOOD            0x00100000
57	<	#define CONF_FLAGS_NEED_PASSWORD        0x00200000
58	<	/* server flags */
59	<	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
60	<	#define CONF_FLAGS_LAZY_LINK            0x00008000
232	<	#define CONF_FLAGS_ENCRYPTED            0x00010000
233	<	#define CONF_FLAGS_COMPRESSED           0x00020000
234	<	#define CONF_FLAGS_TEMPORARY            0x00040000
235	<	#define CONF_FLAGS_CRYPTLINK            0x00080000
236	<	#define CONF_FLAGS_BURST_AWAY           0x00400000
237	<	#define CONF_FLAGS_EXEMPTRESV           0x00800000
238	<	#define CONF_FLAGS_TOPICBURST           0x01000000
46	>	#define CONF_FLAGS_NOMATCH_IP           0x00000010
47	>	#define CONF_FLAGS_EXEMPTKLINE          0x00000020
48	>	#define CONF_FLAGS_NOLIMIT              0x00000040
49	>	#define CONF_FLAGS_SPOOF_IP             0x00000080
50	>	#define CONF_FLAGS_SPOOF_NOTICE         0x00000100
51	>	#define CONF_FLAGS_REDIR                0x00000200
52	>	#define CONF_FLAGS_EXEMPTGLINE          0x00000400
53	>	#define CONF_FLAGS_CAN_FLOOD            0x00000800
54	>	#define CONF_FLAGS_NEED_PASSWORD        0x00001000
55	>	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
56	>	#define CONF_FLAGS_ENCRYPTED            0x00004000
57	>	#define CONF_FLAGS_IN_DATABASE          0x00008000
58	>	#define CONF_FLAGS_EXEMPTRESV           0x00010000
59	>	#define CONF_FLAGS_SSL                  0x00020000
60	>	#define CONF_FLAGS_WEBIRC               0x00040000
61
62	<	/* Macros for struct AccessItem */
62	>	/* Macros for struct MaskItem */
63	>	#define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
64		#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
65		#define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
66		#define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
#	Line 248 | Line 71 | struct CidrItem
71		#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
72		#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
73		#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
251	–	#define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
74		#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
75		#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
76		#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
255	–	#define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
77		#define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
78	<	#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
79	<	#define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
259	<	#define IsConfCompressed(x)     ((x)->flags & CONF_FLAGS_COMPRESSED)
260	<	#define SetConfCompressed(x)    ((x)->flags |= CONF_FLAGS_COMPRESSED)
261	<	#define ClearConfCompressed(x)  ((x)->flags &= ~CONF_FLAGS_COMPRESSED)
262	<	#define IsConfCryptLink(x)      ((x)->flags & CONF_FLAGS_CRYPTLINK)
263	<	#define SetConfCryptLink(x)     ((x)->flags |= CONF_FLAGS_CRYPTLINK)
264	<	#define ClearConfCryptLink(x)   ((x)->flags &= ~CONF_FLAGS_CRYPTLINK)
265	<	#define IsConfLazyLink(x)       ((x)->flags & CONF_FLAGS_LAZY_LINK)
266	<	#define SetConfLazyLink(x)      ((x)->flags = CONF_FLAGS_LAZY_LINK)
267	<	#define ClearConfLazyLink(x)    ((x)->flags &= ~CONF_FLAGS_LAZY_LINK)
78	>	#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
79	>	#define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
80		#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
81	<	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
81	>	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
82		#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
271	–	#define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
272	–	#define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
83		#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
84	<	#define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
85	<	#define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
86	<	#define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
87	<	#define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
88	<	#define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
89	<	#define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
84	>	#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
85	>	#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
86	>	#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
87	>	#define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
88	>	#define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
89	>
90
91		/* shared/cluster server entry types
92		* These defines are used for both shared and cluster.
93		*/
94	<	#define SHARED_KLINE            0x0001
95	<	#define SHARED_TKLINE           0x0002
96	<	#define SHARED_UNKLINE          0x0004
97	<	#define SHARED_XLINE            0x0008
98	<	#define SHARED_TXLINE           0x0010
99	<	#define SHARED_UNXLINE          0x0020
100	<	#define SHARED_RESV             0x0040
101	<	#define SHARED_TRESV            0x0080
102	<	#define SHARED_UNRESV           0x0100
103	<	#define SHARED_LOCOPS           0x0200
104	<	#define SHARED_ALL              (SHARED_KLINE | SHARED_TKLINE | SHARED_UNKLINE | \
105	<	SHARED_XLINE | SHARED_TXLINE | SHARED_UNXLINE | \
106	<	SHARED_RESV | SHARED_TRESV | SHARED_UNRESV |\
107	<	SHARED_LOCOPS)
108	<
109	<	/* gline acl entry actions */
110	<	#define GDENY_BLOCK             0x1
111	<	#define GDENY_REJECT            0x2
94	>	#define SHARED_KLINE            0x0001
95	>	#define SHARED_UNKLINE          0x0002
96	>	#define SHARED_XLINE            0x0004
97	>	#define SHARED_UNXLINE          0x0008
98	>	#define SHARED_RESV             0x0010
99	>	#define SHARED_UNRESV           0x0020
100	>	#define SHARED_LOCOPS           0x0040
101	>	#define SHARED_DLINE            0x0080
102	>	#define SHARED_UNDLINE          0x0100
103	>	#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
104	>	SHARED_XLINE | SHARED_UNXLINE |\
105	>	SHARED_RESV | SHARED_UNRESV |\
106	>	SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
107	>
108	>
109	>	enum maskitem_type
110	>	{
111	>	CONF_RESERVED = 1 <<  0, /* XXX */
112	>	CONF_CLIENT   = 1 <<  1,
113	>	CONF_SERVER   = 1 <<  2,
114	>	CONF_KLINE    = 1 <<  3,
115	>	CONF_DLINE    = 1 <<  4,
116	>	CONF_EXEMPT   = 1 <<  5,
117	>	CONF_CLUSTER  = 1 <<  6,
118	>	CONF_XLINE    = 1 <<  7,
119	>	CONF_ULINE    = 1 <<  8,
120	>	CONF_GLINE    = 1 <<  9,
121	>	CONF_CRESV    = 1 << 10,
122	>	CONF_NRESV    = 1 << 11,
123	>	CONF_SERVICE  = 1 << 12,
124	>	CONF_OPER     = 1 << 13,
125	>	};
126	>
127	>	struct conf_parser_context
128	>	{
129	>	unsigned int boot;
130	>	unsigned int pass;
131	>	FILE *conf_file;
132	>	};
133	>
134	>	struct split_nuh_item
135	>	{
136	>	dlink_node node;
137	>
138	>	char *nuhmask;
139	>	char *nickptr;
140	>	char *userptr;
141	>	char *hostptr;
142	>
143	>	size_t nicksize;
144	>	size_t usersize;
145	>	size_t hostsize;
146	>	};
147	>
148	>	struct MaskItem
149	>	{
150	>	dlink_node         node;
151	>	dlink_list         leaf_list;
152	>	dlink_list         hub_list;
153	>	dlink_list         exempt_list;
154	>	enum maskitem_type type;
155	>	unsigned int       dns_failed;
156	>	unsigned int       dns_pending;
157	>	unsigned int       flags;
158	>	unsigned int       modes;
159	>	unsigned int       port;
160	>	unsigned int       count;
161	>	unsigned int       aftype;
162	>	unsigned int       active;
163	>	unsigned int       htype;
164	>	unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
165	>	int                bits;
166	>	time_t             until;     /* Hold action until this time (calendar time) */
167	>	time_t             setat;
168	>	struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
169	>	struct irc_ssaddr  addr;  /* ip to connect to */
170	>	struct ClassItem  *class;  /* Class of connection */
171	>	char              *name;
172	>	char              *user;     /* user part of user@host */
173	>	char              *host;     /* host part of user@host */
174	>	char              *passwd;
175	>	char              *spasswd;  /* Password to send. */
176	>	char              *reason;
177	>	char              *cipher_list;
178	>	void              *rsa_public_key;
179	>	};
180	>
181	>	struct exempt
182	>	{
183	>	dlink_node node;
184	>	char *name;
185	>	char *user;
186	>	char *host;
187	>	size_t len;
188	>	time_t when;
189	>	struct irc_ssaddr addr;
190	>	int bits;
191	>	int type;
192	>	int coid;
193	>	};
194	>
195	>	struct CidrItem
196	>	{
197	>	dlink_node node;
198	>	struct irc_ssaddr mask;
199	>	unsigned int number_on_this_cidr;
200	>	};
201
202		struct config_file_entry
203		{
204		const char *dpath;          /* DPATH if set from command line */
205		const char *configfile;
206		const char *klinefile;
207	+	const char *glinefile;
208		const char *xlinefile;
309	–	const char *rxlinefile;
310	–	const char *rklinefile;
209		const char *dlinefile;
210	<	const char *glinefile;
211	<	const char *cresvfile;
212	<	const char *nresvfile;
210	>	const char *resvfile;
211	>	char *mpath;
212	>	char *rpath;
213
316	–	char *logpath;
317	–	char *operlog;
318	–
319	–	char *servlink_path;
214		char *egdpool_path;
215	+	char *service_name;
216
322	–	MessageFile motd;
323	–	MessageFile opermotd;
324	–	MessageFile linksfile;
325	–
326	–	unsigned char compression_level;
217		int gline_min_cidr;
218		int gline_min_cidr6;
329	–	int dot_in_ip6_addr;
219		int dots_in_ident;
220		int failed_oper_notice;
221		int anti_spam_exit_message_time;
222	<	int max_accept;
222	>	unsigned int max_accept;
223	>	unsigned int max_watch;
224		int max_nick_time;
225	<	int max_nick_changes;
225	>	unsigned int max_nick_changes;
226		int ts_max_delta;
227		int ts_warn_delta;
228		int anti_nick_flood;
339	–	int kline_with_reason;
229		int warn_no_nline;
230		int invisible_on_connect;
231	+	int stats_e_disabled;
232		int stats_o_oper_only;
233		int stats_k_oper_only;
234		int stats_i_oper_only;
#	Line 349 | Line 239 | struct config_file_entry
239		int oper_pass_resv;
240		int glines;
241		int hide_spoof_ips;
352	–	int burst_away;
353	–	int use_whois_actually;
242		int tkline_expire_notices;
243		int opers_bypass_callerid;
244		int ignore_bogus_ts;
357	–	char *kline_reason;
245		int pace_wait;
246		int pace_wait_simple;
247		int gline_time;
248	<	int gline_logging;
362	<	int idletime;
248	>	int gline_request_time;
249		int oper_only_umodes;
250		int oper_umodes;
251		int max_targets;
#	Line 368 | Line 254 | struct config_file_entry
254		int min_nonwildcard_simple;
255		int kill_chase_time_limit;
256		int default_floodcount;
371	–	int client_flood;
257		/* 0 == don't use throttle... */
258		int throttle_time;
259		int use_egd;
260		int ping_cookie;
261		int disable_auth;
377	–	int disable_remote;
378	–	#ifdef HAVE_LIBCRYPTO
379	–	struct EncCapability *default_cipher_preference;
380	–	#endif
262		};
263
264		struct config_channel_entry
265		{
266	<	int restrict_channels;
386	<	int disable_local_channels;
387	<	int use_except;
388	<	int use_invex;
389	<	int use_knock;
266	>	int disable_fake_channels;
267		int knock_delay;
268		int knock_delay_channel;
392	–	int invite_ops_only;
269		unsigned int max_bans;
270		unsigned int max_chans_per_user;
271	+	unsigned int max_chans_per_oper;
272		int no_create_on_split;
273		int no_join_on_split;
397	–	int quiet_on_ban;
398	–	int burst_topicwho;
274		int default_split_server_count;
275		int default_split_user_count;
276		};
277
278		struct config_server_hide
279		{
280	+	char *hidden_name;
281		int flatten_links;
282	+	int disable_remote_commands;
283		int hide_servers;
284	<	char *hidden_name;
284	>	int hide_services;
285		int links_delay;
286		int links_disabled;
287		int hidden;
411	–	int disable_hidden;
288		int hide_server_ips;
289		};
290
291		struct server_info
292		{
293	+	char *sid;
294		char *name;
295		char *description;
296		char *network_name;
297		char *network_desc;
421	–	#ifdef HAVE_LIBCRYPTO
298		char *rsa_private_key_file;
299	<	RSA *rsa_private_key;
300	<	SSL_CTX *ctx;
301	<	#endif
426	<	char *sid;
299	>	void *rsa_private_key;
300	>	void *server_ctx;
301	>	void *client_ctx;
302		int hub;
303		struct irc_ssaddr ip;
304		struct irc_ssaddr ip6;
305	<	int max_clients;
305	>	unsigned int max_clients;
306	>	unsigned int max_nick_length;
307	>	unsigned int max_topic_length;
308		int specific_ipv4_vhost;
309		int specific_ipv6_vhost;
310		struct sockaddr_in dns_host;
#	Line 444 | Line 321 | struct admin_info
321		struct logging_entry
322		{
323		unsigned int use_logging;
447	–	char operlog[PATH_MAX + 1];
448	–	char userlog[PATH_MAX + 1];
449	–	char glinelog[PATH_MAX + 1];
450	–	char ioerrlog[PATH_MAX + 1];
451	–	char klinelog[PATH_MAX + 1];
452	–	char killlog[PATH_MAX + 1];
453	–	char operspylog[PATH_MAX + 1];
454	–	char failed_operlog[PATH_MAX + 1];
324		};
325
326	<	extern unsigned int scount;
458	<	extern int ypass;
459	<	extern dlink_list class_items;
326	>	extern dlink_list flatten_links;
327		extern dlink_list server_items;
328		extern dlink_list cluster_items;
329	<	extern dlink_list hub_items;
330	<	extern dlink_list rxconf_items;
331	<	extern dlink_list rkconf_items;
332	<	extern dlink_list leaf_items;
333	<	extern dlink_list temporary_klines;
334	<	extern dlink_list temporary_dlines;
335	<	extern dlink_list temporary_glines;
469	<	extern dlink_list temporary_xlines;
470	<	extern dlink_list temporary_rxlines;
471	<	extern dlink_list temporary_rklines;
329	>	extern dlink_list xconf_items;
330	>	extern dlink_list uconf_items;
331	>	extern dlink_list oconf_items;
332	>	extern dlink_list service_items;
333	>	extern dlink_list nresv_items;
334	>	extern dlink_list cresv_items;
335	>	extern struct conf_parser_context conf_parser_ctx;
336		extern struct logging_entry ConfigLoggingEntry;
337		extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
338		extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
339		extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
340		extern struct server_info ServerInfo;       /* defined in ircd.c */
341		extern struct admin_info AdminInfo;        /* defined in ircd.c */
342	+	extern int valid_wild_card_simple(const char *);
343		extern int valid_wild_card(struct Client *, int, int, ...);
344		/* End GLOBAL section */
345
481	–	extern unsigned long get_sendq(struct Client *);
482	–	extern const char *get_client_class(struct Client *);
483	–	extern int get_client_ping(struct Client *, int *);
484	–	extern void check_class(void);
485	–	extern void init_class(void);
486	–	extern struct ConfItem *find_class(const char *);
346		extern void init_ip_hash_table(void);
347	<	extern void count_ip_hash(int *, unsigned long *);
347	>	extern void count_ip_hash(unsigned int *, uint64_t *);
348		extern void remove_one_ip(struct irc_ssaddr *);
349	<	extern struct ConfItem *make_conf_item(ConfType type);
491	<	extern void free_access_item(struct AccessItem *);
349	>	extern struct MaskItem *conf_make(enum maskitem_type);
350		extern void read_conf_files(int);
351	<	extern int attach_conf(struct Client *, struct ConfItem *);
351	>	extern int attach_conf(struct Client *, struct MaskItem *);
352		extern int attach_connect_block(struct Client *, const char *, const char *);
353	+	extern int check_client(struct Client *);
354
496	–	extern int detach_conf(struct Client *, ConfType);
355
356	<	extern struct ConfItem *find_conf_name(dlink_list *, const char *, ConfType);
357	<	extern struct ConfItem *find_conf_exact(ConfType, const char *, const char *, const char *);
358	<	extern struct AccessItem *find_kill(struct Client *);
359	<	extern struct AccessItem *find_gline(struct Client *);
356	>	extern void detach_conf(struct Client *, enum maskitem_type);
357	>	extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
358	>	extern struct MaskItem *find_kill(struct Client *);
359	>	extern struct MaskItem *find_gline(struct Client *);
360		extern int conf_connect_allowed(struct irc_ssaddr *, int);
361		extern char *oper_privs_as_string(const unsigned int);
362	<	extern void split_nuh(char *mask, char **nick, char **user, char **host);
363	<	extern struct ConfItem *find_matching_name_conf(ConfType, const char *,
364	<	const char *, const char *, int);
365	<	extern struct ConfItem *find_exact_name_conf(ConfType, const char *,
362	>	extern void split_nuh(struct split_nuh_item *);
363	>	extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
364	>	const char *, const char *, unsigned int);
365	>	extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
366		const char *, const char *);
367	<	extern void delete_conf_item(struct ConfItem *);
510	<	extern void report_confitem_types(struct Client *, ConfType, int);
367	>	extern void conf_free(struct MaskItem *);
368		extern void yyerror(const char *);
369	<	extern int conf_yy_fatal_error(const char *);
513	<	extern int conf_fbgets(char *, unsigned int, FBFILE *);
514	<	extern void write_conf_line(struct Client *, struct ConfItem *,
515	<	const char *, time_t);
516	<	extern int remove_conf_line(ConfType, struct Client *, const char *,
517	<	const char *);
518	<	extern void add_temp_line(struct ConfItem *);
369	>	extern void conf_error_report(const char *);
370		extern void cleanup_tklines(void *);
520	–	extern const char *get_conf_name(ConfType);
371		extern int rehash(int);
372	<	extern int conf_add_server(struct ConfItem *, unsigned int, const char *);
373	<	extern void conf_add_class_to_conf(struct ConfItem *, const char *);
524	<	extern void conf_add_d_conf(struct AccessItem *);
372	>	extern void lookup_confhost(struct MaskItem *);
373	>	extern void conf_add_class_to_conf(struct MaskItem *, const char *);
374
375	<	/* XXX consider moving these into csvlib.h */
527	<	extern void parse_csv_file(FBFILE *, ConfType);
375	>	extern const char *get_oper_name(const struct Client *);
376
529	–	extern char *get_oper_name(const struct Client *);
530	–
531	–	extern void *map_to_conf(struct ConfItem *);
532	–	extern struct ConfItem *unmap_conf_item(void *);
377		/* XXX should the parse_aline stuff go into another file ?? */
378		#define AWILD 0x1               /* check wild cards */
535	–	#define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
379		extern int parse_aline(const char *, struct Client *, int, char **,
380		int, char **, char **, time_t *, char **, char **);
381		extern int valid_comment(struct Client *, char *, int);
382
540	–	/* XXX */
541	–	extern int yylex(void);
383
384		#define TK_SECONDS 0
385		#define TK_MINUTES 1
386	<	extern time_t valid_tkline(char *, int);
387	<	extern int match_conf_password(const char *, const struct AccessItem *);
386	>	extern time_t valid_tkline(const char *, int);
387	>	extern int match_conf_password(const char *, const struct MaskItem *);
388
389		#define NOT_AUTHORIZED    (-1)
390	<	#define IRCD_SOCKET_ERROR (-2)
391	<	#define I_LINE_FULL       (-3)
392	<	#define TOO_MANY          (-4)
393	<	#define BANNED_CLIENT     (-5)
553	<	#define TOO_FAST          (-6)
390	>	#define I_LINE_FULL       (-2)
391	>	#define TOO_MANY          (-3)
392	>	#define BANNED_CLIENT     (-4)
393	>	#define TOO_FAST          (-5)
394
395		#define CLEANUP_TKLINES_TIME 60
396
397		extern void cluster_a_line(struct Client *,
398		const char *, int, int, const char *,...);
559	–	extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
560	–
399		#endif /* INCLUDED_s_conf_h */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)