colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'forwarding_version_info'

Browse Source 
core: expose the version info capability sync of forwarding support

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2226
This commit is contained in:
Wen Liang
2025-06-24 13:12:28 +00:00
parent e26e965134 6a13e8d369
commit 84299ed17c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/nm-manager.c
View File

@@ -478,7 +478,8 @@ _version_info_get(void)
* Each of the array's elements has 32 bits. This means that capabilities * Each of the array's elements has 32 bits. This means that capabilities
* with index 0-31 goes to element #1, with index 32-63 to element #2, * with index 0-31 goes to element #1, with index 32-63 to element #2,
* with index 64-95 to element #3 and so on. */ * with index 64-95 to element #3 and so on. */
1 << NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE, (1 << NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE)
| (1 << NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING),
}; };
return nm_g_variant_new_au(arr, G_N_ELEMENTS(arr)); return nm_g_variant_new_au(arr, G_N_ELEMENTS(arr));

4
src/libnm-core-public/nm-dbus-interface.h
View File

@@ -100,6 +100,9 @@
* https://issues.redhat.com/browse/RHEL-66262 * https://issues.redhat.com/browse/RHEL-66262
* https://issues.redhat.com/browse/RHEL-67324 * https://issues.redhat.com/browse/RHEL-67324
* *
* @NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING: Indicates that NetworkManager supports
* configuring per-device IPv4 sysctl forwarding setting. Since: 1.56.
*
* The numeric values represent the bit index of the capability. These capabilities * The numeric values represent the bit index of the capability. These capabilities
* can be queried in the "VersionInfo" D-Bus property. * can be queried in the "VersionInfo" D-Bus property.
* *
@@ -107,6 +110,7 @@
*/ */
typedef enum { typedef enum {
NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE = 0, NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE = 0,
NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING = 1,
} NMVersionInfoCapability; } NMVersionInfoCapability;
/** /**