hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppp: allow to set PPP interface name via config 

allows to set PPP interface name manually via new
network interface option pppname.
If not set, default naming will be used (e.g. pppoe-eth0)

Signed-off-by: Ulrich Weber <uw@ocedo.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40933 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-06-02 12:44:36 +00:00
parent e12da3b221
commit b9907f1565
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,12 +19,13 @@ ppp_generic_init_config() {
proto_config_add_boolean ipv6 proto_config_add_boolean ipv6
proto_config_add_boolean authfail proto_config_add_boolean authfail
proto_config_add_int mtu proto_config_add_int mtu
proto_config_add_string pppname
} }
ppp_generic_setup() { ppp_generic_setup() {
local config="$1"; shift local config="$1"; shift
json_get_vars ipv6 demand keepalive username password pppd_options json_get_vars ipv6 demand keepalive username password pppd_options pppname
[ "$ipv6" = 1 ] || ipv6="" [ "$ipv6" = 1 ] || ipv6=""
if [ "${demand:-0}" -gt 0 ]; then if [ "${demand:-0}" -gt 0 ]; then
demand="precompiled-active-filter /etc/ppp/filter demand idle $demand" demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
@ -33,6 +34,7 @@ ppp_generic_setup() {
fi fi
[ -n "$mtu" ] || json_get_var mtu mtu [ -n "$mtu" ] || json_get_var mtu mtu
[ -n "$pppname" ] || pppname="${proto:-ppp}-$config"
local interval="${keepalive##*[, ]}" local interval="${keepalive##*[, ]}"
[ "$interval" != "$keepalive" ] || interval=5 [ "$interval" != "$keepalive" ] || interval=5
@ -41,7 +43,7 @@ ppp_generic_setup() {
proto_run_command "$config" /usr/sbin/pppd \ proto_run_command "$config" /usr/sbin/pppd \
nodetach ipparam "$config" \ nodetach ipparam "$config" \
ifname "${proto:-ppp}-$config" \ ifname "$pppname" \
${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \ ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
${ipv6:++ipv6} \ ${ipv6:++ipv6} \
nodefaultroute \ nodefaultroute \