From c39cc1033c8abad686b7354c5cf3f5ec49d56ec4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 15 Jun 2024 00:06:52 +0000
Subject: [PATCH 1/8] build(deps): bump actions/checkout from 4.1.6 to 4.1.7

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.6...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy.yml              | 2 +-
 .github/workflows/on_pr.yml               | 2 +-
 .github/workflows/pre-commit-updates.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 021b075..0e473be 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -58,7 +58,7 @@ jobs:
     name: Run hadolint against docker files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Pull hadolint/hadolint:latest Image
         run: docker pull hadolint/hadolint:latest
       - name: Run hadolint against Dockerfiles
diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml
index 693bf12..1515545 100644
--- a/.github/workflows/on_pr.yml
+++ b/.github/workflows/on_pr.yml
@@ -34,7 +34,7 @@ jobs:
     name: Run hadolint against docker files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Pull hadolint/hadolint:latest Image
         run: docker pull hadolint/hadolint:latest
       - name: Run hadolint against Dockerfiles
diff --git a/.github/workflows/pre-commit-updates.yaml b/.github/workflows/pre-commit-updates.yaml
index c92a984..bfc1ca8 100644
--- a/.github/workflows/pre-commit-updates.yaml
+++ b/.github/workflows/pre-commit-updates.yaml
@@ -9,7 +9,7 @@ jobs:
   update:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
       - uses: vrslev/pre-commit-autoupdate@v1.0.0

From 81c09c61cde865a266a2de87d3f65c27994d2353 Mon Sep 17 00:00:00 2001
From: fredclausen <43556888+fredclausen@users.noreply.github.com>
Date: Sun, 16 Jun 2024 01:38:47 +0000
Subject: [PATCH 2/8] chore(deps): Update pre-commit hooks

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 023ed99..8bb5c61 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -41,7 +41,7 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.28.4
+    rev: 0.28.5
     hooks:
       - id: check-github-actions
       - id: check-github-workflows
@@ -59,7 +59,7 @@ repos:
       - id: black
 
   - repo: https://github.com/pycqa/flake8
-    rev: "7.0.0" # pick a git hash / tag to point to
+    rev: "7.1.0" # pick a git hash / tag to point to
     hooks:
       - id: flake8
         args: ["--extend-ignore=W503,W504,E501"]

