Skip to content

Commit

Permalink
Pull request #187: Update openthread stack ccf8ea6->13df0374d
Browse files Browse the repository at this point in the history
Merge in WMN_STACKS/openthread from task/update-openthread-commit to develop/22q4

* commit '3a217e0affb29c190b5312dca539fdb8c315b19a': (34 commits)
  [routing-manager] fix prefix comparison in `EvaluateOnLinkPrefix()` (openthread#8192)
  [examples] make built-in otPlatCalloc and otPlatFree definitions weak (openthread#8188)
  [test] add unit test `test_srp_server` (openthread#8163)
  [srp-server] add `AutoEnableMode` to give control to BR (openthread#8129)
  [gh-action] add new case to run unit test with `toranj` config (openthread#8164)
  [cmake] add separate `tcplp` libraries for `ftd` and `mtd` (openthread#8175)
  [routing-manager] add `Nat64PrefixManager` nested class. (openthread#8178)
  [harness-simulation] update `deviceInputFields.xml` automatically (openthread#8177)
  [harness-simulation] change config format from JSON to YAML (openthread#8176)
  [cli-tcp] use TCP Circular Send Buffer in TCP CLI tool and test (openthread#7867)
  [tcp] implement TCP Circular Send Buffer (openthread#7867)
  [tcp] suppress clang-tidy for re-declared TCPlp functions (openthread#7867)
  [cc2538] move to openthread/ot-cc2538 (openthread#8169)
  [thci] wait for connection reset in `powerDown` (openthread#8166)
  [dtls] fix DTLS connection issues (openthread#8168)
  [github-actions] use `concurrency` feature to cancel oustanding jobs (openthread#8154)
  [thci] fix `mdns_query` incorrect `ip6tables` rules (openthread#8159)
  [nat64] implement functions for NAT64 on the client side (openthread#8126)
  [thci] allow custom otbr-agent log dumping command via `Param9` (openthread#8137)
  [cmake] add files allowing direct integration to Zephyr's west (openthread#8143)
  ...
  • Loading branch information
suveshpratapa committed Sep 23, 2022
2 parents 739a3c8 + 3a217e0 commit 88a56dc
Show file tree
Hide file tree
Showing 125 changed files with 5,009 additions and 5,136 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Build

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

pretty:
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -180,6 +176,8 @@ jobs:
sudo pip3 install -U cmake==3.10.3
cmake --version | grep 3.10.3
- name: Build
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
run: |
export PATH=/tmp/${{ matrix.gcc_extract_dir }}/bin:$PATH
script/check-arm-build
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Docker

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

buildx:
name: buildx-${{ matrix.docker_name }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@
#

name: CIFuzz

on: [pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

jobs:
Fuzzing:
runs-on: ubuntu-20.04
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/makefile-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Makefile Check

on: [push, pull_request]

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

jobs:
makefile-check:
runs-on: ubuntu-20.04
steps:
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/otbr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Border Router

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

backbone-router:
runs-on: ubuntu-20.04
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/otci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: OTCI

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

cli-sim:
name: cli-sim VIRTUAL_TIME=${{ matrix.virtual_time }}
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/otns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ name: OTNS

on: [push, pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

env:
COVERAGE: 1
REFERENCE_DEVICE: 1
Expand All @@ -40,14 +44,6 @@ env:

jobs:

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"

unittests:
name: Unittests
runs-on: ubuntu-20.04
Expand Down
23 changes: 15 additions & 8 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: POSIX

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

expects-linux:
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -110,6 +106,17 @@ jobs:
with:
name: cov-expects-linux-2
path: tmp/coverage.info

tcplp-buffering:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build
run: make -C third_party/tcplp/lib/test/
- name: Run
run: third_party/tcplp/lib/test/test_all

thread-cert:
runs-on: ubuntu-20.04
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/simulation-1.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Simulation 1.1

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

distcheck:
runs-on: ubuntu-20.04
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/simulation-1.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Simulation 1.3

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

thread-1-3:
name: thread-1-3-${{ matrix.compiler.c }}-${{ matrix.arch }}
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Size

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

size-report:
runs-on: ubuntu-20.04
Expand Down
33 changes: 25 additions & 8 deletions .github/workflows/toranj.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: Toranj

on: [push, pull_request]

jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
jobs:

toranj-ncp:
name: toranj-ncp-${{ matrix.TORANJ_RADIO }}
Expand Down Expand Up @@ -123,6 +119,27 @@ jobs:
name: cov-toranj-cli-${{ matrix.TORANJ_RADIO }}
path: tmp/coverage.info

toranj-unittest:
name: toranj-unittest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Bootstrap
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get --no-install-recommends install -y clang-10 clang++-10 ninja-build python3-setuptools python3-wheel llvm lcov
sudo apt-get --no-install-recommends install -y g++-multilib libreadline-dev:i386 libncurses-dev:i386
python3 -m pip install -r tests/scripts/thread-cert/requirements.txt
- name: Build & Run
run: |
./tests/toranj/build.sh cmake
ninja test
upload-coverage:
needs:
- toranj-ncp
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ name: API Version

on: [pull_request]

jobs:
cancel-previous-runs:
runs-on: ubuntu-20.04
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "github.ref != 'refs/heads/main'"
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || (github.repository == 'openthread/openthread' && github.run_id) || github.ref }}
cancel-in-progress: true

jobs:
api-version:
runs-on: ubuntu-20.04
steps:
Expand Down
2 changes: 2 additions & 0 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ LOCAL_SRC_FILES := \
src/core/api/srp_server_api.cpp \
src/core/api/tasklet_api.cpp \
src/core/api/tcp_api.cpp \
src/core/api/tcp_ext_api.cpp \
src/core/api/thread_api.cpp \
src/core/api/thread_ftd_api.cpp \
src/core/api/trel_api.cpp \
Expand Down Expand Up @@ -317,6 +318,7 @@ LOCAL_SRC_FILES := \
src/core/net/srp_client.cpp \
src/core/net/srp_server.cpp \
src/core/net/tcp6.cpp \
src/core/net/tcp6_ext.cpp \
src/core/net/udp6.cpp \
src/core/radio/radio.cpp \
src/core/radio/radio_callbacks.cpp \
Expand Down
11 changes: 4 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -828,14 +828,14 @@ AC_MSG_CHECKING([whether to build examples])

AC_ARG_WITH(examples,
[AS_HELP_STRING([--with-examples=TARGET],
[Build example applications for one of: simulation, cc2538 @<:@default=no@:>@.
[Build example applications for one of: simulation @<:@default=no@:>@.
Note that building example applications also builds the associated OpenThread platform libraries
and any third_party libraries needed to support the examples.])],
[
case "${with_examples}" in
no)
;;
simulation|cc2538)
simulation)
;;
*)
AC_MSG_RESULT(ERROR)
Expand All @@ -848,7 +848,6 @@ AC_ARG_WITH(examples,
AM_CONDITIONAL([OPENTHREAD_ENABLE_EXAMPLES], [test ${with_examples} != "no"])

AM_CONDITIONAL([OPENTHREAD_EXAMPLES_SIMULATION],[test "${with_examples}" = "simulation"])
AM_CONDITIONAL([OPENTHREAD_EXAMPLES_CC2538], [test "${with_examples}" = "cc2538"])

AM_COND_IF([OPENTHREAD_EXAMPLES_SIMULATION], CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_EXAMPLES_SIMULATION=1", CPPFLAGS="${CPPFLAGS} -DOPENTHREAD_EXAMPLES_SIMULATION=0")

Expand All @@ -869,11 +868,11 @@ AC_MSG_CHECKING([whether to build platform libraries])

AC_ARG_WITH(platform,
[AS_HELP_STRING([--with-platform=TARGET],
[Build OpenThread platform libraries for one of: cc2538, posix, simulation @<:@default=simulation@:>@.])],
[Build OpenThread platform libraries for one of: posix, simulation @<:@default=simulation@:>@.])],
[
# Make sure the given target is valid.
case "${with_platform}" in
no|cc2538|posix|simulation)
no|posix|simulation)
;;
*)
AC_MSG_RESULT(ERROR)
Expand Down Expand Up @@ -904,7 +903,6 @@ AM_CONDITIONAL([OPENTHREAD_ENABLE_PLATFORM], [test ${with_platform} != "no"])

OPENTHREAD_ENABLE_PLATFORM=${with_platform}

AM_CONDITIONAL([OPENTHREAD_PLATFORM_CC2538], [test "${with_platform}" = "cc2538"])
AM_CONDITIONAL([OPENTHREAD_PLATFORM_POSIX], [test "${with_platform}" = "posix"])
AM_CONDITIONAL([OPENTHREAD_PLATFORM_SIMULATION],[test "${with_platform}" = "simulation"])

Expand Down Expand Up @@ -1047,7 +1045,6 @@ examples/apps/Makefile
examples/apps/cli/Makefile
examples/apps/ncp/Makefile
examples/platforms/Makefile
examples/platforms/cc2538/Makefile
examples/platforms/simulation/Makefile
examples/platforms/utils/Makefile
tools/Makefile
Expand Down
Loading

0 comments on commit 88a56dc

Please sign in to comment.