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

Jump to bottom

Improve network management #1478

Merged
merged 11 commits into from
Oct 21, 2024
Merged

Improve network management #1478

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
787f123
set java version to 17 to enable Text Blocks
crschardt Oct 20, 2024
4778007
More robust network management
crschardt Oct 20, 2024
2b00200
improve message
crschardt Oct 20, 2024
766ae88
quote connections when bringing up
crschardt Oct 20, 2024
6aa4df7
try configured interface if none found
crschardt Oct 20, 2024
d7b27a7
minor clean up
crschardt Oct 20, 2024
8233629
reinitialize network when device connects
crschardt Oct 20, 2024
4763ed3
one single space ☹
crschardt Oct 20, 2024
8c063a7
check for null
crschardt Oct 20, 2024
54ea6d7
allow checking if a task is active
crschardt Oct 21, 2024
a710397
remove things not needed for RaspberryPi
crschardt Oct 21, 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
2 changes: 1 addition & 1 deletion photon-client/src/stores/settings/GeneralSettingsStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const useSettingsStore = defineStore("settings", {
return this.general.gpuAcceleration !== undefined;
},
networkInterfaceNames(): string[] {
return this.network.networkInterfaceNames.map((i) => i.connName);
return this.network.networkInterfaceNames.map((i) => i.devName);
}
},
actions: {
Expand Down
16 changes: 3 additions & 13 deletions photon-core/src/main/java/org/photonvision/common/configuration/NetworkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.Map;
import org.photonvision.common.hardware.Platform;
import org.photonvision.common.networking.NetworkMode;
import org.photonvision.common.networking.NetworkUtils;
import org.photonvision.common.util.file.JacksonUtils;

public class NetworkConfig {
Expand All @@ -50,23 +49,14 @@ public class NetworkConfig {
@JsonIgnore public static final String NM_IFACE_STRING = "${interface}";
@JsonIgnore public static final String NM_IP_STRING = "${ipaddr}";

public String networkManagerIface;
public String networkManagerIface = "";
// TODO: remove these strings if no longer needed
public String setStaticCommand =
"nmcli con mod ${interface} ipv4.addresses ${ipaddr}/8 ipv4.method \"manual\" ipv6.method \"disabled\"";
public String setDHCPcommand =
"nmcli con mod ${interface} ipv4.method \"auto\" ipv6.method \"disabled\"";

public NetworkConfig() {
if (Platform.isLinux()) {
// Default to the name of the first Ethernet connection. Otherwise, "Wired connection 1" is a
// reasonable guess
this.networkManagerIface =
NetworkUtils.getAllWiredInterfaces().stream()
.map(it -> it.connName)
.findFirst()
.orElse("Wired connection 1");
}

// We can (usually) manage networking on Linux devices, and if we can, we should try to. Command
// line inhibitions happen at a level above this class
setShouldManage(deviceCanManageNetwork());
Expand Down Expand Up @@ -112,7 +102,7 @@ public Map<String, Object> toHashMap() {

@JsonIgnore
public String getPhysicalInterfaceName() {
return NetworkUtils.getNMinfoForConnName(this.networkManagerIface).devName;
return this.networkManagerIface;
}

@JsonIgnore
Expand Down
2 changes: 1 addition & 1 deletion photon-core/src/main/java/org/photonvision/common/configuration/PhotonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public Map<String, Object> toHashMap() {

// Hack active interfaces into networkSettings
var netConfigMap = networkConfig.toHashMap();
netConfigMap.put("networkInterfaceNames", NetworkUtils.getAllWiredInterfaces());
netConfigMap.put("networkInterfaceNames", NetworkUtils.getAllActiveWiredInterfaces());
netConfigMap.put("networkingDisabled", NetworkManager.getInstance().networkingIsDisabled);

settingsSubmap.put("networkSettings", netConfigMap);
Expand Down
Loading
Loading