v/xiringuito
1
0
Fork 0
mirror of https://github.com/ivanilves/xiringuito.git synced 2025-05-16 15:20:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Better failure balance ;)

Browse Source
This commit is contained in:
Ivan Ilves 2017-07-18 18:33:52 +02:00
parent f511f989d8
commit cb96f5a350
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/integration/cases/do_client_teardown.sh
View File

@ -9,7 +9,7 @@ DOWN_DELAY=2
ORIG_LINKS=$(get_client_links) ORIG_LINKS=$(get_client_links)
${XIRI_EXE} -X ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_LINKS=$(get_client_links) NEW_LINKS=$(get_client_links)

2
testing/integration/cases/do_server_teardown.sh
View File

@ -8,7 +8,7 @@ DOWN_DELAY=10
ORIG_LINKS=$(get_server_links) ORIG_LINKS=$(get_server_links)
${XIRI_EXE} -f 1 -X ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -f 2 -X ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_LINKS=$(get_server_links) NEW_LINKS=$(get_server_links)

4
testing/integration/cases/run_with_dns_propagation.sh
View File

@ -1,5 +1,5 @@
INIT_DELAY=20 INIT_DELAY=15
DOWN_DELAY=20 DOWN_DELAY=10
ORIG_RESOLV_CONF=$(cat /etc/resolv.conf) ORIG_RESOLV_CONF=$(cat /etc/resolv.conf)
warn "${ORIG_RESOLV_CONF}" warn "${ORIG_RESOLV_CONF}"

2
testing/integration/cases/run_with_route_discovery.sh
View File

@ -11,7 +11,7 @@ echo '#!/bin/sh' >${WD}/discover-routes
echo "echo ROUTE:${MOCKED_ROUTE}" >>${WD}/discover-routes echo "echo ROUTE:${MOCKED_ROUTE}" >>${WD}/discover-routes
chmod +x ${WD}/discover-routes chmod +x ${WD}/discover-routes
${XIRI_EXE} ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -f 1 ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!} XIRI_PID=${!}
set +e set +e
wait_for true ${INIT_DELAY} "ip route | grep ${MOCKED_ROUTE}" wait_for true ${INIT_DELAY} "ip route | grep ${MOCKED_ROUTE}"

6
testing/integration/cases/run_without_dns_propagation.sh
View File

@ -1,10 +1,10 @@
INIT_DELAY=20 INIT_DELAY=10
DOWN_DELAY=20 DOWN_DELAY=10
ORIG_RESOLV_CONF=$(cat /etc/resolv.conf) ORIG_RESOLV_CONF=$(cat /etc/resolv.conf)
warn "${ORIG_RESOLV_CONF}" warn "${ORIG_RESOLV_CONF}"
${XIRI_EXE} -X -D ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 & ${XIRI_EXE} -f 2 -X -D ${SSH_USER}@${REMOTE_IP} 10.245.245.245/32 &
XIRI_PID=${!}; sleep ${INIT_DELAY} XIRI_PID=${!}; sleep ${INIT_DELAY}
NEW_RESOLV_CONF=$(cat /etc/resolv.conf) NEW_RESOLV_CONF=$(cat /etc/resolv.conf)

2
testing/integration/cases/run_without_route_discovery.sh
View File

@ -8,7 +8,7 @@ if [[ -f ${WD}/discover-routes ]]; then
mv ${WD}/discover-routes /tmp/discover-routes.orig mv ${WD}/discover-routes /tmp/discover-routes.orig
fi fi
${XIRI_EXE} -f 3 -X ${SSH_USER}@${REMOTE_IP} & ${XIRI_EXE} -f 2 -X ${SSH_USER}@${REMOTE_IP} &
XIRI_PID=${!} XIRI_PID=${!}
wait_for true ${INIT_DELAY} pgrep -f -- "-w.*${SSH_USER}@${REMOTE_IP}" wait_for true ${INIT_DELAY} pgrep -f -- "-w.*${SSH_USER}@${REMOTE_IP}"

2
xiringuito
View File

@ -127,7 +127,7 @@ fi
declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE}) declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE})
declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}" declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}"
declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=3 ${SSH_PRIVATE_KEY_OPTS} ${SSH_EXTRA_OPTS}" declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=5 ${SSH_PRIVATE_KEY_OPTS} ${SSH_EXTRA_OPTS}"
if [[ ${KERNEL} == linux ]]; then if [[ ${KERNEL} == linux ]]; then
declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID} declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID}