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

Enable link-local in parallel with DHCP #1550

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Enable link-local in parallel with DHCP #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5b21e1d
add connExists()
crschardt Nov 10, 2024
9d233e9
add link-local and update dhcp conn each time its activated
crschardt Nov 10, 2024
73cc002
this works
crschardt Nov 11, 2024
0bcce11
Revert "add connExists()"
crschardt Nov 11, 2024
7a90692
remove out-of-place comment
crschardt Nov 11, 2024
0bf9d27
wpiformat
crschardt Nov 11, 2024
61bb886
Merge remote-tracking branch 'upstream/master' into enable-link-local…
crschardt Nov 11, 2024
729af7a
Merge branch 'master' into enable-link-local-with-dhcp
crschardt Nov 14, 2024
ae11b50
Merge branch 'master' into enable-link-local-with-dhcp
crschardt Dec 13, 2024
31668bf
Merge branch 'enable-link-local-with-dhcp' of https://github.com/crsc…
crschardt Dec 13, 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
23 changes: 16 additions & 7 deletions photon-core/src/main/java/org/photonvision/common/networking/NetworkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,27 +169,36 @@ private void setConnectionDHCP(NetworkConfig config) {
String connName = "dhcp-" + config.networkManagerIface;

String addDHCPcommand = """
nmcli connection add
nmcli conn add
con-name "${connection}"
ifname "${interface}"
type ethernet
autoconnect no
""".replaceAll("[\\n]", " ");

String modDHCPCommand = """
nmcli conn modify "${connection}"
autoconnect yes
ipv4.method auto
ipv4.dhcp-timeout infinity
ipv4.link-local enabled
ipv6.method disabled
""";
addDHCPcommand = addDHCPcommand.replaceAll("[\\n]", " ");
""".replaceAll("[\\n]", " ");

var shell = new ShellExec();
try {
if (NetworkUtils.connDoesNotExist(connName)) {
// create connection
logger.info("Creating the DHCP connection " + connName );
logger.info("Updating the DHCP connection " + connName );
shell.executeBashCommand(
addDHCPcommand
.replace("${connection}", connName)
.replace("${interface}", config.networkManagerIface)
);
);
}
logger.info("Updating the DHCP connection " + connName );
shell.executeBashCommand(
modDHCPCommand
.replace("${connection}", connName)
);
// activate it
logger.info("Activating the DHCP connection " + connName );
shell.executeBashCommand("nmcli connection up \"${connection}\"".replace("${connection}", connName), false);
Expand Down
3 changes: 1 addition & 2 deletions photon-core/src/main/java/org/photonvision/common/networking/NetworkUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ public static NMDeviceInfo getNMinfoForDevName(String devName) {
public static boolean connDoesNotExist(String connName) {
var shell = new ShellExec(true, true);
try {
// set nmcli back to DHCP, and re-run dhclient -- this ought to grab a new IP address
shell.executeBashCommand("nmcli -f GENERAL.STATE connection show \"" + connName + "\"");
shell.executeBashCommand("nmcli -g GENERAL.STATE connection show \"" + connName + "\"");
return (shell.getExitCode() == 10);
} catch (Exception e) {
logger.error("Exception from nmcli!");
Expand Down
Loading