From 129e6a9ae4bd4eecdeab5578fdba255de5dac538 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 23 Jul 2020 17:01:34 +0200 Subject: [PATCH] Update Linux Kernel and add gre-tunnels creation --- debian9-x86_64.sh | 4 ++-- omr-service | 17 +++++++++++++++++ openmptcprouter-shorewall.tar.gz | Bin 4062 -> 4075 bytes shadowsocks.conf | 1 + shorewall4/interfaces | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index 2f24620..0df040c 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -19,8 +19,8 @@ DSVPN=${DSVPN:-yes} SOURCES=${SOURCES:-yes} NOINTERNET=${NOINTERNET:-no} INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev )(\S+)' | tr -d "\n")} -KERNEL_VERSION="5.4.42" -KERNEL_PACKAGE_VERSION="1.9+1efcfb3" +KERNEL_VERSION="5.4.52" +KERNEL_PACKAGE_VERSION="1.10+206826e" KERNEL_RELEASE="${KERNEL_VERSION}-mptcp_${KERNEL_PACKAGE_VERSION}" GLORYTUN_UDP_VERSION="3622f928caf03709c4031a34feec85c623bc5281" #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2" diff --git a/omr-service b/omr-service index a4cc162..ecb1568 100755 --- a/omr-service +++ b/omr-service @@ -50,11 +50,28 @@ _lan_route() { done } +_gre_tunnels() { + . "$(readlink -f "/etc/shorewall/params.vpn")" + for intf in /etc/openmptcprouter-vps-admin/intf/*; do + . "$(readlink -f "$intf")" + iface="$(basename $intf)" + if [ "$(ip tunnel show $iface 2>/dev/null | awk '{print $4}')" != "$OMR_ADDR" ]; then + ip tunnel del $iface 2>&1 >/dev/null + ip tunnel add $iface mode gre local $INTFADDR remote $OMR_ADDR + ip link set $iface up + ip addr add $LOCALIP dev $iface + ip route add $NETWORK dev $iface 2>&1 >/dev/null + fi + done +} + + while true; do _glorytun_udp _glorytun_tcp _multipath _omr_api _lan_route + _gre_tunnels sleep 10 done diff --git a/openmptcprouter-shorewall.tar.gz b/openmptcprouter-shorewall.tar.gz index 1fa23873d68587765bc932640adaf20d277ce300..69fe33270e80b4aa2c3634eba31cbd64d03da7e8 100644 GIT binary patch delta 4003 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