diff options
| author | Vladislav Grishenko <themiron@mail.ru> | 2018-01-12 22:24:28 +0500 |
|---|---|---|
| committer | Vladislav Grishenko <themiron@mail.ru> | 2018-01-13 02:07:50 +0500 |
| commit | 933595c17e2a665315a9742ccd2ddeea6dafb78f (patch) | |
| tree | c8803e5818879b0aeaa8513ce3c53949d609b21e /accel-pppd/extra | |
| parent | 2bec9805e11d591fb638908f78d82e7f62463a51 (diff) | |
| download | accel-ppp-933595c17e2a665315a9742ccd2ddeea6dafb78f.tar.gz accel-ppp-933595c17e2a665315a9742ccd2ddeea6dafb78f.zip | |
ipv6: consolidate and fix interface-id address generation for non-/128
Diffstat (limited to 'accel-pppd/extra')
| -rw-r--r-- | accel-pppd/extra/pppd_compat.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/accel-pppd/extra/pppd_compat.c b/accel-pppd/extra/pppd_compat.c index ce7e7550..8a4f3ac9 100644 --- a/accel-pppd/extra/pppd_compat.c +++ b/accel-pppd/extra/pppd_compat.c @@ -578,16 +578,6 @@ static void fill_argv(char **argv, struct pppd_compat_pd *pd, char *path) argv[7] = NULL; } -static void build_addr(struct ipv6db_addr_t *a, uint64_t intf_id, struct in6_addr *addr) -{ - memcpy(addr, &a->addr, sizeof(*addr)); - - if (a->prefix_len <= 64) - *(uint64_t *)(addr->s6_addr + 8) = intf_id; - else - *(uint64_t *)(addr->s6_addr + 8) |= intf_id & htobe64((1 << (128 - a->prefix_len)) - 1); -} - static void fill_env(char **env, char *mem, struct pppd_compat_pd *pd) { struct ap_session *ses = pd->ses; @@ -628,7 +618,7 @@ static void fill_env(char **env, char *mem, struct pppd_compat_pd *pd) char ip6_buf[INET6_ADDRSTRLEN]; struct in6_addr addr; - build_addr(a, ses->ipv6->peer_intf_id, &addr); + build_ip6_addr(a, ses->ipv6->peer_intf_id, &addr); env[n] = mem; write_sz = snprintf(mem, mem_sz, "IPV6_PREFIX=%s/%i", |