From ad1428f29196bcc88ae382ee67ff705928e2be24 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 5 May 2022 20:25:37 -0700 Subject: [PATCH] resolve: Use sockaddr pointer type for bind() bind() expects sockaddr* but SERVER_ADDRESS is sockaddr_in type struct Fixes errors with clang e.g. ../git/src/resolve/test-resolved-stream.c:112:32: error: incompatible pointer types passing 'struct sockaddr_in *' to parameter of type 'const struct sockaddr *' [-Werror,-Wincompatible-pointer-types] assert_se(bind(bindfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)) >= 0); ^~~~~~~~~~~~~~~ ../git/src/resolve/test-resolved-stream.c:251:39: error: incompatible pointer types passing 'struct sockaddr_in *' to parameter of type 'const struct sockaddr *' [-Werror,-Wincompatible-pointer-types] r = connect(clientfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)); Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/23281] Signed-off-by: Khem Raj --- src/resolve/test-resolved-stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/test-resolved-stream.c b/src/resolve/test-resolved-stream.c index f12c729e50..504b532002 100644 --- a/src/resolve/test-resolved-stream.c +++ b/src/resolve/test-resolved-stream.c @@ -109,7 +109,7 @@ static void *tcp_dns_server(void *p) { assert_se((bindfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) >= 0); assert_se(setsockopt(bindfd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) >= 0); - assert_se(bind(bindfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)) >= 0); + assert_se(bind(bindfd, (struct sockaddr*)&SERVER_ADDRESS, sizeof(SERVER_ADDRESS)) >= 0); assert_se(listen(bindfd, 1) >= 0); assert_se((acceptfd = accept(bindfd, NULL, NULL)) >= 0); server_handle(acceptfd); @@ -248,7 +248,7 @@ static void test_dns_stream(bool tls) { assert_se((clientfd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) >= 0); for (int i = 0; i < 100; i++) { - r = connect(clientfd, &SERVER_ADDRESS, sizeof(SERVER_ADDRESS)); + r = connect(clientfd, (struct sockaddr*)&SERVER_ADDRESS, sizeof(SERVER_ADDRESS)); if (r >= 0) break; usleep(EVENT_TIMEOUT_USEC / 100); -- 2.36.0