ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

1391. [func] Add support for IPv6 scoped addresses in named.

Browse Source
This commit is contained in:
Mark Andrews
2002-10-24 03:52:35 +00:00
parent 4cd7166048
commit 6526fd032f
15 changed files with 297 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/named/client.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.211 2002/09/10 04:45:52 marka Exp $ */
/* $Id: client.c,v 1.212 2002/10/24 03:52:31 marka Exp $ */
#include <config.h>
@@ -1340,9 +1340,25 @@ client_request(isc_task_t *task, isc_event_t *event) {
* the address of the interface where the request was received.
*/
if (client->interface->addr.type.sa.sa_family == AF_INET6) {
if ((client->attributes & NS_CLIENTATTR_PKTINFO) != 0)
isc_netaddr_fromin6(&destaddr, &client->pktinfo.ipi6_addr);
else
if ((client->attributes & NS_CLIENTATTR_PKTINFO) != 0) {
u_int32_t zone = 0;
/*
* XXXJT technically, we should convert the receiving
* interface ID to a proper scope zone ID. However,
* due to the fact there is no standard API for this,
* we only handle link-local addresses and use the
* interface index as link ID. Despite the assumption,
* it should cover most typical cases.
*/
if (IN6_IS_ADDR_LINKLOCAL(&client->pktinfo.ipi6_addr))
zone = (u_int32_t)client->pktinfo.ipi6_ifindex;
isc_netaddr_fromin6(&destaddr,
&client->pktinfo.ipi6_addr);
isc_netaddr_setzone(&destaddr, zone);
} else
isc_netaddr_any6(&destaddr);
} else {
isc_netaddr_fromsockaddr(&destaddr, &client->interface->addr);

4
bin/named/interfacemgr.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: interfacemgr.c,v 1.71 2002/09/10 04:45:52 marka Exp $ */
/* $Id: interfacemgr.c,v 1.72 2002/10/24 03:52:31 marka Exp $ */
#include <config.h>
@@ -681,6 +681,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen,
} else {
isc_netaddr_fromin6(&listen_netaddr,
&interface.address.type.in6);
isc_netaddr_setzone(&listen_netaddr,
interface.address.zone);
}
isc_sockaddr_fromnetaddr(&listen_sockaddr,
&listen_netaddr,