From 1e6f694d808dea0674166827c847dce191f4f840 Mon Sep 17 00:00:00 2001
From: kx1t <15090643+kx1t@users.noreply.github.com>
Date: Sun, 16 Jun 2024 07:43:21 -0400
Subject: [PATCH 3/8] Add script to register for AussieADSB feed (#103)

* add AussieADSB registration script

* update readme

* make independent of container run

* update

* update readme

* minor update

* fix typo

* Update aussieadsb.sh

* Update aussieadsb.sh

* Update aussieadsb.sh

* Add netcat-traditional and net-tools to install check

* Update README.md

* Update aussieadsb.sh

* Update aussieadsb.sh
---
 README.md     |   7 ++
 aussieadsb.sh | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 292 insertions(+)
 create mode 100755 aussieadsb.sh

diff --git a/README.md b/README.md
index 0a61549..e00d45b 100644
--- a/README.md
+++ b/README.md
@@ -343,9 +343,16 @@ There are several aggregators, both non-profit and commercial, that can directly
 | ADSB Exchange   | C                              | Large aggregator owned by JetNet                          | adsb:`feed1.adsbexchange.com` port `30004`<br/>mlat: `feed.adsbexchange.com` port `31090`  |
 | RadarPlane      | N                              | Run by a few aviation enthusiasts in Canada and Portugal            | adsb: `feed.radarplane.com` port `30001`<br/>mlat: `feed.radarplane.com` port `31090`      |
 | Fly Italy ADSB  | N                              | Run by a few aviation enthusiasts in Italy                    | adsb: `dati.flyitalyadsb.com` port `4905`<br/>mlat: `dati.flyitalyadsb.com` port `30100`   |
+| AussieADSB | C | Small semi-commercial aggregator focused uniquely on Australia/Oceania. See <https://aussieadsb.com>. See below on how to configure a feed to them | adsb: `aussieadsb.com` port (varies)<br/>mlat: `aussieadsb.com` port `30000` |
 
 When feeding AdsbExchange, Ultrafeeder will send statistics to adsbexchange.com by default. See the description of the `ADSBX_STATS` parameter on how to disable this.
 
+To feed AussieADSB (Australia/Oceania only!), execute this command on your host and follow the instructions. You can also use this command to de-register your feeder, or to see its status:
+
+```bash
+bash <(wget -qO - https://raw.githubusercontent.com/sdr-enthusiasts/docker-adsb-ultrafeeder/dev/aussieadsb.sh)
+```
+
 ##### Alternate Configuration Method with `READSB_NET_CONNECTOR`
 
 Instead of (or in addition to) using `BEASTHOST`, you can also define ADSB data ingests using the `READSB_NET_CONNECTOR` parameter. This is the preferred way if you have multiple sources or destinations for your ADSB data. This variable allows you to configure incoming and outgoing connections. The variable takes a semicolon (`;`) separated list of `host,port,protocol[,uuid=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX]`, see the section [All-in-One Configuration using `ULTRAFEEDER_CONFIG`](#all-in-one-configuration-using-ultrafeeder_config) for explanation of these parameters.
diff --git a/aussieadsb.sh b/aussieadsb.sh
new file mode 100755
index 0000000..b7d9c60
--- /dev/null
+++ b/aussieadsb.sh
@@ -0,0 +1,285 @@
+#!/bin/bash
+
+# shellcheck shell=bash disable=SC2015,SC2162
+#
+# Registration and query utility for aussieadsb,
+# Meant for those who want to feed AussieADSB with Ultrafeeder
+#
+# AussieADSB is an Australian aggregator focused on feeders in Australia/Oceania.
+# If you are in this region and are interested in feeding to them, please see:
+# http://aussieadsb.com/
+#
+# You can run this script from any modern Debian Linux machine with this command:
+# bash <(wget -qO - https://raw.githubusercontent.com/sdr-enthusiasts/docker-adsb-ultrafeeder/main/aussieadsb.sh)
+#
+#---------------------------------------------------------------------------------------------
+# Copyright (C) 2024 Ramon F. Kolb (kx1t) and contributors
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with this program.
+# If not, see <https://www.gnu.org/licenses/>.
+#---------------------------------------------------------------------------------------------
+#
+
+AAClientVersion="1.2.0"
+argv="${1,,}"
+if [[ "${argv:0:1}" != "-" ]]; then argv="-$argv"; fi
+
+while [[ "$argv" == "-" ]]; do
+    echo "AussieADSB registration utility"
+    echo "Visit https://aussieadsb.com for info"
+    echo
+    echo "Select an option:"
+    echo "(r)egister      -- register a new receiver"
+    echo "(d)e-register    -- deregister a receiver"
+    echo "(u)pdateinfo    -- update your registration info"
+    echo "(s)tatus        -- show the feeding status"
+    read -n 1 argv
+    echo
+    argv="${argv,,}"
+    case "$argv" in
+        r) argv="-register" ;;
+        d) argv="-deregister" ;;
+        u) argv="-updateinfo" ;;
+        s) argv="-status" ;;
+        *) echo "invalid selection, try again" ;;
+    esac
+done
+
+if [[ "$argv" == "-help" ]]; then
+    echo "Usage: $0 <option> [key]"
+    echo "Where <option> is one of the following:"
+    echo "-register      -- register a new receiver"
+    echo "-deregister    -- deregister a receiver"
+    echo "-updateinfo    -- update your registration info"
+    echo "-status        -- show the feeding status"
+    echo "-help          -- show this help text"
+    echo
+    echo "The AussieADSB registration key is optional (and cannot be used  with the -register option)"
+    echo "If you omit it, we'll ask you for it when doing -deregister, -updateinfo, or -status"
+    echo "You can also pass in the key using the AUSSIEADSB_KEY environment variable"
+    exit 0
+fi
+
+AUSSIEADSB_KEY="${AUSSIEADSB_KEY:-$2}"
+
+if ! which jq >/dev/null 2>&1 || ! which netcat >/dev/null 2>&1 || ! which ifconfig >/dev/null 2>&1; then
+    echo "For registration to work, we need to do a one-time installation of JQ, NetCat, and ifconfig to your system"
+    echo "Please be patient..."
+
+    if (( UID == 0 )); then
+        apt-get update -qq
+        apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -qq jq netcat-traditional net-tools
+    else
+        sudo apt-get update -qq
+        sudo apt-get install -o Dpkg::Options::="--force-confnew" -y --no-install-recommends -qq jq netcat-traditional net-tools
+    fi
+    echo ""
+    echo ""
+fi
+
+case "$argv" in
+    "-register")
+        if [[ -n "$AUSSIEADSB_KEY" ]]; then
+            echo "Error - your station is already registered. Try \"$0 -status\""
+            exit 1
+        fi
+        echo ""
+        echo "AussieADSB Registration"
+        echo ""
+        echo "Which suburb is this receiver located in?"
+        echo "This will be used by the admins to set the receiver name on the site"
+        read suburb
+        while ! [[ $postcode =~ ^[0-9][0-9]{3}$ ]]; do
+            read -p "Please enter a valid 4-digit Australian postcode for the suburb: " postcode
+        done
+        read -p "Please enter your email address: " email
+        read -p "Please enter your first and last name: " name
+
+        echo ""
+        echo "We will attempt to register your receiver with this information:"
+        echo "Name:     $name"
+        echo "Email:    $email"
+        echo "Location: $suburb $postcode"
+        read -n 1 -p "Is this correct? (Y/n) " yesno
+        echo ""
+        if [[ "${yesno,,}" == "n" ]]; then
+            echo "Please run the command \"$0 $1\" again with the correct information!"
+            exit 1
+        fi
+        echo ""
+        echo "Registering receiver..."
+        response="$(printf '{"ReceiverToken":null,"ClientVersion":"%s","MessageType":"register","Data":{"LocalSourcePort":30005,"OSDescription":"%s","MacAddress":"%s","Suburb":"%s","Email":"%s","Name":"%s"}}' \
+            "$AAClientVersion" \
+            "$(uname -s -r -v)" \
+            "$(ifconfig -a | sed -n 's/^\s*ether \([0-9a-f:]\+\) .*$/\1/p' | head -1)" \
+            "$suburb $postcode" \
+            "$email" \
+            "$name" \
+            | nc aussieadsb.com 5000)"
+        rcvr_token="$(jq -r .Data.ReceiverToken <<< "$response" 2>/dev/null)"
+        rcvr_name="$(jq -r .Data.ReceiverName <<< "$response" 2>/dev/null)"
+        port="$(jq -r .Data.Port <<< "$response" 2>/dev/null)"
+        if [[ "$rcvr_token" == "null" ]] || [[ "$rcvr_name" == "null" ]] || [[ "$port" == "null" ]]; then
+            echo "Something went wrong. The registration engine returned this:"
+            jq -r . <<< "$response"
+            echo ""
+            echo "Try again later!"
+            exit 1
+        fi
+        echo "Your receiver is registered! Please add the following to your Ultrafeeder environment parameters in docker-compose.yml:"
+        echo 
+        echo "In ULTRAFEEDER_CONFIG, add this line:"
+        echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
+        echo "   mlat,aussieadsb.com,30000;"
+        echo
+        echo "Add the following parameter as well:"
+        echo "- AUSSIEADSB_KEY='$rcvr_token'"
+        echo
+        echo "After adding these, please recreate your Ultrafeeder container to start feeding AussieADSB!"
+        echo
+        echo "Visit http://aussieadsb.com/status to check feeding status"
+        echo "Currently, your receiver name is \"$rcvr_name\", but it will soon be renamed by the admins to your location."
+        echo
+        echo "Please keep your AUSSIEADSB_KEY value ($rcvr_token) and Port Number ($port) in a safe place - you will need it to reinstate your station if you ever update your system"
+        echo
+    ;;
+
+    "-deregister")
+        echo ""
+        echo "AussieADSB De-registration"
+        echo ""
+        
+        while [[ -z "$AUSSIEADSB_KEY" ]]; do
+            read -rp "Please enter your AussieADSB Registration Key: " AUSSIEADSB_KEY
+        done
+
+        response="$(printf '{"ReceiverToken":"%s","ClientVersion":"%s","MessageType":"status","Data":null}' "$AUSSIEADSB_KEY" "$AAClientVersion" | nc aussieadsb.com 5000)"
+        msg_type="$(jq -r .MessageType <<< "$response")"
+        rcvr_name="$(jq -r .Data.Name <<< "$response")"
+
+        if [[ "$msg_type" != "statusresponse" ]] || [[ "$rcvr_name" == "null" ]]; then
+            echo "Cannot find a receiver with Registration Key \"$AUSSIEADSB_KEY\"!"
+            echo "Please check the key and try again!"
+            exit 1
+        fi
+
+        read -n 1 -p "Are you sure you want to deregister station \"$rcvr_name\"? (y/N) " yesno
+        echo  ""
+        if [[ "$yesno" != "y" ]]; then
+            echo "Aborting deregistration!"
+            exit 0
+        fi
+
+        echo "Deregistering station $rcvr_name with key $AUSSIEADSB_KEY..."
+        response="$(printf '{"ReceiverToken":"%s","ClientVersion":"%s","MessageType":"deregister","Data":"User"}' "$AUSSIEADSB_KEY" "$AAClientVersion" | nc aussieadsb.com 5000)"
+        if [[ "$(jq -r .MessageType <<< "$response" 2>/dev/null)" == "deregisterresponse" ]]; then
+            echo "De-registration complete!"
+            exit 0
+        else
+            echo "Something went wrong. The registration engine returned this:"
+            jq -r . <<< "$response"
+            echo ""
+            echo "Try again later!"
+            exit 1
+        fi
+    ;;
+
+    "-status")
+        echo ""
+        echo "AussieADSB Feeder Status"
+        echo ""
+        
+        while [[ -z "$AUSSIEADSB_KEY" ]]; do
+            read -rp "Please enter your AussieADSB Registration Key: " AUSSIEADSB_KEY
+        done
+
+        response="$(printf '{"ReceiverToken":"%s","ClientVersion":"%s","MessageType":"status","Data":null}' "$AUSSIEADSB_KEY" "$AAClientVersion" | nc aussieadsb.com 5000)"
+        msg_type="$(jq -r .MessageType <<< "$response" 2>/dev/null)"
+        rcvr_name="$(jq -r .Data.Name <<< "$response" 2>/dev/null)"
+        connected="$(jq -r .Data.Connected <<< "$response" 2>/dev/null)"
+        rcvr_ip="$(jq -r .Data.ConnectedIP <<< "$response" 2>/dev/null)"
+
+        if [[ "$msg_type" != "statusresponse" ]] || [[ "$rcvr_name" == "null" ]]; then
+            echo "Cannot find a receiver with Registration Key \"$AUSSIEADSB_KEY\"!"
+            echo "Please check the key and try again!"
+            exit 1
+        fi
+
+        if [[ "$connected" == true ]]; then connected="connected"; else connected="not connected"; fi
+        echo "Status for AUSSIEADSB_KEY \"$AUSSIEADSB_KEY\":"
+        echo "Registered Receiver Name: $rcvr_name"
+        echo "Connection status: $connected"
+        echo "Public IP address: $rcvr_ip"
+        echo ""
+        exit 0
+    ;;
+
+    "-updateinfo")
+        echo ""
+        echo "AussieADSB Registration Update"
+        echo ""
+        
+        while [[ -z "$AUSSIEADSB_KEY" ]]; do
+            read -rp "Please enter your AussieADSB Registration Key: " AUSSIEADSB_KEY
+        done
+
+        echo "Enter all information again. Your registration will be updated with the info you entered below."
+        echo "Please do not leave any fields empty."
+        echo ""
+
+        echo "In which suburb is this receiver located?"
+        echo "This will be used by the admins to set the receiver name on the site"
+        read suburb
+        while ! [[ $postcode =~ ^[0-9][0-9]{3}$ ]]; do
+            read -p "Please enter a valid 4-digit Australian postcode for the suburb: " postcode
+        done
+        read -p "Please enter your email address: " email
+        read -p "Please enter your first and last name: " name
+
+        echo ""
+        echo "We will attempt to register your receiver with this information:"
+        echo "Name:     $name"
+        echo "Email:    $email"
+        echo "Location: $suburb $postcode"
+        read -n 1 -p "Is this correct? (Y/n) " yesno
+        echo ""
+        if [[ "${yesno,,}" == "n" ]]; then
+            echo "Please run the command \"$0 $1\" again with the correct information!"
+            exit 1
+        fi
+        echo ""
+        echo "Updating receiver..."
+        response="$(printf '{"ReceiverToken":"%s","ClientVersion":"%s","MessageType":"update","Data":{"LocalSourcePort":30005,"OSDescription":"%s","MacAddress":"%s","Suburb":"%s","Email":"%s","Name":"%s"}}' \
+            "$AUSSIEADSB_KEY" \
+            "$AAClientVersion" \
+            "$(uname -s -r -v)" \
+            "$(ifconfig -a | sed -n 's/^\s*ether \([0-9a-f:]\+\) .*$/\1/p' | head -1)" \
+            "$suburb $postcode" \
+            "$email" \
+            "$name" \
+            | nc aussieadsb.com 5000)"
+        status="$(jq -r .MessageType <<< "$response" 2>/dev/null)"
+        if [[ "$status" != "updateresponse" ]]; then
+            echo "Something went wrong. The registration engine returned this:"
+            jq -r . <<< "$response"
+            echo ""
+            echo "Try again later!"
+            exit 1
+        fi
+    ;;
+
+    *)
+        echo "Unknown option \"$1\". Please check and try again"
+        exit 1
+    ;;
+    
+esac

