fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 18:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: cleanup code in NMDeviceBond's update_connection()

Browse source
This commit is contained in:
Thomas Haller 2020-09-09 12:52:52 +02:00
parent b5041c14f4
commit 22ff4bfd18
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/devices/nm-device-bond.c
View file

@ -182,41 +182,44 @@ update_connection (NMDevice *device, NMConnection *connection)
/* Read bond options from sysfs and update the Bond setting to match */
options = nm_setting_bond_get_valid_options (s_bond);
for (; *options; options++) {
for (; options[0]; options++) {
const char *option = options[0];
gs_free char *value = NULL;
char *p;
gs_free char *value = nm_platform_sysctl_master_get_option (nm_device_get_platform (device),
ifindex,
*options);
value = nm_platform_sysctl_master_get_option (nm_device_get_platform (device),
ifindex,
option);
if ( value
&& _nm_setting_bond_get_option_type (s_bond, *options) == NM_BOND_OPTION_TYPE_BOTH) {
&& _nm_setting_bond_get_option_type (s_bond, option) == NM_BOND_OPTION_TYPE_BOTH) {
p = strchr (value, ' ');
if (p)
*p = '\0';
}
if (mode == NM_BOND_MODE_UNKNOWN) {
if (value && nm_streq (*options, NM_SETTING_BOND_OPTION_MODE))
if (value && nm_streq (option, NM_SETTING_BOND_OPTION_MODE))
mode = _nm_setting_bond_mode_from_string (value);
if (mode == NM_BOND_MODE_UNKNOWN)
continue;
}
if (!_nm_setting_bond_option_supported (*options, mode))
if (!_nm_setting_bond_option_supported (option, mode))
continue;
if ( value
&& value[0]
&& !ignore_option (s_bond, *options, value)) {
&& !ignore_option (s_bond, option, value)) {
/* Replace " " with "," for arp_ip_targets from the kernel */
if (strcmp (*options, NM_SETTING_BOND_OPTION_ARP_IP_TARGET) == 0) {
if (nm_streq (option, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
for (p = value; *p; p++) {
if (*p == ' ')
*p = ',';
}
}
nm_setting_bond_add_option (s_bond, *options, value);
nm_setting_bond_add_option (s_bond, option, value);
}
}
}