rtnl_rule: decode fib_rule_uid_range without use of <linux/fib_rules.h>

* rtnl_rule.c (decode_fib_rule_uid_range): Define struct type for
fib_rule_uid_range explicitly.
(decode_fib_rule_uid_range) [!HAVE_STRUCT_FIB_RULE_UID_RANGE]: Remove.
* xlat/fib_rule_flags.in: Add fallback definitions.

References: https://bugzilla.redhat.com/show_bug.cgi?id=1758201

diff --git a/rtnl_rule.c b/rtnl_rule.c
index 7c628dbd7f743fe95c3a24d0271a678e0c11ef45..509715247a6aeb36d81f7021371ca3014100645c 100644 (file)
--- a/rtnl_rule.c
+++ b/rtnl_rule.c
@@ -42,8 +42,10 @@ decode_fib_rule_uid_range(struct tcb *const tcp,
                          const unsigned int len,
                          const void *const opaque_data)
 {
-#ifdef HAVE_STRUCT_FIB_RULE_UID_RANGE
-       struct fib_rule_uid_range range;
+       struct /* fib_rule_uid_range */ {
+               uint32_t start;
+               uint32_t end;
+       } range;
 
        if (len < sizeof(range))
                return false;
@@ -54,9 +56,6 @@ decode_fib_rule_uid_range(struct tcb *const tcp,
        }
 
        return true;
-#else
-       return false;
-#endif
 }
 
 static bool

diff --git a/xlat/fib_rule_flags.in b/xlat/fib_rule_flags.in
index 8f4d42c0dd105cdb667e6c3b17cc3d8bd0eba774..001db9a3c9e7a25d25bb11b647f96744bf2cbfaa 100644 (file)
--- a/xlat/fib_rule_flags.in
+++ b/xlat/fib_rule_flags.in
@@ -1,6 +1,6 @@
-FIB_RULE_PERMANENT
-FIB_RULE_INVERT
-FIB_RULE_UNRESOLVED
-FIB_RULE_IIF_DETACHED
-FIB_RULE_OIF_DETACHED
-FIB_RULE_FIND_SADDR
+FIB_RULE_PERMANENT     0x00000001
+FIB_RULE_INVERT                0x00000002
+FIB_RULE_UNRESOLVED    0x00000004
+FIB_RULE_IIF_DETACHED  0x00000008
+FIB_RULE_OIF_DETACHED  0x00000010
+FIB_RULE_FIND_SADDR    0x00010000