Commit 7178717b authored by Andrei Vagin's avatar Andrei Vagin

alpine: cast addresses to struct sockaddr *

Otherwise we get errors like this:

/usr/include/sys/socket.h:315:5: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
 int bind (int, const struct sockaddr *, socklen_t);
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent c645cc93
...@@ -39,7 +39,7 @@ static int bind_and_listen(struct sockaddr_un *addr) ...@@ -39,7 +39,7 @@ static int bind_and_listen(struct sockaddr_un *addr)
return -1; return -1;
} }
if (bind(sk, addr, sizeof(*addr))) { if (bind(sk, (struct sockaddr *) addr, sizeof(*addr))) {
fail("bind %s", addr->sun_path); fail("bind %s", addr->sun_path);
close(sk); close(sk);
return -1; return -1;
......
...@@ -23,7 +23,7 @@ static int do_bind(int sk) ...@@ -23,7 +23,7 @@ static int do_bind(int sk)
addr.sa_family = AF_PACKET; addr.sa_family = AF_PACKET;
strcpy(addr.sa_data, "lo"); strcpy(addr.sa_data, "lo");
return bind(sk, &addr, sizeof(addr)); return bind(sk, (struct sockaddr *) &addr, sizeof(addr));
} }
static int check_socket_binding(int sk, char *dev) static int check_socket_binding(int sk, char *dev)
......
...@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) ...@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
ret = bind(sock[0], &addr, addrlen); ret = bind(sock[0], (struct sockaddr *) &addr, addrlen);
if (ret) { if (ret) {
fail("bind\n"); fail("bind\n");
exit(1); exit(1);
...@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) ...@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
test_daemon(); test_daemon();
test_waitsig(); test_waitsig();
if (connect(sock[1], &addr, addrlen)) { if (connect(sock[1], (struct sockaddr *) &addr, addrlen)) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
} }
......
...@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) ...@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
pr_perror("Can't create socket"); pr_perror("Can't create socket");
return 1; return 1;
} }
ret = bind(sk, &addr, addrlen); ret = bind(sk, (struct sockaddr *) &addr, addrlen);
if (ret < 0) { if (ret < 0) {
pr_perror("Can't bind socket to %s", path); pr_perror("Can't bind socket to %s", path);
return 1; return 1;
...@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) ...@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
ret = connect(sk, &addr, addrlen); ret = connect(sk, (struct sockaddr *) &addr, addrlen);
if (ret < 0) { if (ret < 0) {
pr_perror("Can't connect socket"); pr_perror("Can't connect socket");
return 1; return 1;
......
...@@ -30,7 +30,7 @@ static int client(const char *iter) ...@@ -30,7 +30,7 @@ static int client(const char *iter)
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, filename); strcpy(addr.sun_path, filename);
if (connect(sk, (void *)&addr, sizeof(struct sockaddr_un)) < 0) { if (connect(sk, (struct sockaddr *) &addr, sizeof(struct sockaddr_un)) < 0) {
pr_perror("connect failed %s", iter); pr_perror("connect failed %s", iter);
return 1; return 1;
} }
......
...@@ -42,15 +42,15 @@ int main(int argc, char **argv) ...@@ -42,15 +42,15 @@ int main(int argc, char **argv)
memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV)); memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV); addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
if (bind(srv, &addr, addrlen)) { if (bind(srv, (struct sockaddr *) &addr, addrlen)) {
fail("bind\n"); fail("bind\n");
exit(1); exit(1);
} }
if (connect(clnt1, &addr, addrlen)) { if (connect(clnt1, (struct sockaddr *) &addr, addrlen)) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
} }
if (connect(clnt2, &addr, addrlen)) { if (connect(clnt2, (struct sockaddr *) &addr, addrlen)) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
} }
......
...@@ -44,7 +44,7 @@ int main(int argc, char **argv) ...@@ -44,7 +44,7 @@ int main(int argc, char **argv)
memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV)); memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV); addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
if (bind(srv, &addr, addrlen)) { if (bind(srv, (struct sockaddr *) &addr, addrlen)) {
fail("bind\n"); fail("bind\n");
exit(1); exit(1);
} }
...@@ -58,14 +58,14 @@ int main(int argc, char **argv) ...@@ -58,14 +58,14 @@ int main(int argc, char **argv)
memcpy(addr.sun_path, sk_names[i], sizeof(SK_NAME)); memcpy(addr.sun_path, sk_names[i], sizeof(SK_NAME));
addrlen = sizeof(addr.sun_family) + sizeof(SK_NAME); addrlen = sizeof(addr.sun_family) + sizeof(SK_NAME);
if (bind(clnt, &addr, addrlen)) { if (bind(clnt, (struct sockaddr *) &addr, addrlen)) {
fail("bind\n"); fail("bind\n");
exit(1); exit(1);
} }
memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV)); memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV); addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
if (connect(clnt, &addr, addrlen)) { if (connect(clnt, (struct sockaddr *) &addr, addrlen)) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
} }
......
...@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) ...@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
ret = bind(ssk_icon[0], &addr, addrlen); ret = bind(ssk_icon[0], (struct sockaddr *) &addr, addrlen);
if (ret) { if (ret) {
fail("bind\n"); fail("bind\n");
exit(1); exit(1);
...@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) ...@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
ret = connect(ssk_icon[2], &addr, addrlen); ret = connect(ssk_icon[2], (struct sockaddr *) &addr, addrlen);
if (ret) { if (ret) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
...@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) ...@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
ret = connect(ssk_icon[1], &addr, addrlen); ret = connect(ssk_icon[1], (struct sockaddr *) &addr, addrlen);
if (ret) { if (ret) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
......
...@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) ...@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
ret = bind(sk[0], &addr, addrlen); ret = bind(sk[0], (struct sockaddr *) &addr, addrlen);
if (ret) { if (ret) {
fail("bind\n"); fail("bind\n");
exit(1); exit(1);
...@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) ...@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
ret = connect(sk[1], &addr, addrlen); ret = connect(sk[1], (struct sockaddr *) &addr, addrlen);
if (ret) { if (ret) {
fail("connect\n"); fail("connect\n");
exit(1); exit(1);
......
...@@ -102,38 +102,38 @@ int main(int argc, char *argv[]) ...@@ -102,38 +102,38 @@ int main(int argc, char *argv[])
name_bound_conn.sun_family = AF_UNIX; name_bound_conn.sun_family = AF_UNIX;
strncpy(name_bound_conn.sun_path, path, sizeof(name_bound_conn.sun_path)); strncpy(name_bound_conn.sun_path, path, sizeof(name_bound_conn.sun_path));
ret = bind(sk_dgram_bound_server, &name_bound, sizeof(name_bound)); ret = bind(sk_dgram_bound_server, (struct sockaddr *) &name_bound, sizeof(name_bound));
if (ret) { if (ret) {
fail("bind"); fail("bind");
exit(1); exit(1);
} }
ret = bind(sk_dgram_conn_server, &name_conn, sizeof(name_conn)); ret = bind(sk_dgram_conn_server, (struct sockaddr *) &name_conn, sizeof(name_conn));
if (ret) { if (ret) {
fail("bind"); fail("bind");
exit(1); exit(1);
} }
ret = connect(sk_dgram_conn_client, &name_conn, sizeof(name_conn)); ret = connect(sk_dgram_conn_client, (struct sockaddr *) &name_conn, sizeof(name_conn));
if (ret) { if (ret) {
fail("connect"); fail("connect");
exit(1); exit(1);
} }
ret = connect(sk_dgram_conn_client2, &name_conn, sizeof(name_conn)); ret = connect(sk_dgram_conn_client2, (struct sockaddr *) &name_conn, sizeof(name_conn));
if (ret) { if (ret) {
fail("connect"); fail("connect");
exit(1); exit(1);
} }
ret = bind(sk_dgram_bound_conn, &name_bound_conn, sizeof(name_bound_conn)); ret = bind(sk_dgram_bound_conn, (struct sockaddr *) &name_bound_conn, sizeof(name_bound_conn));
if (ret) { if (ret) {
fail("bind"); fail("bind");
exit(1); exit(1);
} }
/* Note, it's already bound, so make it more idiotic! */ /* Note, it's already bound, so make it more idiotic! */
ret = connect(sk_dgram_bound_conn, &name_bound_conn, sizeof(name_bound_conn)); ret = connect(sk_dgram_bound_conn, (struct sockaddr *) &name_bound_conn, sizeof(name_bound_conn));
if (ret) { if (ret) {
fail("connect"); fail("connect");
exit(1); exit(1);
...@@ -141,7 +141,7 @@ int main(int argc, char *argv[]) ...@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0, sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0,
&name_bound, sizeof(name_bound)); (struct sockaddr *) &name_bound, sizeof(name_bound));
read(sk_dgram_bound_server, &buf, sizeof(buf)); read(sk_dgram_bound_server, &buf, sizeof(buf));
if (strcmp(buf, SK_DATA_BOUND)) { if (strcmp(buf, SK_DATA_BOUND)) {
fail("data corrupted\n"); fail("data corrupted\n");
...@@ -172,7 +172,7 @@ int main(int argc, char *argv[]) ...@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0, sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0,
&name_bound, sizeof(name_bound)); (struct sockaddr *) &name_bound, sizeof(name_bound));
read(sk_dgram_bound_server, &buf, sizeof(buf)); read(sk_dgram_bound_server, &buf, sizeof(buf));
if (strcmp(buf, SK_DATA_BOUND)) { if (strcmp(buf, SK_DATA_BOUND)) {
fail("data corrupted\n"); fail("data corrupted\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment