EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ppp: Split the ppp-up for the IPv6 part

Browse Source 
Signed-off-by: Pierre Lebleu <pme.lebleu@gmail.com>
This commit is contained in:
Pierre Lebleu 2016-10-27 13:38:29 +02:00 committed by Felix Fietkau
parent 1a63b81965
commit 898857f77a
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/network/services/ppp/Makefile
View File

@ -206,6 +206,7 @@ define Package/ppp/install
$(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/ppp.sh $(1)/lib/netifd/proto/
$(INSTALL_BIN) ./files/lib/netifd/ppp-up $(1)/lib/netifd/
$(INSTALL_BIN) ./files/lib/netifd/ppp6-up $(1)/lib/netifd/
$(INSTALL_BIN) ./files/lib/netifd/ppp-down $(1)/lib/netifd/
endef
Package/ppp-multilink/install=$(Package/ppp/install)

11
package/network/services/ppp/files/lib/netifd/ppp-up
View File

@ -7,7 +7,6 @@ proto_set_keep 1
[ -n "$PPP_IPPARAM" ] && {
[ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32 "" "${IPREMOTE:-2.2.2.2}"
[ -n "$IPREMOTE" ] && proto_add_ipv4_route 0.0.0.0 0 "$IPREMOTE"
[ -n "$LLLOCAL" ] && proto_add_ipv6_address "$LLLOCAL" 128
[ -n "$DNS1" ] && proto_add_dns_server "$DNS1"
[ -n "$DNS2" -a "$DNS1" != "$DNS2" ] && proto_add_dns_server "$DNS2"
}
@ -19,13 +18,3 @@ proto_send_update "$PPP_IPPARAM"
[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
done
}
if [ -n "$AUTOIPV6" ]; then
json_init
json_add_string name "${PPP_IPPARAM}_6"
json_add_string ifname "@$PPP_IPPARAM"
json_add_string proto "dhcpv6"
[ -n "$EXTENDPREFIX" ] && json_add_string extendprefix 1
json_close_object
ubus call network add_dynamic "$(json_dump)"
fi

27
package/network/services/ppp/files/lib/netifd/ppp6-up Normal file
View File

@ -0,0 +1,27 @@
#!/bin/sh
PPP_IPPARAM="$6"
. /lib/netifd/netifd-proto.sh
proto_init_update "$IFNAME" 1 1
proto_set_keep 1
[ -n "$PPP_IPPARAM" ] && {
[ -n "$LLLOCAL" ] && proto_add_ipv6_address "$LLLOCAL" 128
}
proto_send_update "$PPP_IPPARAM"
[ -d /etc/ppp/ip-up.d ] && {
for SCRIPT in /etc/ppp/ip-up.d/*
do
[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
done
}
if [ -n "$AUTOIPV6" ]; then
json_init
json_add_string name "${PPP_IPPARAM}_6"
json_add_string ifname "@$PPP_IPPARAM"
json_add_string proto "dhcpv6"
[ -n "$EXTENDPREFIX" ] && json_add_string extendprefix 1
json_close_object
ubus call network add_dynamic "$(json_dump)"
fi

2
package/network/services/ppp/files/ppp.sh
View File

@ -144,7 +144,7 @@ ppp_generic_setup() {
${connect:+connect "$connect"} \
${disconnect:+disconnect "$disconnect"} \
ip-up-script /lib/netifd/ppp-up \
ipv6-up-script /lib/netifd/ppp-up \
ipv6-up-script /lib/netifd/ppp6-up \
ip-down-script /lib/netifd/ppp-down \
ipv6-down-script /lib/netifd/ppp-down \
${mtu:+mtu $mtu mru $mtu} \