diff options
| author | Vladislav Grishenko <themiron@mail.ru> | 2020-01-11 01:57:14 +0500 |
|---|---|---|
| committer | Vladislav Grishenko <themiron@mail.ru> | 2020-01-11 01:57:14 +0500 |
| commit | f532c72d0cb33b16b9794d83a46969538bdf2596 (patch) | |
| tree | bcfab735d95546e9992aafb3303e360893a9a140 /accel-pppd/extra | |
| parent | 70952034ecaf0ecb732052d6837f7a4c084ba7bc (diff) | |
| download | accel-ppp-f532c72d0cb33b16b9794d83a46969538bdf2596.tar.gz accel-ppp-f532c72d0cb33b16b9794d83a46969538bdf2596.zip | |
ipv6pool: add per-proto ipv6-pool and ipv6-pool-delegate options
also, disable ipv6 pools via chap-secrets, need to find another
syntax for it, may be with comments.
Diffstat (limited to 'accel-pppd/extra')
| -rw-r--r-- | accel-pppd/extra/chap-secrets.c | 8 | ||||
| -rw-r--r-- | accel-pppd/extra/ipv6pool.c | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/accel-pppd/extra/chap-secrets.c b/accel-pppd/extra/chap-secrets.c index 2d8593c9..0fadc9cb 100644 --- a/accel-pppd/extra/chap-secrets.c +++ b/accel-pppd/extra/chap-secrets.c @@ -313,12 +313,14 @@ static struct ipv4db_item_t *get_ip(struct ap_session *ses) if (ses->ipv4_pool_name) _free(ses->ipv4_pool_name); ses->ipv4_pool_name = _strdup(pd->pool); +/* TODO: wrong to use same pool name, but there's no other syntax if (ses->ipv6_pool_name) _free(ses->ipv6_pool_name); ses->ipv6_pool_name = _strdup(pd->pool); - if (ses->ipv6_dppool_name) - _free(ses->ipv6_dppool_name); - ses->ipv6_dppool_name = _strdup(pd->pool); + if (ses->dpv6_pool_name) + _free(ses->dpv6_pool_name); + ses->dpv6_pool_name = _strdup(pd->pool); +*/ return NULL; } else if (!pd->ip.peer_addr) return NULL; diff --git a/accel-pppd/extra/ipv6pool.c b/accel-pppd/extra/ipv6pool.c index f00dbcfa..a2cf30df 100644 --- a/accel-pppd/extra/ipv6pool.c +++ b/accel-pppd/extra/ipv6pool.c @@ -302,7 +302,7 @@ static struct ipv6db_prefix_t *get_dp(struct ap_session *ses) struct ippool_t *pool; if (ses->ipv6_pool_name) - pool = find_pool(IPPOOL_PREFIX, ses->ipv6_dppool_name, 0); + pool = find_pool(IPPOOL_PREFIX, ses->dpv6_pool_name, 0); else pool = def_dppool; @@ -356,9 +356,9 @@ static void ev_radius_access_accept(struct ev_radius_t *ev) continue; if (conf_dppool_attr && conf_dppool_attr == attr->attr->id) { - if (ses->ipv6_dppool_name) - _free(ses->ipv6_dppool_name); - ses->ipv6_dppool_name = _strdup(attr->val.string); + if (ses->dpv6_pool_name) + _free(ses->dpv6_pool_name); + ses->dpv6_pool_name = _strdup(attr->val.string); } else if (conf_ippool_attr && conf_ippool_attr == attr->attr->id) { if (ses->ipv6_pool_name) |