From 7a750aea1cb90cd7630ba9e11bb567bd699bda4a Mon Sep 17 00:00:00 2001 From: Peter Lieven Date: Sun, 8 Jun 2014 14:20:12 +0200 Subject: [PATCH] socket: fix broken connect for non broadcast traffic commit 1c1e09a completely broke connects for non broadcast traffic since it forgot to copy the server address into the socket_storage struct. Signed-off-by: Peter Lieven --- lib/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/socket.c b/lib/socket.c index 39bb6a7..f973f01 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -506,7 +506,7 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s ((struct sockaddr_in6 *)&ss)->sin6_port = port; ((struct sockaddr_in6 *)&ss)->sin6_family = AF_INET6; #ifdef HAVE_SOCKADDR_LEN - ((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr_in); + ((struct sockaddr_in6 *)&ss)->sin6_len = sizeof(struct sockaddr6_in); #endif break; } @@ -560,6 +560,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc case AF_INET: ((struct sockaddr_in *)&rpc->s)->sin_family = ai->ai_family; ((struct sockaddr_in *)&rpc->s)->sin_port = htons(port); + ((struct sockaddr_in *)&rpc->s)->sin_addr = ((struct sockaddr_in *)(ai->ai_addr))->sin_addr; #ifdef HAVE_SOCKADDR_LEN ((struct sockaddr_in *)&rpc->s)->sin_len = sizeof(struct sockaddr_in); #endif @@ -567,6 +568,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc case AF_INET6: ((struct sockaddr_in6 *)&rpc->s)->sin6_family = ai->ai_family; ((struct sockaddr_in6 *)&rpc->s)->sin6_port = htons(port); + ((struct sockaddr_in6 *)&rpc->s)->sin6_addr = ((struct sockaddr_in6 *)(ai->ai_addr))->sin6_addr; #ifdef HAVE_SOCKADDR_LEN ((struct sockaddr_in6 *)&rpc->s)->sin6_len = sizeof(struct sockaddr_in6); #endif -- 2.34.1