mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

* Clear out the scope ID from the IPv6 address [1]

Browse Source 
* Properly determine if an IPv6 address is global or not

Reported by:	Ashish Shukla <wahjava.ml@gmail.com>
Sumbitted by:	ume [1]
This commit is contained in:
Joe Marcus Clarke 2008-04-05 20:09:08 +00:00
parent 009ec786da
commit 4a4ddf8f4a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=210612
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/avahi-app/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME= avahi
PORTVERSION= 0.6.22
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES?= net dns
MASTER_SITES= http://www.avahi.org/download/
PKGNAMESUFFIX?= -app

32
net/avahi-app/files/patch-avahi-core_iface-pfroute.c Normal file
View File

@ -0,0 +1,32 @@
--- avahi-core/iface-pfroute.c.orig 2008-04-05 15:54:11.000000000 -0400
+++ avahi-core/iface-pfroute.c 2008-04-05 16:04:04.000000000 -0400
@@ -172,6 +177,13 @@ static void rtm_addr(struct rt_msghdr *r
break;
case RTA_IFA:
memcpy(raddr.data.data, &((struct sockaddr_in6 *)sa)->sin6_addr, sizeof(struct in6_addr));
+#ifdef __KAME__
+ if (IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)raddr.data.data))
+ {
+ ((struct in6_addr *)raddr.data.data)->s6_addr[2] = 0;
+ ((struct in6_addr *)raddr.data.data)->s6_addr[3] = 0;
+ }
+#endif
raddr_valid = 1;
default:
break;
@@ -196,9 +207,12 @@ static void rtm_addr(struct rt_msghdr *r
if (!(addriface = avahi_interface_monitor_get_address(m, iface, &raddr)))
if (!(addriface = avahi_interface_address_new(m, iface, &raddr, prefixlen)))
return; /* OOM */
- /* FIXME */
- /* addriface->global_scope = ifaddrmsg->ifa_scope == RT_SCOPE_UNIVERSE || ifaddrmsg->ifa_scope == RT_SCOPE_SITE; */
- addriface->global_scope = 1;
+ if (raddr.proto == AVAHI_PROTO_INET6)
+ {
+ addriface->global_scope = !(IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)raddr.data.data) || IN6_IS_ADDR_MULTICAST((struct in6_addr *)raddr.data.data));
+ }
+ else
+ addriface->global_scope = 1;
}
else
{