Skip to content

Commit

Permalink
[nat64] enable upstream DNS forwarding when NAT64 is enabled (#1806)
Browse files Browse the repository at this point in the history
  • Loading branch information
@erjiaqing
erjiaqing committed Apr 3, 2023
1 parent 89e8761 commit 4cc6610
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/border_router.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,56 +50,56 @@ jobs:
matrix:
include:
- name: "Border Router (mDNSResponder)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 0
otbr_mdns: "mDNSResponder"
cert_scripts: ./tests/scripts/thread-cert/border_router/*.py
packet_verification: 1
- name: "Border Router (Avahi)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 0
otbr_mdns: "avahi"
cert_scripts: ./tests/scripts/thread-cert/border_router/*.py
packet_verification: 1
- name: "Border Router TREL (mDNSResponder)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=ON"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=ON -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 0
otbr_mdns: "mDNSResponder"
cert_scripts: ./tests/scripts/thread-cert/border_router/*.py
packet_verification: 2
- name: "Border Router TREL (Avahi)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=ON"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=ON -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 0
otbr_mdns: "avahi"
cert_scripts: ./tests/scripts/thread-cert/border_router/*.py
packet_verification: 2
- name: "Border Router MATN (mDNSResponder)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 0
otbr_mdns: "mDNSResponder"
cert_scripts: ./tests/scripts/thread-cert/border_router/MATN/*.py
packet_verification: 1
- name: "Border Router NAT64 (mDNSResponder)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 1
otbr_mdns: "mDNSResponder"
cert_scripts: ./tests/scripts/thread-cert/border_router/nat64/*.py
packet_verification: 1
- name: "Backbone Router"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_TREL=OFF -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 0
nat64: 0
otbr_mdns: "mDNSResponder"
cert_scripts: ./tests/scripts/thread-cert/backbone/*.py
packet_verification: 1
- name: "Border Router TREL with FEATURE_FLAG (avahi)"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_FEATURE_FLAGS=ON -DOTBR_TREL=ON"
otbr_options: "-DOT_DUA=ON -DOT_ECDSA=ON -DOT_MLR=ON -DOT_SERVICE=ON -DOT_SRP_SERVER=ON -DOTBR_COVERAGE=ON -DOTBR_DUA_ROUTING=ON -DOTBR_FEATURE_FLAGS=ON -DOTBR_TREL=ON -DOTBR_DNS_UPSTREAM_QUERY=ON"
border_routing: 1
nat64: 0
otbr_mdns: "avahi"
Expand Down
6 changes: 6 additions & 0 deletions script/_otbr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ otbr_install()
)
fi

if with NAT64; then
otbr_options+=(
"-DOTBR_DNS_UPSTREAM_QUERY=ON"
)
fi

(./script/cmake-build "${otbr_options[@]}" \
&& cd "${OTBR_TOP_BUILDDIR}" \
&& ninja \
Expand Down
2 changes: 1 addition & 1 deletion third_party/openthread/repo
Submodule repo updated 22 files
+1 −1 include/openthread/instance.h
+2 −0 include/openthread/thread.h
+6 −1 script/test
+3 −1 src/core/mac/sub_mac.cpp
+12 −0 src/core/thread/discover_scanner.cpp
+5 −2 src/core/thread/mesh_forwarder.cpp
+1 −0 src/core/thread/mle_router.cpp
+1 −0 src/posix/platform/resolver.cpp
+27 −6 tests/scripts/expect/_common.exp
+146 −0 tests/scripts/expect/cli-discover.exp
+4 −30 tests/scripts/expect/cli-multicast-loop.exp
+0 −36 tests/scripts/expect/cli-scan.exp
+1 −6 tests/scripts/expect/posix-rcp-restoration.exp
+1 −6 tests/scripts/expect/posix-scan-tx-to-sleep.exp
+4 −27 tests/scripts/expect/tun-realm-local-multicast.exp
+1 −6 tests/scripts/expect/tun-sntp.exp
+1 −8 tests/scripts/expect/tun-udp.exp
+135 −0 tests/scripts/thread-cert/border_router/nat64/test_upstream_dns.py
+1 −0 tests/scripts/thread-cert/border_router/test_dnssd_instance_name_with_space.py
+1 −0 tests/scripts/thread-cert/border_router/test_dnssd_server.py
+2 −0 tests/scripts/thread-cert/border_router/test_dnssd_server_multi_border_routers.py
+15 −1 tests/scripts/thread-cert/node.py

0 comments on commit 4cc6610

Please sign in to comment.