mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ppp: remove old network scripts

Browse Source 
SVN-Revision: 31984
This commit is contained in:
Felix Fietkau 2012-05-29 12:59:19 +00:00
parent d3efcab813
commit b971ea720c
9 changed files with 6 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package/ppp/Makefile
View File

@ -19,7 +19,6 @@ PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libpcap
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_netifd
PKG_INSTALL:=1
@ -167,31 +166,8 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/include/pppd $(1)/usr/include/
endef
ifneq ($(CONFIG_PACKAGE_netifd),)
define Package/ppp/script_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/ppp-down $(1)/lib/netifd/
endef
else
define Package/ppp/script_install
$(INSTALL_DIR) $(1)/lib/network
$(INSTALL_BIN) ./files.old/ppp.sh $(1)/lib/network/
$(INSTALL_BIN) ./files.old/etc/ppp/ip-up $(1)/etc/ppp/
$(INSTALL_DIR) $(1)/etc/ppp/ip-up.d
$(INSTALL_BIN) ./files.old/etc/ppp/ip-down $(1)/etc/ppp/
$(INSTALL_DIR) $(1)/etc/ppp/ip-down.d
$(INSTALL_BIN) ./files.old/etc/ppp/ipv6-up $(1)/etc/ppp/
$(INSTALL_BIN) ./files.old/etc/ppp/ipv6-down $(1)/etc/ppp/
$(INSTALL_DIR) $(1)/lib/network
$(INSTALL_BIN) ./files.old/pppoe.sh $(1)/lib/network/
$(INSTALL_DIR) $(1)/lib/network
$(INSTALL_BIN) ./files.old/pppoa.sh $(1)/lib/network/
$(INSTALL_DIR) $(1)/etc/hotplug.d/atm
$(INSTALL_DATA) ./files.old/etc/hotplug.d/atm/20-atm-modem $(1)/etc/hotplug.d/atm/
endef
endif
define Package/ppp/script_install
endef
define Package/ppp/install
$(INSTALL_DIR) $(1)/usr/lib/pppd/$(PKG_VERSION)
@ -202,7 +178,10 @@ define Package/ppp/install
$(INSTALL_DATA) ./files/etc/ppp/filter $(1)/etc/ppp/
$(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/
ln -sf /tmp/resolv.conf.ppp $(1)/etc/ppp/resolv.conf
$(Package/ppp/script_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/ppp-down $(1)/lib/netifd/
endef
Package/ppp-multilink/install=$(Package/ppp/install)

28
package/ppp/files.old/etc/hotplug.d/atm/20-atm-modem
View File

@ -1,28 +0,0 @@
#!/bin/sh
if [ "$ACTION" = "add" ]; then
include /lib/network
scan_interfaces
local found=0
local ifc
for ifc in $interfaces; do
local up
config_get_bool up "$ifc" up 0
local auto
config_get_bool auto "$ifc" auto 1
local proto
config_get proto "$ifc" proto
if [ "$proto" = "pppoa" ] && [ "$up" != 1 ] && [ "$auto" = 1 ]; then
found=1
( sleep 1; ifup "$ifc" ) &
fi
done
if [ "$found" != 1 ]; then
logger "Found no matching interface for DSL device $DEVICENAME"
fi
fi

25
package/ppp/files.old/etc/ppp/ip-down
View File

@ -1,25 +0,0 @@
#!/bin/sh
. /etc/functions.sh
PPP_IFACE="$1"
PPP_TTY="$2"
PPP_SPEED="$3"
PPP_LOCAL="$4"
PPP_REMOTE="$5"
PPP_IPPARAM="$(echo $6 | sed 's/\./_/g')"
export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
[ -z "$PPP_IPPARAM" ] || {
case "$PPP_IFACE" in
# only handle uci managed interfaces here, others are done by generic hotplug
3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*|l2tp-*)
env -i ACTION="ifdown" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
uci_revert_state network "$PPP_IPPARAM"
;;
esac
}
[ -d /etc/ppp/ip-down.d ] && {
for SCRIPT in /etc/ppp/ip-down.d/*
do
[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
done
}

37
package/ppp/files.old/etc/ppp/ip-up
View File

@ -1,37 +0,0 @@
#!/bin/sh
. /etc/functions.sh
. /lib/network/config.sh
PPP_IFACE="$1"
PPP_TTY="$2"
PPP_SPEED="$3"
PPP_LOCAL="$4"
PPP_REMOTE="$5"
PPP_IPPARAM="$(echo $6 | sed 's/\./_/g')"
export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
[ -z "$PPP_IPPARAM" -o -z "$PPP_LOCAL" ] || {
uci_set_state network "$PPP_IPPARAM" ifname "$PPP_IFACE"
uci_set_state network "$PPP_IPPARAM" ipaddr "$PPP_LOCAL"
uci_set_state network "$PPP_IPPARAM" gateway "$PPP_REMOTE"
local dns="$DNS1${DNS2:+ $DNS2}"
[ -n "$dns" ] && add_dns "$PPP_IPPARAM" $dns
}
[ -z "$PPP_IPPARAM" ] || {
case "$PPP_IFACE" in
# only handle uci managed interfaces here, others are done by generic hotplug
3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*|l2tp-*)
env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
;;
esac
}
[ -d /etc/ppp/ip-up.d ] && {
for SCRIPT in /etc/ppp/ip-up.d/*
do
[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
done
}

16
package/ppp/files.old/etc/ppp/ipv6-down
View File

@ -1,16 +0,0 @@
#!/bin/sh
gw=$5
dev=$1
cfg=$6
. /etc/functions.sh # common functions
include /lib/network # include /lib/network/*.sh
scan_interfaces # read and parse the network config
config_get_bool defaultroute "$cfg" defaultroute 1
if [ ${defaultroute} -eq 1 ]
then
route -A inet6 del default gw ${gw} dev ${dev}
fi

16
package/ppp/files.old/etc/ppp/ipv6-up
View File

@ -1,16 +0,0 @@
#!/bin/sh
gw=$5
dev=$1
cfg=$6
. /etc/functions.sh # common functions
include /lib/network # include /lib/network/*.sh
scan_interfaces # read and parse the network config
config_get_bool defaultroute "$cfg" defaultroute 1
if [ ${defaultroute} -eq 1 ]
then
route -A inet6 add default gw ${gw} dev ${dev}
fi

145
package/ppp/files.old/ppp.sh
View File

@ -1,145 +0,0 @@
stop_interface_ppp() {
local cfg="$1"
local proto
config_get proto "$cfg" proto
local link="$proto-$cfg"
SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
service_stop /usr/sbin/pppd
remove_dns "$cfg"
local lock="/var/lock/ppp-$link"
[ -f "$lock" ] && lock -u "$lock"
}
start_pppd() {
local cfg="$1"; shift
# Workaround for PPPoE service and AC name options,
# filter out the nic-* argument and append it as last option
local nic=""
case "$1" in
nic-*) nic="$1"; shift ;;
esac
local proto
config_get proto "$cfg" proto
# unique link identifier
local link="${proto:-ppp}-$cfg"
# make sure only one pppd process is started
lock "/var/lock/ppp-${link}"
SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
service_check /usr/sbin/pppd && {
lock -u "/var/lock/ppp-${link}"
return 0
}
# Workaround: sometimes hotplug2 doesn't deliver the hotplug event for creating
# /dev/ppp fast enough to be used here
[ -e /dev/ppp ] || mknod /dev/ppp c 108 0
local device
config_get device "$cfg" device
local username
config_get username "$cfg" username
local password
config_get password "$cfg" password
local keepalive
config_get keepalive "$cfg" keepalive
local connect
config_get connect "$cfg" connect
local disconnect
config_get disconnect "$cfg" disconnect
local pppd_options
config_get pppd_options "$cfg" pppd_options
local defaultroute
config_get_bool defaultroute "$cfg" defaultroute 1
[ "$defaultroute" -eq 1 ] && \
defaultroute="defaultroute replacedefaultroute" || defaultroute="nodefaultroute"
local interval="${keepalive##*[, ]}"
[ "$interval" != "$keepalive" ] || interval=5
local dns
config_get dns "$config" dns
local has_dns=0
local peer_default=1
[ -n "$dns" ] && {
has_dns=1
peer_default=0
}
local peerdns
config_get_bool peerdns "$cfg" peerdns $peer_default
[ "$peerdns" -eq 1 ] && {
peerdns="usepeerdns"
} || {
peerdns=""
add_dns "$cfg" $dns
}
local demand
config_get demand "$cfg" demand 0
local demandargs
[ "$demand" -gt 0 ] && {
demandargs="precompiled-active-filter /etc/ppp/filter demand idle $demand"
[ "$has_dns" -eq 0 ] && add_dns "$cfg" 1.1.1.1
} || {
demandargs="persist"
}
local ipv6
config_get_bool ipv6 "$cfg" ipv6 0
[ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
SERVICE_DAEMONIZE=1 \
SERVICE_WRITE_PID=1 \
SERVICE_PID_FILE="/var/run/ppp-$link.pid" \
service_start /usr/sbin/pppd "$@" \
${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
$demandargs \
$peerdns \
$defaultroute \
${username:+user "$username" password "$password"} \
ipparam "$cfg" \
ifname "$link" \
${connect:+connect "$connect"} \
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
${pppd_options} \
nodetach \
${nic}
lock -u "/var/lock/ppp-${link}"
}
setup_interface_ppp() {
local iface="$1"
local config="$2"
local device
config_get device "$config" device
local mtu
config_get mtu "$config" mtu
mtu=${mtu:-1492}
start_pppd "$config" \
mtu $mtu mru $mtu \
"$device"
}

39
package/ppp/files.old/pppoa.sh
View File

@ -1,39 +0,0 @@
scan_pppoa() {
config_set "$1" device "pppoa-$1"
}
stop_interface_pppoa() {
stop_interface_ppp "$1"
}
setup_interface_pppoa() {
local config="$2"
local atmdev
config_get atmdev "$config" atmdev
local vpi
config_get vpi "$config" vpi
local vci
config_get vci "$config" vci
for module in slhc ppp_generic pppoatm; do
/sbin/insmod $module 2>&- >&-
done
local encaps
config_get encaps "$config" encaps
case "$encaps" in
1|vc) encaps="vc-encaps" ;;
*) encaps="llc-encaps" ;;
esac
local mtu
config_get mtu "$config" mtu
start_pppd "$config" \
plugin pppoatm.so ${atmdev:+$atmdev.}${vpi:-8}.${vci:-35} \
${encaps} ${mtu:+mtu $mtu mru $mtu}
}

30
package/ppp/files.old/pppoe.sh
View File

@ -1,30 +0,0 @@
stop_interface_pppoe() {
stop_interface_ppp "$1"
}
setup_interface_pppoe() {
local iface="$1"
local config="$2"
for module in slhc ppp_generic pppox pppoe; do
/sbin/insmod $module 2>&- >&-
done
local mtu
config_get mtu "$config" mtu 1492
local ac
config_get ac "$config" ac
local service
config_get service "$config" service
# NB: the first nic-* argument will be moved to the
# end of the argument list by start_pppd()
start_pppd "$config" \
"nic-$iface" \
plugin rp-pppoe.so \
${ac:+rp_pppoe_ac "$ac"} \
${service:+rp_pppoe_service "$service"} \
mtu $mtu mru $mtu
}