Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13139 from aaronjg/openfortivpn/ppp-netifd-fix

Browse source 
openfortivpn: fix routes passed to netifd
This commit is contained in:
Rosen Penev 2020-08-25 02:11:17 -07:00 committed by GitHub
commit 395e9ff31f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/openfortivpn/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openfortivpn PKG_NAME:=openfortivpn
PKG_VERSION:=1.14.1 PKG_VERSION:=1.14.1
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/adrienverge/openfortivpn/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/adrienverge/openfortivpn/tar.gz/v$(PKG_VERSION)?
@ -60,6 +60,7 @@ define Package/openfortivpn/install
$(INSTALL_BIN) ./files/openfortivpn-wrapper $(1)/usr/sbin/ $(INSTALL_BIN) ./files/openfortivpn-wrapper $(1)/usr/sbin/
$(INSTALL_BIN) ./files/openfortivpn.sh $(1)/lib/netifd/proto/ $(INSTALL_BIN) ./files/openfortivpn.sh $(1)/lib/netifd/proto/
$(INSTALL_BIN) ./files/14-openforticlient $(1)/etc/hotplug.d/iface/ $(INSTALL_BIN) ./files/14-openforticlient $(1)/etc/hotplug.d/iface/
$(INSTALL_BIN) ./files/openfortivpn-ppp-up $(1)/lib/netifd/openfortivpn-ppp-up
endef endef
$(eval $(call BuildPackage,openfortivpn)) $(eval $(call BuildPackage,openfortivpn))

20
net/openfortivpn/files/openfortivpn-ppp-up Executable file
View file

@ -0,0 +1,20 @@
#!/bin/sh
PPP_IPPARAM="$6"
. /lib/netifd/netifd-proto.sh
proto_init_update "$IFNAME" 1 1
proto_set_keep 1
[ -n "$PPP_IPPARAM" ] && {
[ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32 "" "$IPREMOTE"
[ -n "$IPREMOTE" ] && proto_add_ipv4_route 0.0.0.0 0 "" "$IPLOCAL"
[ -n "$DNS1" ] && proto_add_dns_server "$DNS1"
[ -n "$DNS2" -a "$DNS1" != "$DNS2" ] && proto_add_dns_server "$DNS2"
}
proto_send_update "$PPP_IPPARAM"
[ -d /etc/ppp/ip-up.d ] && {
for SCRIPT in /etc/ppp/ip-up.d/*
do
[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
done
}

2
net/openfortivpn/files/openfortivpn.sh
View file

@ -125,7 +125,7 @@ receive-all
nodetach nodetach
ipparam $config ipparam $config
lcp-max-configure 40 lcp-max-configure 40
ip-up-script /lib/netifd/ppp-up ip-up-script /lib/netifd/openfortivpn-ppp-up
ip-down-script /lib/netifd/ppp-down ip-down-script /lib/netifd/ppp-down
mru 1354" > $callfile mru 1354" > $callfile
append_args "--pppd-call=openfortivpn/$config" append_args "--pppd-call=openfortivpn/$config"