diff --git a/scripts/adsbexchange-feed.sh b/scripts/adsbexchange-feed.sh index fef3b0a..64a300d 100755 --- a/scripts/adsbexchange-feed.sh +++ b/scripts/adsbexchange-feed.sh @@ -1,20 +1,23 @@ #!/bin/sh -trap "kill 0" SIGINT -trap "kill -2 0" SIGTERM +trap "kill 0" INT +trap "kill -2 0" TERM +INPUT_IP=$(echo $INPUT | cut -d: -f1) +INPUT_PORT=$(echo $INPUT | cut -d: -f2) +SOURCE="--net-connector $INPUT_IP,$INPUT_PORT,beast_in" while sleep 5 do if ping -q -c 2 -W 5 feed.adsbexchange.com >/dev/null 2>&1 then - echo Connected to feed.adsbexchange.com:$SERVERPORT + echo Connected to feed.adsbexchange.com:30005 /usr/local/share/feed-adsbx --net --net-only --quiet \ - --net-beast-reduce-interval 0.5 \ - $SOURCE $TARGET $NET_OPTIONS + --net-beast-reduce-interval $REDUCE_INTERVAL \ + $TARGET $NET_OPTIONS $SOURCE - #/usr/bin/socat -u TCP:$INPUT TCP:feed.adsbexchange.com:$SERVERPORT + #/usr/bin/socat -u TCP:$INPUT TCP:feed.adsbexchange.com:30005 echo Disconnected, reconnecting in 30 seconds! else diff --git a/setup.sh b/setup.sh index 0fb60c3..3b7dc04 100755 --- a/setup.sh +++ b/setup.sh @@ -285,6 +285,7 @@ fi tee /etc/default/adsbexchange > /dev/null <