farshidtz
commented
9 months ago The upgrade is from to thread-reference-20230119 to thread-reference-20230710. Here is the diff: https://github.com/openthread/ot-br-posix/compare/thread-reference-20230119...thread-reference-20230710
There may be more relevant changes that need to incorporated. Here is the diff for the script directory (best generated and viewed locally to have highlighting):
$ git diff thread-reference-20230119...thread-reference-20230710 script
warning: refname 'thread-reference-20230710' is ambiguous.
diff --git a/script/_border_routing b/script/_border_routing
index cd9e2dddfb..f17c8fe690 100644
--- a/script/_border_routing
+++ b/script/_border_routing
@@ -30,10 +30,17 @@
# This script sets up border routing configurations.
#
-readonly INFRA_IF_NAME="${INFRA_IF_NAME:-wlan0}"
-readonly SYSCTL_ACCEPT_RA_FILE="/etc/sysctl.d/60-otbr-accept-ra.conf"
-readonly DHCPCD_CONF_FILE="/etc/dhcpcd.conf"
-readonly DHCPCD_CONF_BACKUP_FILE="$DHCPCD_CONF_FILE.orig"
+INFRA_IF_NAME="${INFRA_IF_NAME:-wlan0}"
+readonly INFRA_IF_NAME
+
+SYSCTL_ACCEPT_RA_FILE="/etc/sysctl.d/60-otbr-accept-ra.conf"
+readonly SYSCTL_ACCEPT_RA_FILE
+
+DHCPCD_CONF_FILE="/etc/dhcpcd.conf"
+readonly DHCPCD_CONF_FILE
+
+DHCPCD_CONF_BACKUP_FILE="$DHCPCD_CONF_FILE.orig"
+readonly DHCPCD_CONF_BACKUP_FILE
accept_ra_install()
{
diff --git a/script/_disable_services b/script/_disable_services
index 130c70e7d4..d5697978f7 100644
--- a/script/_disable_services
+++ b/script/_disable_services
@@ -44,13 +44,15 @@ bbb_disable_services()
SERVICE_LIST="${SERVICE_LIST} nodered.service"
SERVICE_LIST="${SERVICE_LIST} dnsmasq.service" # Disable well before bind9
- for service in $SERVICE_LIST; do
- if [ "$(sudo systemctl is-active "$service")" != "inactive" ]; then
- for action in stop disable; do
- sudo systemctl "$action" "$service"
- done
- fi
- done
+ if have systemctl; then
+ for service in $SERVICE_LIST; do
+ if [ "$(sudo systemctl is-active "$service")" != "inactive" ]; then
+ for action in stop disable; do
+ sudo systemctl "$action" "$service"
+ done
+ fi
+ done
+ fi
# stop avahi from advertising for cloud9 and nodered
sudo rm -rf /etc/avahi/services
diff --git a/script/_nat64 b/script/_nat64
index 9268134e45..521c4d2216 100644
--- a/script/_nat64
+++ b/script/_nat64
@@ -40,6 +40,7 @@ NAT64_PREFIX=64:ff9b::/96
DYNAMIC_POOL="${NAT64_DYNAMIC_POOL:-192.168.255.0/24}"
NAT44_SERVICE=/etc/init.d/otbr-nat44
WLAN_IFNAMES="${INFRA_IF_NAME:-eth0}"
+THREAD_IF="${THREAD_IF:-wpan0}"
# Currently solution was verified only on raspbian and ubuntu.
#
@@ -156,7 +157,9 @@ EOF
echo " iptables -t nat -A POSTROUTING -o $IFNAME -j MASQUERADE" | sudo tee -a $NAT44_SERVICE
done
else
- echo " iptables -t nat -A POSTROUTING -s \"$DYNAMIC_POOL\" -j MASQUERADE" | sudo tee -a $NAT44_SERVICE
+ # Just a random fwmark bits.
+ echo " iptables -t mangle -A PREROUTING -i $THREAD_IF -j MARK --set-mark 0x1001" | sudo tee -a $NAT44_SERVICE
+ echo " iptables -t nat -A POSTROUTING -m mark --mark 0x1001 -j MASQUERADE" | sudo tee -a $NAT44_SERVICE
for IFNAME in $WLAN_IFNAMES; do
echo " iptables -t filter -A FORWARD -o $IFNAME -j ACCEPT" | sudo tee -a $NAT44_SERVICE
echo " iptables -t filter -A FORWARD -i $IFNAME -j ACCEPT" | sudo tee -a $NAT44_SERVICE
diff --git a/script/_otbr b/script/_otbr
index 71317079e1..790ab10ae9 100644
--- a/script/_otbr
+++ b/script/_otbr
@@ -27,9 +27,14 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-readonly OTBR_TOP_BUILDDIR="${BUILD_DIR}/otbr"
-readonly OTBR_OPTIONS="${OTBR_OPTIONS:-}"
-readonly REFERENCE_DEVICE="${REFERENCE_DEVICE:-0}"
+OTBR_TOP_BUILDDIR="${BUILD_DIR}/otbr"
+readonly OTBR_TOP_BUILDDIR
+
+OTBR_OPTIONS="${OTBR_OPTIONS-}"
+readonly OTBR_OPTIONS
+
+REFERENCE_DEVICE="${REFERENCE_DEVICE:-0}"
+readonly REFERENCE_DEVICE
otbr_uninstall()
{
@@ -66,7 +71,6 @@ otbr_install()
"-DBUILD_TESTING=OFF"
"-DCMAKE_INSTALL_PREFIX=/usr"
"-DOTBR_DBUS=ON"
- "-DOTBR_FEATURE_FLAGS=ON"
"-DOTBR_DNSSD_DISCOVERY_PROXY=ON"
"-DOTBR_SRP_ADVERTISING_PROXY=ON"
"-DOTBR_INFRA_IF_NAME=${INFRA_IF_NAME}"
@@ -111,13 +115,19 @@ otbr_install()
)
fi
- if with NAT64 && [[ ${NAT64_SERVICE:-} == "openthread" ]]; then
+ if with NAT64 && [[ ${NAT64_SERVICE-} == "openthread" ]]; then
otbr_options+=(
"-DOTBR_NAT64=ON"
"-DOT_POSIX_NAT64_CIDR=${NAT64_DYNAMIC_POOL:-192.168.255.0/24}"
)
fi
+ if with NAT64; then
+ otbr_options+=(
+ "-DOTBR_DNS_UPSTREAM_QUERY=ON"
+ )
+ fi
+
(./script/cmake-build "${otbr_options[@]}" \
&& cd "${OTBR_TOP_BUILDDIR}" \
&& ninja \
diff --git a/script/bootstrap b/script/bootstrap
index 1aaeff5b87..0b72aa4971 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -58,7 +58,7 @@ install_packages_apt()
sudo apt-get install --no-install-recommends -y libavahi-client3 libavahi-common-dev libavahi-client-dev avahi-daemon
(MDNS_RESPONDER_SOURCE_NAME=mDNSResponder-1310.80.1 \
&& cd /tmp \
- && wget -4 --no-check-certificate https://github.com/apple-oss-distributions/mDNSResponder/archive/refs/tags/$MDNS_RESPONDER_SOURCE_NAME.tar.gz \
+ && wget --no-check-certificate https://github.com/apple-oss-distributions/mDNSResponder/archive/refs/tags/$MDNS_RESPONDER_SOURCE_NAME.tar.gz \
&& mkdir -p $MDNS_RESPONDER_SOURCE_NAME \
&& tar xvf $MDNS_RESPONDER_SOURCE_NAME.tar.gz -C $MDNS_RESPONDER_SOURCE_NAME --strip-components=1 \
&& cd /tmp/$MDNS_RESPONDER_SOURCE_NAME/Clients \
@@ -100,7 +100,7 @@ install_packages_apt()
sudo apt-get install --no-install-recommends -y libjsoncpp-dev
# reference device
- without REFERENCE_DEVICE || sudo apt-get install --no-install-recommends -y radvd dnsutils
+ without REFERENCE_DEVICE || sudo apt-get install --no-install-recommends -y radvd dnsutils avahi-utils
# backbone-router
without BACKBONE_ROUTER || sudo apt-get install --no-install-recommends -y libnetfilter-queue1 libnetfilter-queue-dev
diff --git a/script/clang-format b/script/clang-format
index 01b9535e0c..e31466d22b 100755
--- a/script/clang-format
+++ b/script/clang-format
@@ -27,7 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-CLANG_FORMAT_VERSION="clang-format version 9.0"
+CLANG_FORMAT_VERSION="clang-format version 14.0"
die()
{
@@ -39,36 +39,41 @@ die()
# expand_aliases shell option is set using shopt.
shopt -s expand_aliases
-if command -v clang-format-9 >/dev/null; then
- alias clang-format=clang-format-9
+if command -v clang-format-14 >/dev/null; then
+ alias clang-format=clang-format-14
elif command -v clang-format >/dev/null; then
case "$(clang-format --version)" in
"$CLANG_FORMAT_VERSION"*) ;;
*)
- die "$(clang-format --version); clang-format 9.0 required"
+ die "$(clang-format --version); clang-format 14.0 required"
;;
esac
else
- die "clang-format 9.0 required"
+ die "clang-format 14.0 required"
fi
clang-format "$@" || die
# ensure EOF newline
REPLACE=no
+FILES=()
for arg; do
case $arg in
-i)
REPLACE=yes
;;
+ -*) ;;
+ *)
+ FILES+=("$arg")
+ ;;
esac
done
-file=$arg
-
[ $REPLACE != yes ] || {
- [ -n "$(tail -c1 "$file")" ] && echo >>"$file"
+ for file in "${FILES[@]}"; do
+ [ -n "$(tail -c1 "$file")" ] && echo >>"$file"
+ done
}
exit 0
diff --git a/script/cmake-build b/script/cmake-build
index 799e955e97..19679381b5 100755
--- a/script/cmake-build
+++ b/script/cmake-build
@@ -58,10 +58,13 @@
# shellcheck source=script/_initrc
. "$(dirname "$0")"/_initrc
-readonly OTBR_TOP_SRCDIR="$PWD"
-readonly OTBR_TOP_BUILD_DIR="${BUILD_DIR}/otbr"
+OTBR_TOP_SRCDIR="$PWD"
+readonly OTBR_TOP_SRCDIR
-OTBR_TARGET=${OTBR_TARGET:-}
+OTBR_TOP_BUILD_DIR="${BUILD_DIR}/otbr"
+readonly OTBR_TOP_BUILD_DIR
+
+OTBR_TARGET=${OTBR_TARGET-}
main()
{
@@ -72,7 +75,7 @@ main()
(
cd "${builddir}" || die "Failed to enter ${builddir}"
- cmake -GNinja "${OTBR_TOP_SRCDIR}" "$@"
+ cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON "${OTBR_TOP_SRCDIR}" "$@"
if [[ -n ${OTBR_TARGET[*]} ]]; then
ninja "${OTBR_TARGET[@]}"
diff --git a/script/console b/script/console
index 47e08911a7..416dd024ab 100755
--- a/script/console
+++ b/script/console
@@ -37,8 +37,11 @@
# shellcheck source=script/_border_routing
. script/_border_routing
-readonly TUN="${TUN:-wpan0}"
-readonly RADIO_URL="${RADIO_URL:-spinel+hdlc+uart:///dev/ttyUSB0}"
+TUN="${TUN:-wpan0}"
+readonly TUN
+
+RADIO_URL="${RADIO_URL:-spinel+hdlc+uart:///dev/ttyUSB0}"
+readonly RADIO_URL
killall_services()
{
diff --git a/script/make-pretty b/script/make-pretty
index 0624776296..7b4dcb44b3 100755
--- a/script/make-pretty
+++ b/script/make-pretty
@@ -60,12 +60,20 @@
set -euo pipefail
-readonly OT_BUILD_JOBS=$(getconf _NPROCESSORS_ONLN)
-readonly OT_EXCLUDE_DIRS=(third_party doc/site)
+OT_BUILD_JOBS=$(getconf _NPROCESSORS_ONLN)
+readonly OT_BUILD_JOBS
-readonly OT_CLANG_SOURCES=('*.c' '*.cc' '*.cpp' '*.h' '*.hpp')
-readonly OT_MARKDOWN_SOURCES=('*.md')
-readonly OT_PYTHON_SOURCES=('*.py')
+OT_EXCLUDE_DIRS=(third_party doc/site)
+readonly OT_EXCLUDE_DIRS
+
+OT_CLANG_SOURCES=('*.c' '*.cc' '*.cpp' '*.h' '*.hpp')
+readonly OT_CLANG_SOURCES
+
+OT_MARKDOWN_SOURCES=('*.md')
+readonly OT_MARKDOWN_SOURCES
+
+OT_PYTHON_SOURCES=('*.py')
+readonly OT_PYTHON_SOURCES
do_clang_format()
{
diff --git a/script/server b/script/server
index ce7a981707..b4eaedfb9a 100755
--- a/script/server
+++ b/script/server
@@ -36,7 +36,7 @@
. script/_dns64
. script/_firewall
-main()
+startup()
{
# shellcheck source=/dev/null
. "$BEFORE_HOOK"
@@ -65,4 +65,37 @@ main()
. "$AFTER_HOOK"
}
-main
+shutdown()
+{
+ nat64_stop || echo 'Failed to stop NAT64!'
+ dns64_stop || echo 'Failed to stop DNS64!'
+ firewall_stop || echo 'Failed to stop firewall'
+ if have systemctl; then
+ systemctl is-active rsyslog && sudo systemctl stop rsyslog || echo 'Failed to stop rsyslog!'
+ systemctl is-active dbus && sudo systemctl stop dbus || echo 'Failed to stop dbus!'
+ systemctl is-active avahi-daemon && sudo systemctl stop avahi-daemon || echo 'Failed to stop avahi!'
+ without WEB_GUI || systemctl is-active otbr-web && sudo systemctl stop otbr-web || echo 'Failed to stop otbr-web!'
+ systemctl is-active otbr-agent && sudo systemctl stop otbr-agent || echo 'Failed to stop otbr-agent!'
+ elif have service; then
+ sudo service rsyslog status && sudo service rsyslog stop || echo 'Failed to stop rsyslog!'
+ sudo service dbus status && sudo service dbus stop || echo 'Failed to stop dbus!'
+ sudo service mdns status && sudo service mdns stop || echo "service mdns is not available!"
+ sudo service avahi-daemon status && sudo service avahi-daemon stop || echo 'Failed to stop avahi!'
+ sudo service otbr-agent status && sudo service otbr-agent stop || echo 'Failed to stop otbr-agent!'
+ without WEB_GUI || sudo service otbr-web status && sudo service otbr-web stop || echo 'Failed to stop otbr-web!'
+ else
+ echo 'Unable to find service manager. Try script/console to stop in console mode!'
+ fi
+}
+
+main()
+{
+ if [[ ${1-} == "shutdown" ]]; then
+ shift
+ shutdown "$@"
+ else
+ startup "$@"
+ fi
+}
+
+main "$@"
diff --git a/script/standalone_ipv6 b/script/standalone_ipv6
index fe6cfc086e..65266b1ba4 100755
--- a/script/standalone_ipv6
+++ b/script/standalone_ipv6
@@ -45,7 +45,7 @@ ETH0_IPV6_BASE_PREFIX=fd11:33
debug_echo()
{
- if [ x"${_DEBUG_IPV6}" == x"true" ]; then
+ if [ "${_DEBUG_IPV6}" == "true" ]; then
echo "${@}"
fi
}
diff --git a/script/test b/script/test
index 764c941da6..f5b955cbe9 100755
--- a/script/test
+++ b/script/test
@@ -33,17 +33,37 @@
# shellcheck source=script/_initrc
. "$(dirname "$0")"/_initrc
-readonly OTBR_COLOR_PASS='\033[0;32m'
-readonly OTBR_COLOR_FAIL='\033[0;31m'
-readonly OTBR_COLOR_NONE='\033[0m'
-readonly QUIET=${QUIET:-1}
-
-readonly OTBR_BUILD_TYPE="${OTBR_BUILD_TYPE:-Debug}"
-readonly OTBR_COVERAGE="${OTBR_COVERAGE:-0}"
-readonly OTBR_MDNS="${OTBR_MDNS:-}"
-readonly OTBR_REST="${OTBR_REST:-}"
-readonly OTBR_OPTIONS="${OTBR_OPTIONS:-}"
-readonly OTBR_TOP_BUILDDIR="${BUILD_DIR}/otbr"
+readonly OTBR_VERBOSE=${OTBR_VERBOSE:-0}
+
+OTBR_COLOR_PASS='\033[0;32m'
+readonly OTBR_COLOR_PASS
+
+OTBR_COLOR_FAIL='\033[0;31m'
+readonly OTBR_COLOR_FAIL
+
+OTBR_COLOR_NONE='\033[0m'
+readonly OTBR_COLOR_NONE
+
+QUIET=${QUIET:-1}
+readonly QUIET
+
+OTBR_BUILD_TYPE="${OTBR_BUILD_TYPE:-Debug}"
+readonly OTBR_BUILD_TYPE
+
+OTBR_COVERAGE="${OTBR_COVERAGE:-0}"
+readonly OTBR_COVERAGE
+
+OTBR_MDNS="${OTBR_MDNS-}"
+readonly OTBR_MDNS
+
+OTBR_REST="${OTBR_REST-}"
+readonly OTBR_REST
+
+OTBR_OPTIONS="${OTBR_OPTIONS-}"
+readonly OTBR_OPTIONS
+
+OTBR_TOP_BUILDDIR="${BUILD_DIR}/otbr"
+readonly OTBR_TOP_BUILDDIR
#######################################
# Run test and print result.
@@ -63,7 +83,7 @@ print_result()
echo -e "$(date) Running $*"
- if [[ ${QUIET} == 1 ]]; then
+ if [[ ${OTBR_VERBOSE} == 0 ]]; then
"$@" &>test.log || exit_code=$?
else
"$@" || exit_code=$?
@@ -78,7 +98,7 @@ print_result()
echo -e "${prefix} $*"
# only output log on failure
- if [[ ${QUIET} == 1 && ${exit_code} != 0 ]]; then
+ if [[ ${OTBR_VERBOSE} == 0 && ${exit_code} != 0 ]]; then
cat test.log
fi
@@ -111,6 +131,7 @@ do_build()
"-DOT_THREAD_VERSION=1.3"
"-DOTBR_DBUS=ON"
"-DOTBR_FEATURE_FLAGS=ON"
+ "-DOTBR_TELEMETRY_DATA_API=ON"
"-DOTBR_WEB=ON"
"-DOTBR_UNSECURE_JOIN=ON"
"-DOTBR_TREL=ON"
MonicaisHer
This PR upgrades OTBR snap to use the latest/stable(thread-reference-20230710) release.
This snap could be installed by the following command:
Checklists for upgrade: /openthread-border-router-snap/snap/local$ tree . . ├── build │ └── bin │ ├── _initrc (no update) │ └── otbr-build.sh (already updated) └── stage └── bin ├── _initrc_install (no update) ├── otbr-agent.sh (not applicable) ├── otbr-setup.sh (no update) └── otbr-web.sh (not applicable)
Testing