diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2012-12-05 19:45:24 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2012-12-05 19:45:24 +0000 |
| commit | 0bebb5448bab0b4ee3a7262d83659e07fc681c13 (patch) | |
| tree | 54a3401d4d89d95ebe41cab5790300d24c5a6268 /sbin | |
| parent | eb8a71868647e49aedeaac4eaf88e4361f80b23a (diff) | |
| download | src-0bebb5448bab0b4ee3a7262d83659e07fc681c13.tar.gz src-0bebb5448bab0b4ee3a7262d83659e07fc681c13.zip | |
- Move definition of V_deembed_scopeid to scope6_var.h.
- Deembed scope id in L3 address in in6_lltable_dump().
- Simplify scope id recovery in rtsock routines.
- Remove embedded scope id handling in ndp(8) and route(8) completely.
Notes
Notes:
svn path=/head/; revision=243903
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/route/route.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sbin/route/route.c b/sbin/route/route.c index 809dc9f08404..be85184f182e 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1215,16 +1215,6 @@ getaddr(int which, char *str, struct hostent **hpp) exit(1); } memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6)); -#ifdef __KAME__ - if ((IN6_IS_ADDR_LINKLOCAL(&su->sin6.sin6_addr) || - IN6_IS_ADDR_MC_LINKLOCAL(&su->sin6.sin6_addr) || - IN6_IS_ADDR_MC_NODELOCAL(&su->sin6.sin6_addr)) && - su->sin6.sin6_scope_id) { - *(u_int16_t *)&su->sin6.sin6_addr.s6_addr[2] = - htons(su->sin6.sin6_scope_id); - su->sin6.sin6_scope_id = 0; - } -#endif freeaddrinfo(res); if (q != NULL) *q++ = '/'; |