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 8658 by michael, Mon Nov 12 19:03:09 2018 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2018 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 24 | Line 24
24		* \version $Id$
25		*/
26
27	<	#ifndef INCLUDED_s_conf_h
28	<	#define INCLUDED_s_conf_h
27	>	#ifndef INCLUDED_conf_h
28	>	#define INCLUDED_conf_h
29		#include "config.h"
30	–	#include "ircd_defs.h"
30		#include "client.h"
31		#include "conf_class.h"
32	+	#include "tls.h"
33
34
35	<	#define CONF_NOREASON "<No reason supplied>"
35	>	enum
36	>	{
37	>	TK_SECONDS,
38	>	TK_MINUTES
39	>	};
40
41	<	#define IsConfOperator(x)       ((x)->type == CONF_OPER)
42	<	#define IsConfKill(x)           ((x)->type == CONF_KLINE)
43	<	#define IsConfClient(x)         ((x)->type == CONF_CLIENT)
40	<	#define IsConfGline(x)          ((x)->type == CONF_GLINE)
41	>	enum { CLEANUP_TKLINES_TIME = 60 };
42	>
43	>	#define CONF_NOREASON "<No reason supplied>"
44
45		/* MaskItem->flags */
46	<	#define CONF_FLAGS_DO_IDENTD            0x00000001
47	<	#define CONF_FLAGS_NO_TILDE             0x00000004
48	<	#define CONF_FLAGS_NEED_IDENTD          0x00000008
49	<	#define CONF_FLAGS_EXEMPTKLINE          0x00000010
50	<	#define CONF_FLAGS_NOLIMIT              0x00000020
51	<	#define CONF_FLAGS_SPOOF_IP             0x00000040
52	<	#define CONF_FLAGS_SPOOF_NOTICE         0x00000080
53	<	#define CONF_FLAGS_REDIR                0x00000100
54	<	#define CONF_FLAGS_EXEMPTGLINE          0x00000200
55	<	#define CONF_FLAGS_CAN_FLOOD            0x00000400
56	<	#define CONF_FLAGS_NEED_PASSWORD        0x00000800
57	<	#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00001000
58	<	#define CONF_FLAGS_ENCRYPTED            0x00002000
59	<	#define CONF_FLAGS_IN_DATABASE          0x00004000
60	<	#define CONF_FLAGS_EXEMPTRESV           0x00008000
61	<	#define CONF_FLAGS_SSL                  0x00010000
62	<	#define CONF_FLAGS_WEBIRC               0x00020000
46	>	enum
47	>	{
48	>	CONF_FLAGS_NO_TILDE        = 1 <<  0,
49	>	CONF_FLAGS_NEED_IDENTD     = 1 <<  1,
50	>	CONF_FLAGS_EXEMPTKLINE     = 1 <<  2,
51	>	CONF_FLAGS_NOLIMIT         = 1 <<  3,
52	>	CONF_FLAGS_SPOOF_IP        = 1 <<  4,
53	>	CONF_FLAGS_SPOOF_NOTICE    = 1 <<  5,
54	>	CONF_FLAGS_REDIR           = 1 <<  6,
55	>	CONF_FLAGS_CAN_FLOOD       = 1 <<  7,
56	>	CONF_FLAGS_NEED_PASSWORD   = 1 <<  8,
57	>	CONF_FLAGS_ALLOW_AUTO_CONN = 1 <<  9,
58	>	CONF_FLAGS_ENCRYPTED       = 1 << 10,
59	>	CONF_FLAGS_IN_DATABASE     = 1 << 11,
60	>	CONF_FLAGS_EXEMPTRESV      = 1 << 12,
61	>	CONF_FLAGS_SSL             = 1 << 13,
62	>	CONF_FLAGS_WEBIRC          = 1 << 14,
63	>	CONF_FLAGS_EXEMPTXLINE     = 1 << 15
64	>	};
65
66		/* Macros for struct MaskItem */
67	<	#define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
68	<	#define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
69	<	#define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
70	<	#define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
71	<	#define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
72	<	#define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
73	<	#define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
74	<	#define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
75	<	#define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
76	<	#define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
77	<	#define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
78	<	#define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
79	<	#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)
77	<	#define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
78	<	#define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
67	>	#define IsConfWebIRC(x)           ((x)->flags & CONF_FLAGS_WEBIRC)
68	>	#define IsNoTilde(x)              ((x)->flags & CONF_FLAGS_NO_TILDE)
69	>	#define IsConfCanFlood(x)         ((x)->flags & CONF_FLAGS_CAN_FLOOD)
70	>	#define IsNeedPassword(x)         ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
71	>	#define IsNeedIdentd(x)           ((x)->flags & CONF_FLAGS_NEED_IDENTD)
72	>	#define IsConfExemptKline(x)      ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
73	>	#define IsConfExemptXline(x)      ((x)->flags & CONF_FLAGS_EXEMPTXLINE)
74	>	#define IsConfExemptLimits(x)     ((x)->flags & CONF_FLAGS_NOLIMIT)
75	>	#define IsConfExemptResv(x)       ((x)->flags & CONF_FLAGS_EXEMPTRESV)
76	>	#define IsConfDoSpoofIp(x)        ((x)->flags & CONF_FLAGS_SPOOF_IP)
77	>	#define IsConfSpoofNotice(x)      ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
78	>	#define IsConfAllowAutoConn(x)    ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
79	>	#define SetConfAllowAutoConn(x)   ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
80		#define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
81	<	#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
82	<	#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
83	<	#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
84	<	#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
84	<	#define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
85	<	#define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
86	<
87	<
88	<	/* shared/cluster server entry types
89	<	* These defines are used for both shared and cluster.
90	<	*/
91	<	#define SHARED_KLINE            0x0001
92	<	#define SHARED_UNKLINE          0x0002
93	<	#define SHARED_XLINE            0x0004
94	<	#define SHARED_UNXLINE          0x0008
95	<	#define SHARED_RESV             0x0010
96	<	#define SHARED_UNRESV           0x0020
97	<	#define SHARED_LOCOPS           0x0040
98	<	#define SHARED_DLINE            0x0080
99	<	#define SHARED_UNDLINE          0x0100
100	<	#define SHARED_ALL              (SHARED_KLINE | SHARED_UNKLINE |\
101	<	SHARED_XLINE | SHARED_UNXLINE |\
102	<	SHARED_RESV | SHARED_UNRESV |\
103	<	SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
81	>	#define IsConfRedir(x)            ((x)->flags & CONF_FLAGS_REDIR)
82	>	#define IsConfSSL(x)              ((x)->flags & CONF_FLAGS_SSL)
83	>	#define IsConfDatabase(x)         ((x)->flags & CONF_FLAGS_IN_DATABASE)
84	>	#define SetConfDatabase(x)        ((x)->flags |= CONF_FLAGS_IN_DATABASE)
85
86
87		enum maskitem_type
88		{
89	<	CONF_CLIENT   = 1 <<  0,
90	<	CONF_SERVER   = 1 <<  1,
91	<	CONF_KLINE    = 1 <<  2,
92	<	CONF_DLINE    = 1 <<  3,
93	<	CONF_EXEMPT   = 1 <<  4,
94	<	CONF_CLUSTER  = 1 <<  5,
114	<	CONF_XLINE    = 1 <<  6,
115	<	CONF_ULINE    = 1 <<  7,
116	<	CONF_GLINE    = 1 <<  8,
117	<	CONF_CRESV    = 1 <<  9,
118	<	CONF_NRESV    = 1 << 10,
119	<	CONF_SERVICE  = 1 << 11,
120	<	CONF_OPER     = 1 << 12,
89	>	CONF_CLIENT = 1,
90	>	CONF_SERVER,
91	>	CONF_KLINE,
92	>	CONF_DLINE,
93	>	CONF_EXEMPT,
94	>	CONF_OPER
95		};
96
97	+	#define IsConfKill(x)           ((x)->type == CONF_KLINE)
98	+	#define IsConfClient(x)         ((x)->type == CONF_CLIENT)
99	+
100		enum
101		{
102		NOT_AUTHORIZED = -1,
#	Line 129 | Line 106 | enum
106		TOO_FAST       = -5
107		};
108
132	–	struct conf_parser_context
133	–	{
134	–	unsigned int boot;
135	–	unsigned int pass;
136	–	FILE *conf_file;
137	–	};
138	–
109		struct split_nuh_item
110		{
111		dlink_node node;
#	Line 155 | Line 125 | struct MaskItem
125		dlink_node         node;
126		dlink_list         leaf_list;
127		dlink_list         hub_list;
158	–	dlink_list         exempt_list;
128		enum maskitem_type type;
129	<	unsigned int       dns_failed;
130	<	unsigned int       dns_pending;
129	>	bool       active;
130	>	bool       dns_failed;
131	>	bool       dns_pending;
132		unsigned int       flags;
133		unsigned int       modes;
134		unsigned int       port;
165	–	unsigned int       count;
135		unsigned int       aftype;
167	–	unsigned int       active;
136		unsigned int       htype;
137		unsigned int       ref_count;  /* Number of *LOCAL* clients using this */
138		int                bits;
139	<	time_t             until;     /* Hold action until this time (calendar time) */
140	<	time_t             setat;
139	>	uintmax_t          until;     /* Hold action until this time (calendar time) */
140	>	uintmax_t          setat;
141		struct irc_ssaddr  bind;  /* ip to bind to for outgoing connect */
142		struct irc_ssaddr  addr;  /* ip to connect to */
143		struct ClassItem  *class;  /* Class of connection */
#	Line 180 | Line 148 | struct MaskItem
148		char              *spasswd;  /* Password to send. */
149		char              *reason;
150		char              *certfp;
151	+	char              *whois;
152		char              *cipher_list;
184	–	void              *rsa_public_key;
185	–	};
186	–
187	–	struct exempt
188	–	{
189	–	dlink_node node;
190	–	char *name;
191	–	char *user;
192	–	char *host;
193	–	size_t len;
194	–	time_t when;
195	–	struct irc_ssaddr addr;
196	–	int bits;
197	–	int type;
198	–	int coid;
153		};
154
155		struct CidrItem
#	Line 205 | Line 159 | struct CidrItem
159		unsigned int number_on_this_cidr;
160		};
161
162	<	struct config_file_entry
162	>	struct conf_parser_context
163	>	{
164	>	unsigned int boot;
165	>	unsigned int pass;
166	>	FILE *conf_file;
167	>	};
168	>
169	>	struct config_general_entry
170		{
171	<	const char *dpath;          /* DPATH if set from command line */
171	>	const char *dpath;
172		const char *mpath;
173		const char *spath;
174		const char *configfile;
175		const char *klinefile;
215	–	const char *glinefile;
176		const char *xlinefile;
177		const char *dlinefile;
178		const char *resvfile;
179
180	<	char *egdpool_path;
181	<	char *service_name;
182	<
183	<	int gline_min_cidr;
184	<	int gline_min_cidr6;
185	<	int dots_in_ident;
186	<	int failed_oper_notice;
227	<	int anti_spam_exit_message_time;
180	>	unsigned int dline_min_cidr;
181	>	unsigned int dline_min_cidr6;
182	>	unsigned int kline_min_cidr;
183	>	unsigned int kline_min_cidr6;
184	>	unsigned int dots_in_ident;
185	>	unsigned int failed_oper_notice;
186	>	unsigned int anti_spam_exit_message_time;
187		unsigned int max_accept;
188		unsigned int max_watch;
189	<	int max_nick_time;
189	>	unsigned int whowas_history_length;
190	>	unsigned int away_time;
191	>	unsigned int away_count;
192	>	unsigned int max_nick_time;
193		unsigned int max_nick_changes;
194	<	int ts_max_delta;
195	<	int ts_warn_delta;
196	<	int anti_nick_flood;
197	<	int warn_no_connect_block;
198	<	int invisible_on_connect;
199	<	int stats_e_disabled;
200	<	int stats_o_oper_only;
201	<	int stats_k_oper_only;
202	<	int stats_i_oper_only;
203	<	int stats_P_oper_only;
204	<	int stats_u_oper_only;
205	<	int short_motd;
206	<	int no_oper_flood;
207	<	int true_no_oper_flood;
208	<	int oper_pass_resv;
209	<	int glines;
210	<	int hide_spoof_ips;
211	<	int tkline_expire_notices;
212	<	int opers_bypass_callerid;
213	<	int ignore_bogus_ts;
214	<	int pace_wait;
253	<	int pace_wait_simple;
254	<	int gline_time;
255	<	int gline_request_time;
256	<	int oper_only_umodes;
257	<	int oper_umodes;
194	>	unsigned int ts_max_delta;
195	>	unsigned int ts_warn_delta;
196	>	unsigned int anti_nick_flood;
197	>	unsigned int warn_no_connect_block;
198	>	unsigned int invisible_on_connect;
199	>	unsigned int stats_e_disabled;
200	>	unsigned int stats_i_oper_only;
201	>	unsigned int stats_k_oper_only;
202	>	unsigned int stats_m_oper_only;
203	>	unsigned int stats_o_oper_only;
204	>	unsigned int stats_P_oper_only;
205	>	unsigned int stats_u_oper_only;
206	>	unsigned int short_motd;
207	>	unsigned int no_oper_flood;
208	>	unsigned int tkline_expire_notices;
209	>	unsigned int opers_bypass_callerid;
210	>	unsigned int ignore_bogus_ts;
211	>	unsigned int pace_wait;
212	>	unsigned int pace_wait_simple;
213	>	unsigned int oper_only_umodes;
214	>	unsigned int oper_umodes;
215		unsigned int max_targets;
216	<	int caller_id_wait;
217	<	int min_nonwildcard;
218	<	int min_nonwildcard_simple;
219	<	int kill_chase_time_limit;
220	<	int default_floodcount;
221	<	/* 0 == don't use throttle... */
222	<	int throttle_time;
223	<	int use_egd;
224	<	int ping_cookie;
225	<	int disable_auth;
226	<	int cycle_on_host_change;
216	>	unsigned int caller_id_wait;
217	>	unsigned int min_nonwildcard;
218	>	unsigned int min_nonwildcard_simple;
219	>	unsigned int kill_chase_time_limit;
220	>	unsigned int default_floodcount;
221	>	unsigned int default_floodtime;
222	>	unsigned int throttle_count;
223	>	unsigned int throttle_time;
224	>	unsigned int ping_cookie;
225	>	unsigned int disable_auth;
226	>	unsigned int cycle_on_host_change;
227		};
228
229		struct config_channel_entry
230		{
231	<	int disable_fake_channels;
232	<	int knock_delay;
233	<	int knock_delay_channel;
231	>	unsigned int disable_fake_channels;
232	>	unsigned int invite_client_count;
233	>	unsigned int invite_client_time;
234	>	unsigned int invite_delay_channel;
235	>	unsigned int invite_expire_time;
236	>	unsigned int knock_client_count;
237	>	unsigned int knock_client_time;
238	>	unsigned int knock_delay_channel;
239	>	unsigned int max_invites;
240		unsigned int max_bans;
241	<	unsigned int max_chans_per_user;
242	<	unsigned int max_chans_per_oper;
243	<	int no_create_on_split;
244	<	int no_join_on_split;
282	<	int default_split_server_count;
283	<	int default_split_user_count;
241	>	unsigned int max_bans_large;
242	>	unsigned int max_channels;
243	>	unsigned int default_join_flood_count;
244	>	unsigned int default_join_flood_time;
245		};
246
247	<	struct config_server_hide
247	>	struct config_serverhide_entry
248		{
249		char *hidden_name;
250	<	int flatten_links;
251	<	int disable_remote_commands;
252	<	int hide_servers;
253	<	int hide_services;
254	<	int links_delay;
255	<	int links_disabled;
256	<	int hidden;
257	<	int hide_server_ips;
250	>	char *flatten_links_file;
251	>	unsigned int flatten_links;
252	>	unsigned int flatten_links_delay;
253	>	unsigned int disable_remote_commands;
254	>	unsigned int hide_servers;
255	>	unsigned int hide_services;
256	>	unsigned int hidden;
257	>	unsigned int hide_server_ips;
258		};
259
260	<	struct server_info
260	>	struct config_serverinfo_entry
261		{
262		char *sid;
263		char *name;
#	Line 304 | Line 265 | struct server_info
265		char *network_name;
266		char *network_desc;
267		char *rsa_private_key_file;
268	<	void *rsa_private_key;
269	<	void *server_ctx;
270	<	void *client_ctx;
271	<	int hub;
272	<	struct irc_ssaddr ip;
273	<	struct irc_ssaddr ip6;
274	<	unsigned int max_clients;
268	>	char *ssl_certificate_file;
269	>	char *ssl_dh_param_file;
270	>	char *ssl_dh_elliptic_curve;
271	>	char *ssl_cipher_list;
272	>	char *ssl_message_digest_algorithm;
273	>	tls_context_t tls_ctx;
274	>	tls_md_t message_digest_algorithm;
275	>	unsigned int hub;
276	>	unsigned int default_max_clients;
277		unsigned int max_nick_length;
278		unsigned int max_topic_length;
279	<	int specific_ipv4_vhost;
280	<	int specific_ipv6_vhost;
281	<	struct sockaddr_in dns_host;
282	<	int can_use_v6;
279	>	unsigned int specific_ipv4_vhost;
280	>	unsigned int specific_ipv6_vhost;
281	>	struct irc_ssaddr ip;
282	>	struct irc_ssaddr ip6;
283		};
284
285	<	struct admin_info
285	>	struct config_admin_entry
286		{
287		char *name;
288		char *description;
289		char *email;
290		};
291
292	<	struct logging_entry
292	>	struct config_log_entry
293		{
294		unsigned int use_logging;
295		};
296
297		extern dlink_list flatten_links;
298	<	extern dlink_list server_items;
299	<	extern dlink_list cluster_items;
337	<	extern dlink_list xconf_items;
338	<	extern dlink_list uconf_items;
339	<	extern dlink_list oconf_items;
340	<	extern dlink_list service_items;
341	<	extern dlink_list nresv_items;
342	<	extern dlink_list cresv_items;
298	>	extern dlink_list connect_items;
299	>	extern dlink_list operator_items;
300		extern struct conf_parser_context conf_parser_ctx;
301	<	extern struct logging_entry ConfigLoggingEntry;
302	<	extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
303	<	extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
304	<	extern struct config_server_hide ConfigServerHide; /* defined in s_conf.c */
305	<	extern struct server_info ServerInfo;       /* defined in ircd.c */
306	<	extern struct admin_info AdminInfo;        /* defined in ircd.c */
301	>	extern struct config_log_entry ConfigLog;
302	>	extern struct config_general_entry ConfigGeneral;
303	>	extern struct config_channel_entry ConfigChannel;
304	>	extern struct config_serverhide_entry ConfigServerHide;
305	>	extern struct config_serverinfo_entry ConfigServerInfo;
306	>	extern struct config_admin_entry ConfigAdminInfo;
307	>
308		extern int valid_wild_card_simple(const char *);
309	<	extern int valid_wild_card(struct Client *, int, int, ...);
352	<	/* End GLOBAL section */
309	>	extern int valid_wild_card(int, ...);
310
354	–	extern void init_ip_hash_table(void);
355	–	extern void count_ip_hash(unsigned int *, uint64_t *);
356	–	extern void remove_one_ip(struct irc_ssaddr *);
311		extern struct MaskItem *conf_make(enum maskitem_type);
312	<	extern void read_conf_files(int);
313	<	extern int attach_conf(struct Client *, struct MaskItem *);
360	<	extern int attach_connect_block(struct Client *, const char *, const char *);
312	>	extern void read_conf_files(bool);
313	>	extern int conf_attach(struct Client *, struct MaskItem *);
314		extern int check_client(struct Client *);
315
316
317	<	extern void detach_conf(struct Client *, enum maskitem_type);
317	>	extern void conf_detach(struct Client *, enum maskitem_type);
318		extern struct MaskItem *find_conf_name(dlink_list *, const char *, enum maskitem_type);
319		extern int conf_connect_allowed(struct irc_ssaddr *, int);
320	<	extern char *oper_privs_as_string(const unsigned int);
320	>	extern const char *oper_privs_as_string(const unsigned int);
321		extern void split_nuh(struct split_nuh_item *);
322	<	extern struct MaskItem *find_matching_name_conf(enum maskitem_type, const char *,
323	<	const char *, const char *, unsigned int);
371	<	extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Client *, const char *,
372	<	const char *, const char *);
322	>	extern struct MaskItem *operator_find(const struct Client *, const char *);
323	>	extern struct MaskItem *connect_find(const char *, int (*)(const char *, const char *));
324		extern void conf_free(struct MaskItem *);
325		extern void yyerror(const char *);
326		extern void conf_error_report(const char *);
327		extern void cleanup_tklines(void *);
328	<	extern int rehash(int);
328	>	extern void conf_rehash(bool);
329		extern void lookup_confhost(struct MaskItem *);
330		extern void conf_add_class_to_conf(struct MaskItem *, const char *);
331
332		extern const char *get_oper_name(const struct Client *);
333
334		/* XXX should the parse_aline stuff go into another file ?? */
384	–	#define AWILD 0x1  /* check wild cards */
335		extern int parse_aline(const char *, struct Client *, int, char **,
336	<	int, char **, char **, time_t *, char **, char **);
387	<	extern int valid_comment(struct Client *, char *, int);
388	<
336	>	char **, char **, uintmax_t *, char **, char **);
337
338	<	#define TK_SECONDS 0
391	<	#define TK_MINUTES 1
392	<	extern time_t valid_tkline(const char *, const int);
338	>	extern uintmax_t valid_tkline(const char *, const int);
339		extern int match_conf_password(const char *, const struct MaskItem *);
340	<
395	<	#define CLEANUP_TKLINES_TIME 60
396	<
397	<	extern void cluster_a_line(struct Client *, const char *, int, int, const char *,...);
398	<	#endif /* INCLUDED_s_conf_h */
340	>	#endif  /* INCLUDED_conf_h */

Comparing ircd-hybrid/trunk/include/conf.h (property svn:keywords):
Revision 3473 by michael, Sun May 4 15:40:26 2014 UTC vs.
Revision 8658 by michael, Mon Nov 12 19:03:09 2018 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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