From 9e813f2ea36ee50cb6c64a813b48799768383107 Mon Sep 17 00:00:00 2001
From: kx1t <15090643+kx1t@users.noreply.github.com>
Date: Mon, 17 Jun 2024 05:34:33 -0400
Subject: [PATCH 4/8] Update aussieadsb.sh

---
 aussieadsb.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/aussieadsb.sh b/aussieadsb.sh
index b7d9c60..8b3453d 100755
--- a/aussieadsb.sh
+++ b/aussieadsb.sh
@@ -175,11 +175,11 @@ case "$argv" in
         read -n 1 -p "Are you sure you want to deregister station \"$rcvr_name\"? (y/N) " yesno
         echo  ""
         if [[ "$yesno" != "y" ]]; then
-            echo "Aborting deregistration!"
+            echo "Aborting de-registration!"
             exit 0
         fi
 
-        echo "Deregistering station $rcvr_name with key $AUSSIEADSB_KEY..."
+        echo "De-registering station $rcvr_name with key $AUSSIEADSB_KEY..."
         response="$(printf '{"ReceiverToken":"%s","ClientVersion":"%s","MessageType":"deregister","Data":"User"}' "$AUSSIEADSB_KEY" "$AAClientVersion" | nc aussieadsb.com 5000)"
         if [[ "$(jq -r .MessageType <<< "$response" 2>/dev/null)" == "deregisterresponse" ]]; then
             echo "De-registration complete!"
