Accumulated 2.60 changes going into git

This commit is contained in:
Simon Kelley committed 2012-01-05 21:33:27 +00:00
1 parent 74c95c2542
commit c72daea868
55 files changed
+7218 -3850

No files matched your search

+2 -1
View File
@@ -182,7 +182,8 @@ int iface_enumerate(int family, void *parm, int (*callback)())
addr->s6_addr[2] = 0;
addr->s6_addr[3] = 0;
}
if (!((*callback)(addr,
/* We have no way to determine the prefix, so we assume it's 64 for now....... */
if (!((*callback)(addr, 64,
(int)((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_scope_id,
(int)if_nametoindex(ifr->ifr_name), 0,
parm)))