From 04a25cc425ff9651d375fbc14eeca3ebe48b5c20 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 15 Jan 2024 11:59:21 +0900 Subject: [PATCH] network/nexthop: reorder elements in NextHop --- src/network/networkd-nexthop.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h index bc2bacfa40d..18b30e28be8 100644 --- a/src/network/networkd-nexthop.h +++ b/src/network/networkd-nexthop.h @@ -26,15 +26,20 @@ typedef struct NextHop { unsigned n_ref; - uint8_t protocol; - int ifindex; - uint32_t id; - bool blackhole; + /* struct nhmsg */ int family; - union in_addr_union gw; + uint8_t protocol; uint8_t flags; - int onlink; /* Only used in conf parser and nexthop_section_verify(). */ - Hashmap *group; + + /* attributes */ + uint32_t id; /* NHA_ID */ + Hashmap *group; /* NHA_GROUP */ + bool blackhole; /* NHA_BLACKHOLE */ + int ifindex; /* NHA_OIF */ + union in_addr_union gw; /* NHA_GATEWAY */ + + /* Only used in conf parser and nexthop_section_verify(). */ + int onlink; } NextHop; NextHop* nexthop_ref(NextHop *nexthop); -- 2.47.3