diff options
| author | Brian Somers <brian@FreeBSD.org> | 2004-09-05 01:46:52 +0000 |
|---|---|---|
| committer | Brian Somers <brian@FreeBSD.org> | 2004-09-05 01:46:52 +0000 |
| commit | 057f1760a8171825b260dad27502f74ed5f69faf (patch) | |
| tree | fb5af1860e245ef67196527d9ba46e5c9e284bf6 /usr.sbin/ppp/ncpaddr.c | |
| parent | 3f61368f03d40932bd1fbe095678fd44de5c8490 (diff) | |
| download | src-test2-057f1760a8171825b260dad27502f74ed5f69faf.tar.gz src-test2-057f1760a8171825b260dad27502f74ed5f69faf.zip | |
Notes
Diffstat (limited to 'usr.sbin/ppp/ncpaddr.c')
| -rw-r--r-- | usr.sbin/ppp/ncpaddr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c index 112cfbcbd2f3..ec20d399dd4f 100644 --- a/usr.sbin/ppp/ncpaddr.c +++ b/usr.sbin/ppp/ncpaddr.c @@ -159,11 +159,11 @@ mask62bits(const struct in6_addr *mask) return masklen; } +#if 0 static void adjust_linklocal(struct sockaddr_in6 *sin6) { /* XXX: ?????!?!?!!!!! This is horrible ! */ -#if 0 /* * The kernel does not understand sin6_scope_id for routing at this moment. * We should rather keep the embedded ID. @@ -175,9 +175,9 @@ adjust_linklocal(struct sockaddr_in6 *sin6) ntohs(*(u_short *)&sin6->sin6_addr.s6_addr[2]); *(u_short *)&sin6->sin6_addr.s6_addr[2] = 0; } -#endif } #endif +#endif void ncpaddr_init(struct ncpaddr *addr) @@ -385,7 +385,9 @@ ncpaddr_ntowa(const struct ncpaddr *addr) sin6.sin6_len = sizeof(sin6); sin6.sin6_family = AF_INET6; sin6.sin6_addr = addr->ncpaddr_ip6addr; +#if 0 adjust_linklocal(&sin6); +#endif #ifdef NI_WITHSCOPEID if (getnameinfo((struct sockaddr *)&sin6, sizeof sin6, res, sizeof(res), NULL, 0, NI_WITHSCOPEID | NI_NUMERICHOST) != 0) |