timesyncd: move the generic sockaddr_equal() call to socket-util.h
This commit is contained in:
parent
c0c743cb3d
commit
f01e5736f1
|
@ -711,3 +711,19 @@ static const char* const socket_address_bind_ipv6_only_table[_SOCKET_ADDRESS_BIN
|
|||
};
|
||||
|
||||
DEFINE_STRING_TABLE_LOOKUP(socket_address_bind_ipv6_only, SocketAddressBindIPv6Only);
|
||||
|
||||
bool sockaddr_equal(const union sockaddr_union *a, const union sockaddr_union *b) {
|
||||
assert(a);
|
||||
assert(b);
|
||||
|
||||
if (a->sa.sa_family != b->sa.sa_family)
|
||||
return false;
|
||||
|
||||
if (a->sa.sa_family == AF_INET)
|
||||
return a->in.sin_addr.s_addr == b->in.sin_addr.s_addr;
|
||||
|
||||
if (a->sa.sa_family == AF_INET6)
|
||||
return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr)) == 0;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -109,3 +109,5 @@ SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *
|
|||
|
||||
int netlink_family_to_string_alloc(int b, char **s);
|
||||
int netlink_family_from_string(const char *s) _pure_;
|
||||
|
||||
bool sockaddr_equal(const union sockaddr_union *a, const union sockaddr_union *b);
|
||||
|
|
|
@ -536,22 +536,6 @@ static void manager_adjust_poll(Manager *m, double offset, bool spike) {
|
|||
}
|
||||
}
|
||||
|
||||
static bool sockaddr_equal(union sockaddr_union *a, union sockaddr_union *b) {
|
||||
assert(a);
|
||||
assert(b);
|
||||
|
||||
if (a->sa.sa_family != b->sa.sa_family)
|
||||
return false;
|
||||
|
||||
if (a->sa.sa_family == AF_INET)
|
||||
return a->in.sin_addr.s_addr == b->in.sin_addr.s_addr;
|
||||
|
||||
if (a->sa.sa_family == AF_INET6)
|
||||
return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr)) == 0;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static int manager_receive_response(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
|
||||
Manager *m = userdata;
|
||||
struct ntp_msg ntpmsg;
|
||||
|
|
Loading…
Reference in a new issue