@@ -207,7 +207,8 @@ case "$argv" in
         rcvr_name="$(jq -r .Data.Name <<< "$response" 2>/dev/null)"
         connected="$(jq -r .Data.Connected <<< "$response" 2>/dev/null)"
         rcvr_ip="$(jq -r .Data.ConnectedIP <<< "$response" 2>/dev/null)"
-
+        port="$(jq -r .Data.Port <<< "$response" 2>/dev/null)"
+        
         if [[ "$msg_type" != "statusresponse" ]] || [[ "$rcvr_name" == "null" ]]; then
             echo "Cannot find a receiver with Registration Key \"$AUSSIEADSB_KEY\"!"
             echo "Please check the key and try again!"
@@ -219,7 +220,15 @@ case "$argv" in
         echo "Registered Receiver Name: $rcvr_name"
         echo "Connection status: $connected"
         echo "Public IP address: $rcvr_ip"
+        echo "Server Port to send Beast data to: $port"
         echo ""
+        echo "In ULTRAFEEDER_CONFIG, add this line:"
+        echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
+        echo "   mlat,aussieadsb.com,30000;"
+        echo
+        echo "Add the following parameter as well:"
+        echo "- AUSSIEADSB_KEY='$AUSSIEADSB_KEY'"
+        echo
         exit 0
     ;;
 

