ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/ipcache.c (file contents):
Revision 4800 by michael, Tue Oct 28 13:59:43 2014 UTC vs.
Revision 4977 by michael, Thu Dec 4 15:12:24 2014 UTC

#	Line 49 | Line 49 | ipcache_hash_address(const struct irc_ss
49		{
50		if (addr->ss.ss_family == AF_INET)
51		{
52	<	const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
52	>	const struct sockaddr_in *const v4 = (const struct sockaddr_in *)addr;
53		uint32_t hash = 0, ip = ntohl(v4->sin_addr.s_addr);
54
55		hash = ((ip >> 12) + ip) & (IP_HASH_SIZE - 1);
#	Line 57 | Line 57 | ipcache_hash_address(const struct irc_ss
57		}
58		else
59		{
60	<	const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
61	<	uint32_t hash = 0, *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
60	>	const struct sockaddr_in6 *const v6 = (const struct sockaddr_in6 *)addr;
61	>	uint32_t hash = 0, *const ip = (uint32_t *)&v6->sin6_addr.s6_addr;
62
63		hash  = ip[0] ^ ip[3];
64		hash ^= hash >> 16;
#	Line 82 | Line 82 | ipcache_find_or_add_address(struct irc_s
82		{
83		dlink_node *node = NULL;
84		struct ip_entry *iptr = NULL;
85	<	uint32_t hash_index = ipcache_hash_address(addr);
85	>	const uint32_t hash_index = ipcache_hash_address(addr);
86		struct sockaddr_in *v4 = (struct sockaddr_in *)addr, *ptr_v4;
87		struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr, *ptr_v6;
88
#	Line 128 | Line 128 | void
128		ipcache_remove_address(struct irc_ssaddr *addr)
129		{
130		dlink_node *node = NULL;
131	<	uint32_t hash_index = ipcache_hash_address(addr);
131	>	const uint32_t hash_index = ipcache_hash_address(addr);
132		struct sockaddr_in *v4 = (struct sockaddr_in *)addr, *ptr_v4;
133		struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr, *ptr_v6;
134

Diff Legend

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