ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/hostmask.c

Comparing ircd-hybrid/trunk/src/hostmask.c (file contents):
Revision 4915 by michael, Tue Nov 25 12:37:46 2014 UTC vs.
Revision 4977 by michael, Thu Dec 4 15:12:24 2014 UTC

#	Line 267 | Line 267 | int
267		match_ipv6(const struct irc_ssaddr *addr, const struct irc_ssaddr *mask, int bits)
268		{
269		int i, m, n = bits / 8;
270	<	const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
271	<	const struct sockaddr_in6 *v6mask = (const struct sockaddr_in6 *)mask;
270	>	const struct sockaddr_in6 *const v6 = (const struct sockaddr_in6 *)addr;
271	>	const struct sockaddr_in6 *const v6mask = (const struct sockaddr_in6 *)mask;
272
273		for (i = 0; i < n; ++i)
274		if (v6->sin6_addr.s6_addr[i] != v6mask->sin6_addr.s6_addr[i])
#	Line 290 | Line 290 | match_ipv6(const struct irc_ssaddr *addr
290		int
291		match_ipv4(const struct irc_ssaddr *addr, const struct irc_ssaddr *mask, int bits)
292		{
293	<	const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
294	<	const struct sockaddr_in *v4mask = (const struct sockaddr_in *)mask;
293	>	const struct sockaddr_in *const v4 = (const struct sockaddr_in *)addr;
294	>	const struct sockaddr_in *const v4mask = (const struct sockaddr_in *)mask;
295
296		if ((ntohl(v4->sin_addr.s_addr) & ~((1 << (32 - bits)) - 1)) !=
297		ntohl(v4mask->sin_addr.s_addr))
#	Line 612 | Line 612 | find_dline_conf(struct irc_ssaddr *addr,
612		struct AddressRec *
613		add_conf_by_address(const unsigned int type, struct MaskItem *conf)
614		{
615	<	const char *hostname = conf->host;
616	<	const char *username = conf->user;
615	>	struct AddressRec *arec = NULL;
616	>	const char *const hostname = conf->host;
617	>	const char *const username = conf->user;
618		static unsigned int prec_value = 0xFFFFFFFF;
619		int bits = 0;
619	–	struct AddressRec *arec = NULL;
620
621		assert(type && !EmptyString(hostname));
622
#	Line 733 | Line 733 | clear_out_address_conf(void)
733		}
734
735		static void
736	<	hostmask_send_expiration(struct AddressRec *arec)
736	>	hostmask_send_expiration(const struct AddressRec *const arec)
737		{
738		char ban_type = '\0';
739

Diff Legend

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