From 9ff70985a17c69224f1402bf790f382b26f8033c Mon Sep 17 00:00:00 2001
From: kx1t <15090643+kx1t@users.noreply.github.com>
Date: Mon, 17 Jun 2024 05:47:17 -0400
Subject: [PATCH 5/8] Update aussieadsb.sh

---
 aussieadsb.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aussieadsb.sh b/aussieadsb.sh
index 8b3453d..5bfda14 100755
--- a/aussieadsb.sh
+++ b/aussieadsb.sh
@@ -29,13 +29,13 @@
 #---------------------------------------------------------------------------------------------
 #
 
-AAClientVersion="1.2.0"
+AAClientVersion="1.1.0-ultrafeeder"
 argv="${1,,}"
 if [[ "${argv:0:1}" != "-" ]]; then argv="-$argv"; fi
 
 while [[ "$argv" == "-" ]]; do
     echo "AussieADSB registration utility"
-    echo "Visit https://aussieadsb.com for info"
+    echo "Visit http://aussieadsb.com for info"
     echo
     echo "Select an option:"
     echo "(r)egister      -- register a new receiver"
@@ -137,7 +137,7 @@ case "$argv" in
         fi
         echo "Your receiver is registered! Please add the following to your Ultrafeeder environment parameters in docker-compose.yml:"
         echo 
