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

platform: detect kernel support for FRA_IP_PROTO, FRA_SPORT_RANGE, FRA_DPORT_RANGE

Browse Source 
(cherry picked from commit 91252bb2fb)
This commit is contained in:
Thomas Haller
2019-04-17 10:23:03 +02:00
parent 6bfce3587e
commit 4127583189
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/nm-linux-platform.c
View File

@@ -3431,6 +3431,18 @@ _new_from_nl_routing_rule (struct nlmsghdr *nlh, gboolean id_only)
nla_memcpy_checked_size (&props->sport_range, tb[FRA_SPORT_RANGE], sizeof (props->sport_range)); nla_memcpy_checked_size (&props->sport_range, tb[FRA_SPORT_RANGE], sizeof (props->sport_range));
nla_memcpy_checked_size (&props->dport_range, tb[FRA_DPORT_RANGE], sizeof (props->dport_range)); nla_memcpy_checked_size (&props->dport_range, tb[FRA_DPORT_RANGE], sizeof (props->dport_range));
if (!_nm_platform_kernel_support_detected (NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_IP_PROTO)) {
/* support for FRA_IP_PROTO, FRA_SPORT_RANGE, and FRA_DPORT_RANGE was added together
* by bfff4862653bb96001ab57c1edd6d03f48e5f035, kernel 4.17, 4 June 2018.
*
* Unfortunately, a missing attribute does not tell us anything about support.
* We can only tell for sure when we have support, but not when we don't have. */
if ( tb[FRA_IP_PROTO]
|| tb[FRA_SPORT_RANGE]
|| tb[FRA_DPORT_RANGE])
_nm_platform_kernel_support_init (NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_IP_PROTO, 1);
}
G_STATIC_ASSERT_EXPR (sizeof (NMFibRuleUidRange) == 8); G_STATIC_ASSERT_EXPR (sizeof (NMFibRuleUidRange) == 8);
G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (NMFibRuleUidRange, start) == 0); G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (NMFibRuleUidRange, start) == 0);
G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (NMFibRuleUidRange, end) == 4); G_STATIC_ASSERT_EXPR (G_STRUCT_OFFSET (NMFibRuleUidRange, end) == 4);

5
src/platform/nm-platform.c
View File

@@ -301,6 +301,11 @@ static const struct {
.name = "FRA_PROTOCOL", .name = "FRA_PROTOCOL",
.desc = "FRA_PROTOCOL attribute for policy routing rules", .desc = "FRA_PROTOCOL attribute for policy routing rules",
}, },
[NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_IP_PROTO] = {
.compile_time_default = (FRA_MAX >= 22 /* FRA_IP_PROTO */),
.name = "FRA_IP_PROTO",
.desc = "FRA_IP_PROTO, FRA_SPORT_RANGE, FRA_DPORT_RANGE attributes for policy routing rules",
},
}; };
int int

5
src/platform/nm-platform.h
View File

@@ -849,6 +849,11 @@ typedef enum {
NM_PLATFORM_KERNEL_SUPPORT_TYPE_USER_IPV6LL, NM_PLATFORM_KERNEL_SUPPORT_TYPE_USER_IPV6LL,
NM_PLATFORM_KERNEL_SUPPORT_TYPE_RTA_PREF, NM_PLATFORM_KERNEL_SUPPORT_TYPE_RTA_PREF,
NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_PROTOCOL, NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_PROTOCOL,
/* this also includes FRA_SPORT_RANGE and FRA_DPORT_RANGE which
* were added at the same time. */
NM_PLATFORM_KERNEL_SUPPORT_TYPE_FRA_IP_PROTO,
_NM_PLATFORM_KERNEL_SUPPORT_NUM, _NM_PLATFORM_KERNEL_SUPPORT_NUM,
} NMPlatformKernelSupportType; } NMPlatformKernelSupportType;