ViewVC Help

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

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

Comparing ircd-hybrid-8/include/conf.h (file contents):
Revision 1459 by michael, Fri Jul 6 14:23:09 2012 UTC vs.
Revision 1549 by michael, Mon Oct 1 18:11:11 2012 UTC

#	Line 150 | Line 150 | struct ClassItem
150		dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
151		dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
152		unsigned int max_sendq;
153	+	unsigned int max_recvq;
154		int con_freq;
155		int ping_freq;
156		int ping_warning;
#	Line 226 | Line 227 | struct CidrItem
227		#define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
228		#define CONF_FLAGS_ENCRYPTED            0x00004000
229		#define CONF_FLAGS_TEMPORARY            0x00008000
230	<	#define CONF_FLAGS_BURST_AWAY           0x00010000
231	<	#define CONF_FLAGS_EXEMPTRESV           0x00020000
231	<	#define CONF_FLAGS_TOPICBURST           0x00040000
232	<	#define CONF_FLAGS_SSL                  0x00080000
230	>	#define CONF_FLAGS_EXEMPTRESV           0x00010000
231	>	#define CONF_FLAGS_SSL                  0x00020000
232
233		/* Macros for struct AccessItem */
234		#define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
#	Line 254 | Line 253 | struct CidrItem
253		#define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
254		#define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
255		#define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
257	–	#define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
258	–	#define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
259	–	#define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
260	–	#define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
261	–	#define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
262	–	#define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
256		#define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
257		#define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
258		#define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
#	Line 287 | Line 280 | struct config_file_entry
280		const char *configfile;
281		const char *klinefile;
282		const char *xlinefile;
290	–	const char *rxlinefile;
291	–	const char *rklinefile;
283		const char *dlinefile;
293	–	const char *glinefile;
284		const char *cresvfile;
285		const char *nresvfile;
286
#	Line 312 | Line 302 | struct config_file_entry
302		int ts_max_delta;
303		int ts_warn_delta;
304		int anti_nick_flood;
315	–	int kline_with_reason;
305		int warn_no_nline;
306		int invisible_on_connect;
307		int stats_e_disabled;
#	Line 326 | Line 315 | struct config_file_entry
315		int oper_pass_resv;
316		int glines;
317		int hide_spoof_ips;
329	–	int burst_away;
330	–	int use_whois_actually;
318		int tkline_expire_notices;
319		int opers_bypass_callerid;
320		int ignore_bogus_ts;
334	–	char *kline_reason;
321		int pace_wait;
322		int pace_wait_simple;
323		int gline_time;
#	Line 344 | Line 330 | struct config_file_entry
330		int min_nonwildcard_simple;
331		int kill_chase_time_limit;
332		int default_floodcount;
347	–	int client_flood;
333		/* 0 == don't use throttle... */
334		int throttle_time;
335		int use_egd;
#	Line 357 | Line 342 | struct config_channel_entry
342		{
343		int disable_fake_channels;
344		int restrict_channels;
360	–	int disable_local_channels;
361	–	int use_except;
362	–	int use_invex;
363	–	int use_knock;
345		int knock_delay;
346		int knock_delay_channel;
347		unsigned int max_bans;
#	Line 381 | Line 362 | struct config_server_hide
362		int links_delay;
363		int links_disabled;
364		int hidden;
384	–	int disable_hidden;
365		int hide_server_ips;
366		};
367
#	Line 439 | Line 419 | extern int valid_wild_card(struct Client
419		/* End GLOBAL section */
420
421		extern unsigned int get_sendq(struct Client *);
422	+	extern unsigned int get_recvq(struct Client *);
423		extern const char *get_client_class(struct Client *);
424		extern int get_client_ping(struct Client *, int *);
425		extern void check_class(void);
#	Line 489 | Line 470 | extern void *map_to_conf(struct ConfItem
470		extern struct ConfItem *unmap_conf_item(void *);
471		/* XXX should the parse_aline stuff go into another file ?? */
472		#define AWILD 0x1               /* check wild cards */
492	–	#define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
473		extern int parse_aline(const char *, struct Client *, int, char **,
474		int, char **, char **, time_t *, char **, char **);
475		extern int valid_comment(struct Client *, char *, int);

Diff Legend

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