From 933595c17e2a665315a9742ccd2ddeea6dafb78f Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Fri, 12 Jan 2018 22:24:28 +0500 Subject: ipv6: consolidate and fix interface-id address generation for non-/128 --- accel-pppd/ipdb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'accel-pppd/ipdb.c') diff --git a/accel-pppd/ipdb.c b/accel-pppd/ipdb.c index a7ef0a44..dd8c61c9 100644 --- a/accel-pppd/ipdb.c +++ b/accel-pppd/ipdb.c @@ -77,10 +77,14 @@ void __export build_ip6_addr(struct ipv6db_addr_t *a, uint64_t intf_id, struct i { memcpy(addr, &a->addr, sizeof(*addr)); + if (a->prefix_len == 128) + return; + if (a->prefix_len <= 64) *(uint64_t *)(addr->s6_addr + 8) = intf_id; else - *(uint64_t *)(addr->s6_addr + 8) |= intf_id & ((1 << (128 - a->prefix_len)) - 1); + *(uint64_t *)(addr->s6_addr + 8) |= intf_id & htobe64((1 << (128 - a->prefix_len)) - 1); + } void __export ipdb_register(struct ipdb_t *ipdb) -- cgit v1.2.3