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/ipdb.c | |
| 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/ipdb.c')
| -rw-r--r-- | accel-pppd/ipdb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/accel-pppd/ipdb.c b/accel-pppd/ipdb.c index a7ef0a4..dd8c61c 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) |