From ac138551cee37ef277739809ab4ed87b3a31f2f9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 9 Nov 2020 16:35:24 +0900 Subject: [PATCH] sd-radv: router lifetime is uint16_t --- src/libsystemd-network/sd-radv.c | 6 +++--- src/systemd/sd-radv.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index 5cef06a8a8a..5ad89ae7de0 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -466,14 +466,14 @@ _public_ int sd_radv_set_hop_limit(sd_radv *ra, uint8_t hop_limit) { return 0; } -_public_ int sd_radv_set_router_lifetime(sd_radv *ra, uint32_t router_lifetime) { +_public_ int sd_radv_set_router_lifetime(sd_radv *ra, uint16_t router_lifetime) { assert_return(ra, -EINVAL); if (ra->state != SD_RADV_STATE_IDLE) return -EBUSY; - /* RFC 4191, Section 2.2, "...If the Router Lifetime is zero, the - preference value MUST be set to (00) by the sender..." */ + /* RFC 4191, Section 2.2, "...If the Router Lifetime is zero, the preference value MUST be set + * to (00) by the sender..." */ if (router_lifetime == 0 && (ra->flags & (0x3 << 3)) != (SD_NDISC_PREFERENCE_MEDIUM << 3)) return -ETIME; diff --git a/src/systemd/sd-radv.h b/src/systemd/sd-radv.h index 55ddee57318..3f6c149d5e2 100644 --- a/src/systemd/sd-radv.h +++ b/src/systemd/sd-radv.h @@ -56,7 +56,7 @@ int sd_radv_set_ifindex(sd_radv *ra, int interface_index); int sd_radv_set_mac(sd_radv *ra, const struct ether_addr *mac_addr); int sd_radv_set_mtu(sd_radv *ra, uint32_t mtu); int sd_radv_set_hop_limit(sd_radv *ra, uint8_t hop_limit); -int sd_radv_set_router_lifetime(sd_radv *ra, uint32_t router_lifetime); +int sd_radv_set_router_lifetime(sd_radv *ra, uint16_t router_lifetime); int sd_radv_set_managed_information(sd_radv *ra, int managed); int sd_radv_set_other_information(sd_radv *ra, int other); int sd_radv_set_preference(sd_radv *ra, unsigned preference); -- 2.47.3