KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ppp: allow auto-detecting and creation of ipv6 subinterface

Browse source 
this makes ipv6 with ppp a bit more comfortable

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 42854
This commit is contained in:
Steven Barth 2014-10-08 20:37:15 +00:00
parent ea0a01d7e2
commit c62b07b2ce
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/services/ppp/Makefile
View file

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
PKG_VERSION:=2.4.7
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

9
package/network/services/ppp/files/lib/netifd/ppp-up
View file

@ -19,3 +19,12 @@ proto_send_update "$PPP_IPPARAM"
[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
done
}
if [ -n "$IPV6IFACE" -a "$(ifstatus $IPV6IFACE | jsonfilter -e @.device)" != "$IFNAME" ]; then
json_init
json_add_string name "${PPP_IPPARAM}_dhcpv6"
json_add_string ifname "@$PPP_IPPARAM"
json_add_string proto "dhcpv6"
json_close_object
ubus call network add_dynamic "$(json_dump)"
fi

6
package/network/services/ppp/files/ppp.sh
View file

@ -16,7 +16,7 @@ ppp_generic_init_config() {
proto_config_add_string pppd_options
proto_config_add_string 'connect:file'
proto_config_add_string 'disconnect:file'
proto_config_add_boolean ipv6
proto_config_add_string ipv6
proto_config_add_boolean authfail
proto_config_add_int mtu
proto_config_add_string pppname
@ -28,9 +28,11 @@ ppp_generic_setup() {
json_get_vars ipv6 demand keepalive username password pppd_options pppname
if [ "$ipv6" = 0 ]; then
ipv6=""
else
elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
ipv6=1
proto_export "IPV6IFACE=${config}6"
fi
if [ "${demand:-0}" -gt 0 ]; then
demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
else