From: Yu Watanabe Date: Fri, 15 Mar 2024 14:26:36 +0000 (+0900) Subject: icmp6-util: drop unused icmp6_send_router_solicitation() X-Git-Tag: v256-rc1~413^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d112b4454cfafe820dc2021278393c2aff653ac4;p=thirdparty%2Fsystemd.git icmp6-util: drop unused icmp6_send_router_solicitation() --- diff --git a/src/libsystemd-network/icmp6-util-unix.c b/src/libsystemd-network/icmp6-util-unix.c index cbf418025f2..c400e4205ec 100644 --- a/src/libsystemd-network/icmp6-util-unix.c +++ b/src/libsystemd-network/icmp6-util-unix.c @@ -27,15 +27,6 @@ int icmp6_send(int fd, const struct sockaddr_in6 *dst, const struct iovec *iov, return writev(fd, iov, n_iov); } -int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) { - static const struct nd_router_solicit header = { - .nd_rs_type = ND_ROUTER_SOLICIT, - }; - - assert_se(write(s, &header, sizeof(header)) >= 0); - return 0; -} - int icmp6_receive( int fd, void *iov_base, diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index f97c118a783..7b3786e518e 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -102,42 +102,6 @@ int icmp6_send(int fd, const struct sockaddr_in6 *dst, const struct iovec *iov, return 0; } -int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) { - struct sockaddr_in6 dst = { - .sin6_family = AF_INET6, - .sin6_addr = IN6ADDR_ALL_ROUTERS_MULTICAST_INIT, - }; - struct { - struct nd_router_solicit rs; - struct nd_opt_hdr rs_opt; - struct ether_addr rs_opt_mac; - } _packed_ rs = { - .rs.nd_rs_type = ND_ROUTER_SOLICIT, - .rs_opt.nd_opt_type = ND_OPT_SOURCE_LINKADDR, - .rs_opt.nd_opt_len = 1, - }; - struct iovec iov = { - .iov_base = &rs, - .iov_len = sizeof(rs), - }; - struct msghdr msg = { - .msg_name = &dst, - .msg_namelen = sizeof(dst), - .msg_iov = &iov, - .msg_iovlen = 1, - }; - - assert(s >= 0); - assert(ether_addr); - - rs.rs_opt_mac = *ether_addr; - - if (sendmsg(s, &msg, 0) < 0) - return -errno; - - return 0; -} - int icmp6_receive( int fd, void *buffer, diff --git a/src/libsystemd-network/icmp6-util.h b/src/libsystemd-network/icmp6-util.h index 9c3ac463e7e..49cdcba3ff7 100644 --- a/src/libsystemd-network/icmp6-util.h +++ b/src/libsystemd-network/icmp6-util.h @@ -22,7 +22,6 @@ int icmp6_bind(int ifindex, bool is_router); int icmp6_send(int fd, const struct sockaddr_in6 *dst, const struct iovec *iov, size_t n_iov); -int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr); int icmp6_receive( int fd, void *buffer,