Merge pull request #31555 from yuwata/sd-ndisc-trivial-cleanups

sd-ndisc: trivial cleanups

src/libsystemd-network/ndisc-protocol.c

@@ -22,6 +22,7 @@ int ndisc_option_parse(
         if (p->raw_size - offset < sizeof(struct nd_opt_hdr))
                 return -EBADMSG;
 
+        assert_cc(alignof(struct nd_opt_hdr) == 1);
         const struct nd_opt_hdr *hdr = (const struct nd_opt_hdr*) (p->raw_packet + offset);
         if (hdr->nd_opt_len == 0)
                 return -EBADMSG;

src/libsystemd-network/ndisc-protocol.h

@@ -26,7 +26,7 @@ struct nd_opt_prefix64_info {
         uint8_t length;
         uint16_t lifetime_and_plc;
         uint8_t prefix[12];
-} __attribute__((__packed__));
+} _packed_;
 
 int pref64_plc_to_prefix_length(uint16_t plc, uint8_t *ret);
 int pref64_prefix_length_to_plc(uint8_t prefixlen, uint8_t *ret);

src/libsystemd-network/sd-ndisc-router.c

@@ -90,17 +90,6 @@ DEFINE_GET_TIMESTAMP(rdnss_get_lifetime);
 DEFINE_GET_TIMESTAMP(dnssl_get_lifetime);
 DEFINE_GET_TIMESTAMP(prefix64_get_lifetime);
 
-int sd_ndisc_router_get_raw(sd_ndisc_router *rt, const void **ret, size_t *ret_size) {
-        assert_return(rt, -EINVAL);
-        assert_return(ret, -EINVAL);
-        assert_return(ret_size, -EINVAL);
-
-        *ret = NDISC_ROUTER_RAW(rt);
-        *ret_size = rt->packet->raw_size;
-
-        return 0;
-}
-
 static bool pref64_option_verify(const struct nd_opt_prefix64_info *p, size_t length) {
         uint16_t lifetime_and_plc;
 

src/systemd/sd-ndisc-router.h

@@ -34,7 +34,6 @@ _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_ndisc_router, sd_ndisc_router_unref);
 
 int sd_ndisc_router_get_address(sd_ndisc_router *rt, struct in6_addr *ret);
 int sd_ndisc_router_get_timestamp(sd_ndisc_router *rt, clockid_t clock, uint64_t *ret);
-int sd_ndisc_router_get_raw(sd_ndisc_router *rt, const void **ret, size_t *ret_size);
 
 int sd_ndisc_router_get_hop_limit(sd_ndisc_router *rt, uint8_t *ret);
 int sd_ndisc_router_get_flags(sd_ndisc_router *rt, uint64_t *ret);