diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index db18291..f374bfe 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -19,7 +19,7 @@ INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev KERNEL_VERSION="4.19.104" KERNEL_PACKAGE_VERSION="1.7+b864616" KERNEL_RELEASE="${KERNEL_VERSION}-mptcp_${KERNEL_PACKAGE_VERSION}" -GLORYTUN_UDP_VERSION="a9408e799ddbb74b5476fba70a495770322cd327" +GLORYTUN_UDP_VERSION="b9aaab661fb879e891d34a91b5d2e78088fd9d9d" #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2" MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7" OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4" @@ -902,7 +902,7 @@ else echo 'You need OpenMPTCProuter >= 0.30' echo '====================================================================================' echo 'Restarting systemd daemon...' - systemctl -q restart daemon-reload + systemctl -q daemon-reload echo 'done' echo 'Restarting systemd network...' systemctl -q restart systemd-networkd diff --git a/glorytun-tcp-post.sh b/glorytun-tcp-post.sh index f494e11..4df0358 100644 --- a/glorytun-tcp-post.sh +++ b/glorytun-tcp-post.sh @@ -4,5 +4,5 @@ INTF=gt-${DEV} [ -z "$LOCALIP" ] && LOCALIP="10.255.255.1" [ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.255.3" -ip link set dev ${INTF} up -ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} +ip link set dev ${INTF} up 2>&1 >/dev/null +ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null diff --git a/glorytun-udp-post.sh b/glorytun-udp-post.sh index 73a3853..4d8acad 100644 --- a/glorytun-udp-post.sh +++ b/glorytun-udp-post.sh @@ -4,5 +4,5 @@ INTF=gt-udp-${DEV} [ -z "$LOCALIP" ] && LOCALIP="10.255.254.1" [ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.254.3" -ip link set dev ${INTF} up -ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} +ip link set dev ${INTF} up 2>&1 >/dev/null +ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null diff --git a/omr-service b/omr-service index 90d7550..5f5cb98 100755 --- a/omr-service +++ b/omr-service @@ -14,11 +14,22 @@ _multipath() { } _glorytun_udp() { - [ -z "$(glorytun show dev gt-udp-tun0 2>/dev/null | grep server)" ] && systemctl -q restart glorytun-udp@* + [ -z "$(glorytun show dev gt-udp-tun0 2>/dev/null | grep server)" ] && { + logger -t "OMR-Service" "Restart Glorytun-UDP" + systemctl -q restart glorytun-udp@* + } +} + +_omr_api() { + [ -z "$(curl -s -k -m 1 https://127.0.0.1:65500/)" ] && { + logger -t "OMR-Service" "Restart OMR-Admin" + systemctl -q restart omr-admin + } } while true; do _glorytun_udp _multipath + _omr_api sleep 10 done