network: make RADVPrefixDelegation enum bitfield

yuwata · yuwata · commit 61c0ef4ff392 · 2020-07-29T05:09:42.000+09:00
This should not change any behavior.
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
@@ -430,9 +430,7 @@ bool link_dhcp6_pd_is_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        return IN_SET(link->network->router_prefix_delegation,
-                      RADV_PREFIX_DELEGATION_DHCP6,
-                      RADV_PREFIX_DELEGATION_BOTH);
+        return link->network->router_prefix_delegation & RADV_PREFIX_DELEGATION_DHCP6;
 }
 
 static bool link_has_preferred_subnet_id(Link *link) {
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
@@ -1394,9 +1394,7 @@ static int link_request_set_addresses(Link *link) {
                         return r;
         }
 
-        if (IN_SET(link->network->router_prefix_delegation,
-                   RADV_PREFIX_DELEGATION_STATIC,
-                   RADV_PREFIX_DELEGATION_BOTH))
+        if (link->network->router_prefix_delegation & RADV_PREFIX_DELEGATION_STATIC)
                 LIST_FOREACH(prefixes, p, link->network->static_prefixes) {
                         _cleanup_(address_freep) Address *address = NULL;
 
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
@@ -650,10 +650,7 @@ int radv_configure(Link *link) {
                         return r;
         }
 
-        if (IN_SET(link->network->router_prefix_delegation,
-                   RADV_PREFIX_DELEGATION_STATIC,
-                   RADV_PREFIX_DELEGATION_BOTH)) {
-
+        if (link->network->router_prefix_delegation & RADV_PREFIX_DELEGATION_STATIC) {
                 LIST_FOREACH(prefixes, p, link->network->static_prefixes) {
                         r = sd_radv_add_prefix(link->radv, p->radv_prefix, false);
                         if (r == -EEXIST)
@@ -673,7 +670,6 @@ int radv_configure(Link *link) {
                         if (r < 0)
                                 return r;
                 }
-
         }
 
         return 0;
diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h
@@ -14,10 +14,10 @@ typedef struct Prefix Prefix;
 typedef struct RoutePrefix RoutePrefix;
 
 typedef enum RADVPrefixDelegation {
-        RADV_PREFIX_DELEGATION_NONE,
-        RADV_PREFIX_DELEGATION_STATIC,
-        RADV_PREFIX_DELEGATION_DHCP6,
-        RADV_PREFIX_DELEGATION_BOTH,
+        RADV_PREFIX_DELEGATION_NONE   = 0,
+        RADV_PREFIX_DELEGATION_STATIC = 1 << 0,
+        RADV_PREFIX_DELEGATION_DHCP6  = 1 << 1,
+        RADV_PREFIX_DELEGATION_BOTH   = RADV_PREFIX_DELEGATION_STATIC | RADV_PREFIX_DELEGATION_DHCP6,
         _RADV_PREFIX_DELEGATION_MAX,
         _RADV_PREFIX_DELEGATION_INVALID = -1,
 } RADVPrefixDelegation;

Original file line number	Diff line number	Diff line change
`@@ -430,9 +430,7 @@ bool link_dhcp6_pd_is_enabled(Link *link) {`
`430`	`430`	`if (!link->network)`
`431`	`431`	`return false;`
`432`	`432`
`433`		`- return IN_SET(link->network->router_prefix_delegation,`
`434`		`- RADV_PREFIX_DELEGATION_DHCP6,`
`435`		`- RADV_PREFIX_DELEGATION_BOTH);`
	`433`	`+ return link->network->router_prefix_delegation & RADV_PREFIX_DELEGATION_DHCP6;`
`436`	`434`	`}`
`437`	`435`
`438`	`436`	`static bool link_has_preferred_subnet_id(Link *link) {`
Original file line number	Diff line number	Diff line change
`@@ -1394,9 +1394,7 @@ static int link_request_set_addresses(Link *link) {`
`1394`	`1394`	`return r;`
`1395`	`1395`	`}`
`1396`	`1396`
`1397`		`- if (IN_SET(link->network->router_prefix_delegation,`
`1398`		`- RADV_PREFIX_DELEGATION_STATIC,`
`1399`		`- RADV_PREFIX_DELEGATION_BOTH))`
	`1397`	`+ if (link->network->router_prefix_delegation & RADV_PREFIX_DELEGATION_STATIC)`
`1400`	`1398`	`LIST_FOREACH(prefixes, p, link->network->static_prefixes) {`
`1401`	`1399`	`_cleanup_(address_freep) Address *address = NULL;`
`1402`	`1400`
Original file line number	Diff line number	Diff line change
`@@ -650,10 +650,7 @@ int radv_configure(Link *link) {`
`650`	`650`	`return r;`
`651`	`651`	`}`
`652`	`652`
`653`		`- if (IN_SET(link->network->router_prefix_delegation,`
`654`		`- RADV_PREFIX_DELEGATION_STATIC,`
`655`		`- RADV_PREFIX_DELEGATION_BOTH)) {`
`656`		`-`
	`653`	`+ if (link->network->router_prefix_delegation & RADV_PREFIX_DELEGATION_STATIC) {`
`657`	`654`	`LIST_FOREACH(prefixes, p, link->network->static_prefixes) {`
`658`	`655`	`r = sd_radv_add_prefix(link->radv, p->radv_prefix, false);`
`659`	`656`	`if (r == -EEXIST)`
`@@ -673,7 +670,6 @@ int radv_configure(Link *link) {`
`673`	`670`	`if (r < 0)`
`674`	`671`	`return r;`
`675`	`672`	`}`
`676`		`-`
`677`	`673`	`}`
`678`	`674`
`679`	`675`	`return 0;`