diff options
| author | Michael Furmur <m.furmur@gmail.com> | 2016-08-30 13:45:24 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2016-11-12 10:35:48 +0300 |
| commit | aaedc70f5ef82bbc8c711dcd5f1e5913bc2118d0 (patch) | |
| tree | 328775e320a71cb9246c74aea357193e71ed7dac /accel-pppd/ctrl/ipoe | |
| parent | 938d3e852f8ef51f9f284e13e3a79c2f501f6d74 (diff) | |
| download | accel-ppp-xebd-aaedc70f5ef82bbc8c711dcd5f1e5913bc2118d0.tar.gz accel-ppp-xebd-aaedc70f5ef82bbc8c711dcd5f1e5913bc2118d0.zip | |
ipoe: add support for peer-to-peer client interfaces
Diffstat (limited to 'accel-pppd/ctrl/ipoe')
| -rw-r--r-- | accel-pppd/ctrl/ipoe/ipoe.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c index f864d2f..d38e73d 100644 --- a/accel-pppd/ctrl/ipoe/ipoe.c +++ b/accel-pppd/ctrl/ipoe/ipoe.c @@ -156,6 +156,7 @@ static int conf_proto; static LIST_HEAD(conf_offer_delay); static const char *conf_vlan_name; static int conf_ip_unnumbered; +static int conf_ip_unnumbered_peer_mode; static int conf_check_mac_change; static int conf_soft_terminate; static int conf_calling_sid = SID_MAC; @@ -888,11 +889,15 @@ static void __ipoe_session_activate(struct ipoe_session *ses) if (ses->ifindex == -1) { if (serv->opt_ifcfg) - ipaddr_add(serv->ifindex, ses->router, conf_ip_unnumbered ? 32 : ses->mask); + if(conf_ip_unnumbered && conf_ip_unnumbered_peer_mode) { + ipaddr_add_peer(serv->ifindex, ses->router, 32, ses->yiaddr); + } else { + ipaddr_add(serv->ifindex, ses->router, conf_ip_unnumbered ? 32 : ses->mask); + } else if (!conf_ip_unnumbered) iproute_add(serv->ifindex, ses->router, ses->yiaddr, 0, conf_proto, ses->mask); - if (conf_ip_unnumbered) + if (conf_ip_unnumbered && !conf_ip_unnumbered_peer_mode) iproute_add(serv->ifindex, serv->opt_src ?: ses->router, ses->yiaddr, 0, conf_proto, 32); } else ses->ctrl.dont_ifcfg = 0; @@ -3478,6 +3483,12 @@ static void load_config(void) else conf_ip_unnumbered = 1; + opt = conf_get_opt("ipoe", "ip-unnumbered-peer-mode"); + if (opt) + conf_ip_unnumbered_peer_mode = atoi(opt); + else + conf_ip_unnumbered_peer_mode = 0; + opt = conf_get_opt("ipoe", "idle-timeout"); if (opt) conf_idle_timeout = atoi(opt); |