ViewVC Help

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

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

Comparing ircd-hybrid/trunk/include/conf.h (file contents):
Revision 3473 by michael, Sun May 4 15:40:26 2014 UTC vs.
Revision 4313 by michael, Thu Jul 31 18:50:11 2014 UTC

#	Line 40 | Line 40
40		#define IsConfGline(x)          ((x)->type == CONF_GLINE)
41
42		/* MaskItem->flags */
43	<	#define CONF_FLAGS_DO_IDENTD            0x00000001
44	<	#define CONF_FLAGS_NO_TILDE             0x00000004
45	<	#define CONF_FLAGS_NEED_IDENTD          0x00000008
46	<	#define CONF_FLAGS_EXEMPTKLINE          0x00000010
47	<	#define CONF_FLAGS_NOLIMIT              0x00000020
48	<	#define CONF_FLAGS_SPOOF_IP             0x00000040
49	<	#define CONF_FLAGS_SPOOF_NOTICE         0x00000080
50	<	#define CONF_FLAGS_REDIR                0x00000100
51	<	#define CONF_FLAGS_EXEMPTGLINE          0x00000200
52	<	#define CONF_FLAGS_CAN_FLOOD            0x00000400
53	<	#define CONF_FLAGS_NEED_PASSWORD        0x00000800
54	<	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00001000
55	<	#define CONF_FLAGS_ENCRYPTED            0x00002000
56	<	#define CONF_FLAGS_IN_DATABASE          0x00004000
57	<	#define CONF_FLAGS_EXEMPTRESV           0x00008000
58	<	#define CONF_FLAGS_SSL                  0x00010000
59	<	#define CONF_FLAGS_WEBIRC               0x00020000
43	>	#define CONF_FLAGS_DO_IDENTD            0x00000001U
44	>	#define CONF_FLAGS_NO_TILDE             0x00000004U
45	>	#define CONF_FLAGS_NEED_IDENTD          0x00000008U
46	>	#define CONF_FLAGS_EXEMPTKLINE          0x00000010U
47	>	#define CONF_FLAGS_NOLIMIT              0x00000020U
48	>	#define CONF_FLAGS_SPOOF_IP             0x00000040U
49	>	#define CONF_FLAGS_SPOOF_NOTICE         0x00000080U
50	>	#define CONF_FLAGS_REDIR                0x00000100U
51	>	#define CONF_FLAGS_EXEMPTGLINE          0x00000200U
52	>	#define CONF_FLAGS_CAN_FLOOD            0x00000400U
53	>	#define CONF_FLAGS_NEED_PASSWORD        0x00000800U
54	>	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00001000U
55	>	#define CONF_FLAGS_ENCRYPTED            0x00002000U
56	>	#define CONF_FLAGS_IN_DATABASE          0x00004000U
57	>	#define CONF_FLAGS_EXEMPTRESV           0x00008000U
58	>	#define CONF_FLAGS_SSL                  0x00010000U
59	>	#define CONF_FLAGS_WEBIRC               0x00020000U
60
61		/* Macros for struct MaskItem */
62		#define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
#	Line 71 | Line 71
71		#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
72		#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
73		#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
74	–	#define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
75	–	#define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
76	–	#define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
74		#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
75		#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
76		#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
77		#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
78		#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
82	–	#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
83	–	#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
79		#define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
80		#define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
81
#	Line 88 | Line 83
83		/* shared/cluster server entry types
84		* These defines are used for both shared and cluster.
85		*/
86	<	#define SHARED_KLINE            0x0001
87	<	#define SHARED_UNKLINE          0x0002
88	<	#define SHARED_XLINE            0x0004
89	<	#define SHARED_UNXLINE          0x0008
90	<	#define SHARED_RESV             0x0010
91	<	#define SHARED_UNRESV           0x0020
92	<	#define SHARED_LOCOPS           0x0040
93	<	#define SHARED_DLINE            0x0080
94	<	#define SHARED_UNDLINE          0x0100
86	>	#define SHARED_KLINE            0x00000001U
87	>	#define SHARED_UNKLINE          0x00000002U
88	>	#define SHARED_XLINE            0x00000004U
89	>	#define SHARED_UNXLINE          0x00000008U
90	>	#define SHARED_RESV             0x00000010U
91	>	#define SHARED_UNRESV           0x00000020U
92	>	#define SHARED_LOCOPS           0x00000040U
93	>	#define SHARED_DLINE            0x00000080U
94	>	#define SHARED_UNDLINE          0x00000100U
95		#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
96		SHARED_XLINE | SHARED_UNXLINE |\
97		SHARED_RESV | SHARED_UNRESV |\
#	Line 117 | Line 112 | enum maskitem_type
112		CONF_CRESV    = 1 <<  9,
113		CONF_NRESV    = 1 << 10,
114		CONF_SERVICE  = 1 << 11,
115	<	CONF_OPER     = 1 << 12,
115	>	CONF_OPER     = 1 << 12
116		};
117
118		enum
#	Line 129 | Line 124 | enum
124		TOO_FAST       = -5
125		};
126
132	–	struct conf_parser_context
133	–	{
134	–	unsigned int boot;
135	–	unsigned int pass;
136	–	FILE *conf_file;
137	–	};
138	–
127		struct split_nuh_item
128		{
129		dlink_node node;
#	Line 205 | Line 193 | struct CidrItem
193		unsigned int number_on_this_cidr;
194		};
195
196	<	struct config_file_entry
196	>	struct
197	>	{
198	>	unsigned int boot;
199	>	unsigned int pass;
200	>	FILE *conf_file;
201	>	} conf_parser_ctx;
202	>
203	>	struct
204		{
205		const char *dpath;          /* DPATH if set from command line */
206		const char *mpath;
#	Line 217 | Line 212 | struct config_file_entry
212		const char *dlinefile;
213		const char *resvfile;
214
220	–	char *egdpool_path;
215		char *service_name;
216
217	<	int gline_min_cidr;
218	<	int gline_min_cidr6;
219	<	int dots_in_ident;
220	<	int failed_oper_notice;
221	<	int anti_spam_exit_message_time;
217	>	unsigned int gline_min_cidr;
218	>	unsigned int gline_min_cidr6;
219	>	unsigned int dots_in_ident;
220	>	unsigned int failed_oper_notice;
221	>	unsigned int anti_spam_exit_message_time;
222		unsigned int max_accept;
223		unsigned int max_watch;
224	<	int max_nick_time;
224	>	unsigned int away_time;
225	>	unsigned int away_count;
226	>	unsigned int max_nick_time;
227		unsigned int max_nick_changes;
228	<	int ts_max_delta;
229	<	int ts_warn_delta;
230	<	int anti_nick_flood;
231	<	int warn_no_connect_block;
232	<	int invisible_on_connect;
233	<	int stats_e_disabled;
234	<	int stats_o_oper_only;
235	<	int stats_k_oper_only;
236	<	int stats_i_oper_only;
237	<	int stats_P_oper_only;
238	<	int stats_u_oper_only;
239	<	int short_motd;
240	<	int no_oper_flood;
241	<	int true_no_oper_flood;
242	<	int oper_pass_resv;
243	<	int glines;
244	<	int hide_spoof_ips;
245	<	int tkline_expire_notices;
246	<	int opers_bypass_callerid;
247	<	int ignore_bogus_ts;
248	<	int pace_wait;
249	<	int pace_wait_simple;
250	<	int gline_time;
251	<	int gline_request_time;
252	<	int oper_only_umodes;
253	<	int oper_umodes;
228	>	unsigned int ts_max_delta;
229	>	unsigned int ts_warn_delta;
230	>	unsigned int anti_nick_flood;
231	>	unsigned int warn_no_connect_block;
232	>	unsigned int invisible_on_connect;
233	>	unsigned int stats_e_disabled;
234	>	unsigned int stats_o_oper_only;
235	>	unsigned int stats_k_oper_only;
236	>	unsigned int stats_i_oper_only;
237	>	unsigned int stats_P_oper_only;
238	>	unsigned int stats_u_oper_only;
239	>	unsigned int short_motd;
240	>	unsigned int no_oper_flood;
241	>	unsigned int true_no_oper_flood;
242	>	unsigned int oper_pass_resv;
243	>	unsigned int glines;
244	>	unsigned int hide_spoof_ips;
245	>	unsigned int tkline_expire_notices;
246	>	unsigned int opers_bypass_callerid;
247	>	unsigned int ignore_bogus_ts;
248	>	unsigned int pace_wait;
249	>	unsigned int pace_wait_simple;
250	>	unsigned int gline_time;
251	>	unsigned int gline_request_time;
252	>	unsigned int oper_only_umodes;
253	>	unsigned int oper_umodes;
254		unsigned int max_targets;
255	<	int caller_id_wait;
256	<	int min_nonwildcard;
257	<	int min_nonwildcard_simple;
258	<	int kill_chase_time_limit;
259	<	int default_floodcount;
260	<	/* 0 == don't use throttle... */
261	<	int throttle_time;
262	<	int use_egd;
263	<	int ping_cookie;
264	<	int disable_auth;
265	<	int cycle_on_host_change;
266	<	};
267	<
268	<	struct config_channel_entry
269	<	{
270	<	int disable_fake_channels;
271	<	int knock_delay;
272	<	int knock_delay_channel;
255	>	unsigned int caller_id_wait;
256	>	unsigned int min_nonwildcard;
257	>	unsigned int min_nonwildcard_simple;
258	>	unsigned int kill_chase_time_limit;
259	>	unsigned int default_floodcount;
260	>	unsigned int throttle_count;
261	>	unsigned int throttle_time;
262	>	unsigned int ping_cookie;
263	>	unsigned int disable_auth;
264	>	unsigned int cycle_on_host_change;
265	>	} ConfigFileEntry;
266	>
267	>	struct
268	>	{
269	>	unsigned int disable_fake_channels;
270	>	unsigned int invite_client_count;
271	>	unsigned int invite_client_time;
272	>	unsigned int knock_client_count;
273	>	unsigned int knock_client_time;
274	>	unsigned int knock_delay_channel;
275		unsigned int max_bans;
276	<	unsigned int max_chans_per_user;
277	<	unsigned int max_chans_per_oper;
278	<	int no_create_on_split;
279	<	int no_join_on_split;
280	<	int default_split_server_count;
281	<	int default_split_user_count;
284	<	};
276	>	unsigned int max_channels;
277	>	unsigned int no_create_on_split;
278	>	unsigned int no_join_on_split;
279	>	unsigned int default_split_server_count;
280	>	unsigned int default_split_user_count;
281	>	} ConfigChannel;
282
283	<	struct config_server_hide
283	>	struct
284		{
285		char *hidden_name;
286	<	int flatten_links;
287	<	int disable_remote_commands;
288	<	int hide_servers;
289	<	int hide_services;
290	<	int links_delay;
291	<	int links_disabled;
292	<	int hidden;
293	<	int hide_server_ips;
294	<	};
295	<
296	<	struct server_info
297	<	{
286	>	unsigned int flatten_links;
287	>	unsigned int disable_remote_commands;
288	>	unsigned int hide_servers;
289	>	unsigned int hide_services;
290	>	unsigned int links_delay;
291	>	unsigned int links_disabled;
292	>	unsigned int hidden;
293	>	unsigned int hide_server_ips;
294	>	} ConfigServerHide;
295	>
296	>	struct
297	>	{
298	>	#ifdef HAVE_LIBCRYPTO
299	>	const EVP_MD *message_digest_algorithm;
300	>	#endif
301		char *sid;
302		char *name;
303		char *description;
#	Line 307 | Line 307 | struct server_info
307		void *rsa_private_key;
308		void *server_ctx;
309		void *client_ctx;
310	<	int hub;
310	>	unsigned int hub;
311		struct irc_ssaddr ip;
312		struct irc_ssaddr ip6;
313		unsigned int max_clients;
314		unsigned int max_nick_length;
315		unsigned int max_topic_length;
316	<	int specific_ipv4_vhost;
317	<	int specific_ipv6_vhost;
316	>	unsigned int specific_ipv4_vhost;
317	>	unsigned int specific_ipv6_vhost;
318		struct sockaddr_in dns_host;
319	<	int can_use_v6;
320	<	};
319	>	unsigned int can_use_v6;
320	>	} ServerInfo;
321
322	<	struct admin_info
322	>	struct
323		{
324		char *name;
325		char *description;
326		char *email;
327	<	};
327	>	} AdminInfo;
328
329	<	struct logging_entry
329	>	struct
330		{
331		unsigned int use_logging;
332	<	};
332	>	} ConfigLoggingEntry;
333
334		extern dlink_list flatten_links;
335		extern dlink_list server_items;
#	Line 340 | Line 340 | extern dlink_list oconf_items;
340		extern dlink_list service_items;
341		extern dlink_list nresv_items;
342		extern dlink_list cresv_items;
343	<	extern struct conf_parser_context conf_parser_ctx;
344	<	extern struct logging_entry ConfigLoggingEntry;
345	<	extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
346	<	extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
347	<	extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
348	<	extern struct server_info ServerInfo;       /* defined in ircd.c */
349	<	extern struct admin_info AdminInfo;        /* defined in ircd.c */
343	>
344		extern int valid_wild_card_simple(const char *);
345		extern int valid_wild_card(struct Client *, int, int, ...);
346		/* End GLOBAL section */

Diff Legend

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