Skip to content

Commit 8f876f9

Browse files
committed
Set member sockaddr_in::sin_len if it exists.
Signed-off-by: Tom Carroll <[email protected]>
1 parent 45d71d4 commit 8f876f9

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

library/zitilib.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,12 +1287,18 @@ int Ziti_resolve(const char *host, const char *port, const struct addrinfo *hint
12871287
case AF_INET:
12881288
case AF_UNSPEC:
12891289
salen = sizeof addr->in4;
1290+
#ifdef HAVE_SOCKADDR_IN_SIN_LEN
1291+
addr->in4.sin_len = salen;
1292+
#endif /* HAVE_SOCKADDR_IN_SIN_LEN */
12901293
addr->in4.sin_family = AF_INET;
12911294
addr->in4.sin_port = htons(portnum);
12921295
addr->in4.sin_addr.s_addr = INADDR_LOOPBACK;
12931296
break;
12941297
case AF_INET6:
12951298
salen = sizeof addr->in6;
1299+
#ifdef HAVE_SOCKADDR_IN6_SIN6_LEN
1300+
addr->in6.sin6_len = salen;
1301+
#endif /* HAVE_SOCKADDR_IN6_SIN6_LEN */
12961302
addr->in6.sin6_family = AF_INET6;
12971303
addr->in6.sin6_port = htons(portnum);
12981304
addr->in6.sin6_addr = in6addr_loopback;
@@ -1362,6 +1368,9 @@ int Ziti_resolve(const char *host, const char *port, const struct addrinfo *hint
13621368
if (err != 0)
13631369
goto error;
13641370

1371+
#ifdef HAVE_SOCKADDR_IN_SIN_LEN
1372+
addr->in4.sin_len = sizeof addr->in4;
1373+
#endif /* HAVE_SOCKADDR_IN_SIN_LEN */
13651374
addr->in4.sin_family = AF_INET;
13661375
addr->in4.sin_port = htons(portnum);
13671376
addr->in4.sin_addr.s_addr = (in_addr_t)(uintptr_t)f->result;

0 commit comments

Comments
 (0)