-        echo "In ULTRAFEEDER_CONFIG, add this line:"
+        echo "In ULTRAFEEDER_CONFIG, please add these lines:"
         echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
         echo "   mlat,aussieadsb.com,30000;"
         echo
@@ -222,7 +222,7 @@ case "$argv" in
         echo "Public IP address: $rcvr_ip"
         echo "Server Port to send Beast data to: $port"
         echo ""
-        echo "In ULTRAFEEDER_CONFIG, add this line:"
+        echo "In ULTRAFEEDER_CONFIG, please add these lines:"
         echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
         echo "   mlat,aussieadsb.com,30000;"
         echo

From e3455aae55b26eb1acf77ab1678754c58b248f7a Mon Sep 17 00:00:00 2001
From: kx1t <15090643+kx1t@users.noreply.github.com>
Date: Mon, 17 Jun 2024 06:26:45 -0400
Subject: [PATCH 6/8] Update aussieadsb.sh

---
 aussieadsb.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aussieadsb.sh b/aussieadsb.sh
index 5bfda14..18cc54b 100755
--- a/aussieadsb.sh
+++ b/aussieadsb.sh
@@ -139,7 +139,7 @@ case "$argv" in
         echo 
         echo "In ULTRAFEEDER_CONFIG, please add these lines:"
         echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
