Skip to content
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

[PD] make PD upstream interface consistent with infra_if name #2644

Closed
wants to merge 8 commits into from
Closed

[PD] make PD upstream interface consistent with infra_if name #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b156d6
pd daemon service: ensure dhcp6_pd_daemon starts after otbr-agent
yangsong-cnyn Nov 14, 2024
17e17ef
pd daemon service: reconnect to dbus after otbr-agent reset it
yangsong-cnyn Nov 15, 2024
b661ace
Merge branch 'main' into pd_daemon
yangsong-cnyn Nov 15, 2024
88e1433
pd daemon service: reconnect to dbus after otbr-agent reset it
yangsong-cnyn Nov 18, 2024
e750ad7
Merge branch 'main' into pd_daemon
yangsong-cnyn Nov 20, 2024
4b03dee
[PD] pd daemon service: reconnect to dbus on otbr-agent reload
yangsong-cnyn Nov 20, 2024
e5095fa
make PD upstream interface consistent with infra_if name
yangsong-cnyn Dec 18, 2024
649fbd7
Merge branch 'openthread:main' into pd_daemon
yangsong-cnyn Dec 18, 2024
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
3 changes: 1 addition & 2 deletions script/_dhcpv6_pd_ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
# This script manipulates DHCPv6-PD-REF configuration.
#

# TODO: set the upstream interface according to the environment variables of `script/setup`.
UPSTREAM_INTERFACE="eth0"
UPSTREAM_INTERFACE=${INFRA_IF_NAME}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I checked, INFRA_IF_NAME is defined as a environment variable only in dockerfile for harness simulation. That means in other cases this variable will be undefined. Is it correct? Or we need to include other bash script from here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct, Li. Thanks for figuring it out.


DHCPCD_ENTER_HOOK="/etc/dhcpcd.enter-hook"
DHCPCD_EXIT_HOOK="/etc/dhcpcd.exit-hook"
Expand Down
3 changes: 1 addition & 2 deletions script/reference-device/dhcpcd.enter-hook
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#

# TODO: set the upstream interface according to the environment variables of `script/setup`.
UPSTREAM_INTERFACE="eth0"
UPSTREAM_INTERFACE=${INFRA_IF_NAME}
WPAN_INTERFACE="wpan0"

RADVD_CONF="/etc/radvd.conf"
Expand Down
3 changes: 1 addition & 2 deletions script/reference-device/dhcpcd.exit-hook
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#

# TODO: set the upstream interface according to the environment variables of `script/setup`.
UPSTREAM_INTERFACE="eth0"
UPSTREAM_INTERFACE=${INFRA_IF_NAME}
WPAN_INTERFACE="wpan0"

RADVD_CONF="/etc/radvd.conf"
Expand Down
Loading