network: tc: use typesafe functions to append netlink attributes

diff --git a/src/network/tc/fq-codel.c b/src/network/tc/fq-codel.c
index 174d70e1f7b2d0266b21b6408315f451521192af..ae872c686fcedac57b92e1519920f0be77680dd5 100644 (file)
--- a/src/network/tc/fq-codel.c
+++ b/src/network/tc/fq-codel.c
@@ -29,11 +29,11 @@ int fair_queuing_controlled_delay_fill_message(Link *link, const FairQueuingCont
         assert(fqcd);
         assert(req);
 
-        r = sd_netlink_message_open_array(req, TCA_OPTIONS);
+        r = sd_netlink_message_open_container_union(req, TCA_OPTIONS, "fq_codel");
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not open container TCA_OPTIONS: %m");
 
-        r = sd_netlink_message_append_data(req, TCA_FQ_CODEL_LIMIT, &fqcd->limit, sizeof(fqcd->limit));
+        r = sd_netlink_message_append_u32(req, TCA_FQ_CODEL_LIMIT, fqcd->limit);
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not append TCA_FQ_CODEL_LIMIT attribute: %m");
 

diff --git a/src/network/tc/tbf.c b/src/network/tc/tbf.c
index 4c15d6b4fd6ff67719828da638a101210939ede7..eff5c1db7c1830e80fbefbee7b196f44363da81d 100644 (file)
--- a/src/network/tc/tbf.c
+++ b/src/network/tc/tbf.c
@@ -74,7 +74,7 @@ int token_buffer_filter_fill_message(Link *link, const TokenBufferFilter *tbf, s
                         return log_link_error_errno(link, r, "Failed to calculate mtu size: %m");
         }
 
-        r = sd_netlink_message_open_array(req, TCA_OPTIONS);
+        r = sd_netlink_message_open_container_union(req, TCA_OPTIONS, "tbf");
         if (r < 0)
                 return log_link_error_errno(link, r, "Could not open container TCA_OPTIONS: %m");
 
@@ -87,7 +87,7 @@ int token_buffer_filter_fill_message(Link *link, const TokenBufferFilter *tbf, s
                 return log_link_error_errno(link, r, "Could not append TCA_TBF_BURST attribute: %m");
 
         if (tbf->rate >= (1ULL << 32)) {
-                r = sd_netlink_message_append_data(req, TCA_TBF_RATE64, &tbf->rate, sizeof(tbf->rate));
+                r = sd_netlink_message_append_u64(req, TCA_TBF_RATE64, tbf->rate);
                 if (r < 0)
                         return log_link_error_errno(link, r, "Could not append TCA_TBF_RATE64 attribute: %m");
         }
@@ -98,12 +98,12 @@ int token_buffer_filter_fill_message(Link *link, const TokenBufferFilter *tbf, s
 
         if (opt.peakrate.rate > 0) {
                 if (tbf->peak_rate >= (1ULL << 32)) {
-                        r = sd_netlink_message_append_data(req, TCA_TBF_PRATE64, &tbf->peak_rate, sizeof(tbf->peak_rate));
+                        r = sd_netlink_message_append_u64(req, TCA_TBF_PRATE64, tbf->peak_rate);
                         if (r < 0)
                                 return log_link_error_errno(link, r, "Could not append TCA_TBF_PRATE64 attribute: %m");
                 }
 
-                r = sd_netlink_message_append_data(req, TCA_TBF_PBURST, &tbf->mtu, sizeof(tbf->mtu));
+                r = sd_netlink_message_append_u32(req, TCA_TBF_PBURST, tbf->mtu);
                 if (r < 0)
                         return log_link_error_errno(link, r, "Could not append TCA_TBF_PBURST attribute: %m");