-        echo "   mlat,aussieadsb.com,30000;"
+        echo "   mlat,aussieadsb.com,30000,name=$rcvr_token;"
         echo
         echo "Add the following parameter as well:"
         echo "- AUSSIEADSB_KEY='$rcvr_token'"
@@ -224,7 +224,7 @@ case "$argv" in
         echo ""
         echo "In ULTRAFEEDER_CONFIG, please add these lines:"
         echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
-        echo "   mlat,aussieadsb.com,30000;"
+        echo "   mlat,aussieadsb.com,30000,name=$AUSSIEADSB_KEY;"
         echo
         echo "Add the following parameter as well:"
         echo "- AUSSIEADSB_KEY='$AUSSIEADSB_KEY'"

From fc894892bc57c89bbfd35277e15fe5d176b10980 Mon Sep 17 00:00:00 2001
From: kx1t <15090643+kx1t@users.noreply.github.com>
Date: Mon, 17 Jun 2024 06:47:36 -0400
Subject: [PATCH 7/8] Fix 2 bugs

- mlat-client user argument needs to be quoted to avoid splitting usernames with spaces
- name_arg parameter needs to be unset between iterations of the loop
---
 rootfs/etc/s6-overlay/scripts/mlat-client | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rootfs/etc/s6-overlay/scripts/mlat-client b/rootfs/etc/s6-overlay/scripts/mlat-client
index 09eb8ae..326314e 100755
--- a/rootfs/etc/s6-overlay/scripts/mlat-client
+++ b/rootfs/etc/s6-overlay/scripts/mlat-client
@@ -183,7 +183,7 @@ do
     # If the argument starts with "uuid=", then it must be a UUID, etc.
     # If the argument isn't any of the above, then it's an "extra argument"
 
-    unset uuid_arg lat_arg lon_arg alt_arg input_connect_arg return_port_arg extra_args
+    unset name_arg uuid_arg lat_arg lon_arg alt_arg input_connect_arg return_port_arg extra_args
 
     for ((i=2; i<${#params[*]}; i++))
     do
@@ -234,7 +234,7 @@ do
     MLAT_PARAM+=(--input-connect "${input_connect_arg:-localhost:30005}")
 
     if [[ -n "${name_arg}" ]] || [[ -n "${MLAT_USER}" ]]; then
-        MLAT_PARAM+=(--user "${name_arg:-${MLAT_USER}}")
+        MLAT_PARAM+=(--user \""${name_arg:-${MLAT_USER}}"\")
     else
         rnd="${RANDOM}"
         "${s6wrap[@]}" --args echo "WARNING: MLAT_USER is not set - using random number \"${rnd}\" as MLAT_USER"

From 1c7234d2e023d9761ce4dead2a12dcf2fcb7a6a1 Mon Sep 17 00:00:00 2001
From: kx1t <15090643+kx1t@users.noreply.github.com>
Date: Mon, 17 Jun 2024 07:00:51 -0400
Subject: [PATCH 8/8] Update aussieadsb.sh

---
 aussieadsb.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/aussieadsb.sh b/aussieadsb.sh
index 18cc54b..880c0fa 100755
--- a/aussieadsb.sh
+++ b/aussieadsb.sh
@@ -141,9 +141,6 @@ case "$argv" in
         echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
         echo "   mlat,aussieadsb.com,30000,name=$rcvr_token;"
         echo
-        echo "Add the following parameter as well:"
-        echo "- AUSSIEADSB_KEY='$rcvr_token'"
-        echo
         echo "After adding these, please recreate your Ultrafeeder container to start feeding AussieADSB!"
         echo
         echo "Visit http://aussieadsb.com/status to check feeding status"
@@ -226,9 +223,6 @@ case "$argv" in
         echo "   adsb,aussieadsb.com,$port,beast_reduce_plus_out;"
         echo "   mlat,aussieadsb.com,30000,name=$AUSSIEADSB_KEY;"
         echo
-        echo "Add the following parameter as well:"
-        echo "- AUSSIEADSB_KEY='$AUSSIEADSB_KEY'"
-        echo
         exit 0
     ;;