From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 17 Aug 2024 04:02:06 +0000 (+0900)
Subject: network/address-label: split out address_label_fill_message()
X-Git-Tag: v257-rc1~670^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b2e07ca4c30c1877c6d74d9989bd9762f131063;p=thirdparty%2Fsystemd.git

network/address-label: split out address_label_fill_message()

No functional change, just refactoring and preparation for later
commits.
---

diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c
index 7497eff36c5..eea37acce65 100644
--- a/src/network/networkd-address-label.c
+++ b/src/network/networkd-address-label.c
@@ -102,6 +102,23 @@ static int address_label_configure_handler(
         return 1;
 }
 
+static int address_label_fill_message(AddressLabel *label, sd_netlink_message *m) {
+        int r;
+
+        assert(label);
+        assert(m);
+
+        r = sd_rtnl_message_addrlabel_set_prefixlen(m, label->prefixlen);
+        if (r < 0)
+                return r;
+
+        r = sd_netlink_message_append_u32(m, IFAL_LABEL, label->label);
+        if (r < 0)
+                return r;
+
+        return sd_netlink_message_append_in6_addr(m, IFA_ADDRESS, &label->prefix);
+}
+
 static int address_label_configure(AddressLabel *label, Link *link, Request *req) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
@@ -118,15 +135,7 @@ static int address_label_configure(AddressLabel *label, Link *link, Request *req
         if (r < 0)
                 return r;
 
-        r = sd_rtnl_message_addrlabel_set_prefixlen(m, label->prefixlen);
-        if (r < 0)
-                return r;
-
-        r = sd_netlink_message_append_u32(m, IFAL_LABEL, label->label);
-        if (r < 0)
-                return r;
-
-        r = sd_netlink_message_append_in6_addr(m, IFA_ADDRESS, &label->prefix);
+        r = address_label_fill_message(label, m);
         if (r < 0)
                 return r;