diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2017-03-27 14:53:53 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2017-03-27 15:03:31 +0300 |
| commit | 140d77cea4af721cc85bdefbc3fc244d80cb08ec (patch) | |
| tree | 11f72355857b3f2743fe455f2fc42f2ddafb2596 | |
| parent | 1f2e94f0e2960d63a4d6fda9b9511a44f7bad0c6 (diff) | |
| download | accel-ppp-140d77cea4af721cc85bdefbc3fc244d80cb08ec.tar.gz accel-ppp-140d77cea4af721cc85bdefbc3fc244d80cb08ec.zip | |
ipoe: fixed prefix calculation from ipaddr
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index 49cf3924..1be958ed 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -1962,6 +1962,18 @@ void ipoe_recv_up(int ifindex, struct ethhdr *eth, struct iphdr *iph, struct _ar } #ifdef RADIUS +static int ipaddr_to_prefix(in_addr_t ipaddr) +{ + if (ipaddr == 0) + return 0; + +#if __BYTE_ORDER == __LITTLE_ENDIAN + return 33 - ffs(htonl(ipaddr)); +#else + return 33 - ffs(ipaddr); +#endif +} + static void ev_radius_access_accept(struct ev_radius_t *ev) { struct ipoe_session *ses = container_of(ev->ses, typeof(*ses), ses); @@ -1978,18 +1990,10 @@ static void ev_radius_access_accept(struct ev_radius_t *ev) ses->router = attr->val.ipaddr; else if (attr->attr->id == conf_attr_dhcp_mask) { if (attr->attr->type == ATTR_TYPE_INTEGER) { - if (attr->val.integer > 0 && attr->val.integer < 31) + if (attr->val.integer > 0 && attr->val.integer <= 32) ses->mask = attr->val.integer; - } else if (attr->attr->type == ATTR_TYPE_IPADDR) { - if (attr->val.ipaddr == 0xffffffff) - ses->mask = 32; - else -#if __BYTE_ORDER == __LITTLE_ENDIAN - ses->mask = 31 - ffs(htonl(attr->val.ipaddr)); -#else - ses->mask = 31 - ffs(attr->val.ipaddr); -#endif - } + } else if (attr->attr->type == ATTR_TYPE_IPADDR) + ses->mask = ipaddr_to_prefix(attr->val.ipaddr); } else if (attr->attr->id == conf_attr_l4_redirect) { if (attr->attr->type == ATTR_TYPE_STRING) { if (attr->len && attr->val.string[0] != '0') |