Skip to content

Also enable AODV route discovery on source-routed unicasts #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TheJulianJES wants to merge 1 commit into
base: dev
Choose a base branch
from
+11 −2
Draft

Also enable AODV route discovery on source-routed unicasts #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions bellows/zigbee/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,8 +991,15 @@ async def send_packet(self, packet: zigpy.types.ZigbeePacket) -> None:
aps_frame.groupId = t.uint16_t(0x0000)

if self.config[zigpy.config.CONF_SOURCE_ROUTING]:
# Source routing uses address discovery to discover routes
aps_frame.options |= t.EmberApsOption.APS_OPTION_ENABLE_ADDRESS_DISCOVERY
# Concentrator/source-routing uses address discovery; also keep AODV
# route discovery as a fallback for destinations that aren't yet in
# the NCP's source-route table (e.g. immediately after startup,
# before the first MTORR has propagated). Mirrors what
# zigbee-herdsman's ember adapter does for the same reason.
aps_frame.options |= (
t.EmberApsOption.APS_OPTION_ENABLE_ADDRESS_DISCOVERY
| t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY
)
elif zigpy.types.TransmitOptions.FORCE_ROUTE_DISCOVERY in packet.tx_options:
# Forcing route discovery requires retrying
aps_frame.options |= t.EmberApsOption.APS_OPTION_FORCE_ROUTE_DISCOVERY
Expand Down
2 changes: 2 additions & 0 deletions tests/test_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ async def test_send_packet_unicast_source_route(make_app, packet):
options=(
t.EmberApsOption.APS_OPTION_RETRY
| t.EmberApsOption.APS_OPTION_ENABLE_ADDRESS_DISCOVERY
| t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY
),
)

Expand Down Expand Up @@ -909,6 +910,7 @@ async def test_send_packet_unicast_manual_source_route(make_app, packet):
options=(
t.EmberApsOption.APS_OPTION_RETRY
| t.EmberApsOption.APS_OPTION_ENABLE_ADDRESS_DISCOVERY
| t.EmberApsOption.APS_OPTION_ENABLE_ROUTE_DISCOVERY
),
)

Expand Down
Loading