diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-11 16:31:52 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-11 16:31:52 +0900 |
| commit | 92c7593f5e68e4f5d430b48b9309c97f9163a8cf (patch) | |
| tree | cdd877b245ac22c2e7dc5c8ae3d3e475388f70ab | |
| parent | 42b5f7dd322dd791111241bf243fde3d425949a5 (diff) | |
| download | systemd-92c7593f5e68e4f5d430b48b9309c97f9163a8cf.tar.gz | |
network: tc: use typesafe functions to append netlink attributes
| -rw-r--r-- | src/network/tc/fq-codel.c | 4 | ||||
| -rw-r--r-- | src/network/tc/tbf.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/network/tc/fq-codel.c b/src/network/tc/fq-codel.c index 174d70e1f7..ae872c686f 100644 --- 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 4c15d6b4fd..eff5c1db7c 100644 --- 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"); |