ViewVC Help

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

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

Comparing ircd-hybrid/trunk/include/hostmask.h (file contents):
Revision 1592 by michael, Sat Oct 27 21:02:32 2012 UTC vs.
Revision 1632 by michael, Sun Nov 4 15:37:10 2012 UTC

#	Line 44 | Line 44 | struct AddressRec
44		{
45		struct
46		{
47	<	/* Pointer into AccessItem... -A1kmm */
47	>	/* Pointer into MaskItem... -A1kmm */
48		struct irc_ssaddr addr;
49		int bits;
50		} ipa;
51
52	<	/* Pointer into AccessItem... -A1kmm */
52	>	/* Pointer into MaskItem... -A1kmm */
53		const char *hostname;
54		} Mask;
55
56		/* type: CONF_CLIENT, CONF_DLINE, CONF_KLINE etc... -A1kmm */
57	<	unsigned int type;
57	>	enum maskitem_type type;
58
59		/* Higher precedences overrule lower ones... */
60		unsigned int precedence;
61
62		/* Only checked if !(type & 1)... */
63		const char *username;
64	<	struct AccessItem *aconf;
64	>	struct MaskItem *conf;
65
66		dlink_node node;
67		};
#	Line 73 | Line 73 | extern int match_ipv4(const struct irc_s
73
74		extern void mask_addr(struct irc_ssaddr *, int);
75		extern void init_host_hash(void);
76	<	extern void add_conf_by_address(const unsigned int, struct AccessItem *);
77	<	extern void delete_one_address_conf(const char *, struct AccessItem *);
76	>	extern void add_conf_by_address(const unsigned int, struct MaskItem *);
77	>	extern void delete_one_address_conf(const char *, struct MaskItem *);
78		extern void clear_out_address_conf(void);
79		extern void hostmask_expire_temporary(void);
80
81	<	extern struct AccessItem *find_address_conf(const char *, const char *,
81	>	extern struct MaskItem *find_address_conf(const char *, const char *,
82		struct irc_ssaddr *, int, char *);
83	<	extern struct AccessItem *find_dline_conf(struct irc_ssaddr *, int);
84	<	extern struct AccessItem *find_conf_by_address(const char *, struct irc_ssaddr *,
85	<	unsigned int, int, const char *, const char *, int);
83	>	extern struct MaskItem *find_dline_conf(struct irc_ssaddr *, int);
84	>	extern struct MaskItem *find_conf_by_address(const char *, struct irc_ssaddr *,
85	>	unsigned int, int, const char *, const char *, int);
86		#endif /* INCLUDE_hostmask_h */

Diff Legend

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