nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

windows/network.c: reformat some mis-indented code.

Browse Source 
Not quite sure how this all ended up a whole indent level off where it
should have been, but before I start modifying it, let's fix that.
This commit is contained in:
Simon Tatham 2022-01-08 15:28:40 +00:00
parent 72c492926f
commit dd3d0e931f
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
windows/network.c
View File

@ -1196,78 +1196,78 @@ Socket *sk_newlistener(const char *srcaddr, int port, Plug *plug,
} }
#ifndef NO_IPV6 #ifndef NO_IPV6
if (address_family == AF_INET6) { if (address_family == AF_INET6) {
memset(&a6, 0, sizeof(a6)); memset(&a6, 0, sizeof(a6));
a6.sin6_family = AF_INET6; a6.sin6_family = AF_INET6;
if (local_host_only)
a6.sin6_addr = in6addr_loopback;
else
a6.sin6_addr = in6addr_any;
if (srcaddr != NULL && p_getaddrinfo) {
struct addrinfo hints;
struct addrinfo *ai;
int err;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET6;
hints.ai_flags = 0;
{
/* strip [] on IPv6 address literals */
char *trimmed_addr = host_strduptrim(srcaddr);
err = p_getaddrinfo(trimmed_addr, NULL, &hints, &ai);
sfree(trimmed_addr);
}
if (err == 0 && ai->ai_family == AF_INET6) {
a6.sin6_addr =
((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr;
}
}
a6.sin6_port = p_htons(port);
} else
#endif
{
bool got_addr = false;
a.sin_family = AF_INET;
/*
* Bind to source address. First try an explicitly
* specified one...
*/
if (srcaddr) {
a.sin_addr.s_addr = p_inet_addr(srcaddr);
if (a.sin_addr.s_addr != INADDR_NONE) {
/* Override localhost_only with specified listen addr. */
ret->localhost_only = ipv4_is_loopback(a.sin_addr);
got_addr = true;
}
}
/*
* ... and failing that, go with one of the standard ones.
*/
if (!got_addr) {
if (local_host_only) if (local_host_only)
a6.sin6_addr = in6addr_loopback; a.sin_addr.s_addr = p_htonl(INADDR_LOOPBACK);
else else
a6.sin6_addr = in6addr_any; a.sin_addr.s_addr = p_htonl(INADDR_ANY);
if (srcaddr != NULL && p_getaddrinfo) {
struct addrinfo hints;
struct addrinfo *ai;
int err;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET6;
hints.ai_flags = 0;
{
/* strip [] on IPv6 address literals */
char *trimmed_addr = host_strduptrim(srcaddr);
err = p_getaddrinfo(trimmed_addr, NULL, &hints, &ai);
sfree(trimmed_addr);
}
if (err == 0 && ai->ai_family == AF_INET6) {
a6.sin6_addr =
((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr;
}
}
a6.sin6_port = p_htons(port);
} else
#endif
{
bool got_addr = false;
a.sin_family = AF_INET;
/*
* Bind to source address. First try an explicitly
* specified one...
*/
if (srcaddr) {
a.sin_addr.s_addr = p_inet_addr(srcaddr);
if (a.sin_addr.s_addr != INADDR_NONE) {
/* Override localhost_only with specified listen addr. */
ret->localhost_only = ipv4_is_loopback(a.sin_addr);
got_addr = true;
}
}
/*
* ... and failing that, go with one of the standard ones.
*/
if (!got_addr) {
if (local_host_only)
a.sin_addr.s_addr = p_htonl(INADDR_LOOPBACK);
else
a.sin_addr.s_addr = p_htonl(INADDR_ANY);
}
a.sin_port = p_htons((short)port);
} }
a.sin_port = p_htons((short)port);
}
#ifndef NO_IPV6 #ifndef NO_IPV6
retcode = p_bind(s, (address_family == AF_INET6 ? retcode = p_bind(s, (address_family == AF_INET6 ?
(struct sockaddr *) &a6 : (struct sockaddr *) &a6 :
(struct sockaddr *) &a), (struct sockaddr *) &a),
(address_family == (address_family ==
AF_INET6 ? sizeof(a6) : sizeof(a))); AF_INET6 ? sizeof(a6) : sizeof(a)));
#else #else
retcode = p_bind(s, (struct sockaddr *) &a, sizeof(a)); retcode = p_bind(s, (struct sockaddr *) &a, sizeof(a));
#endif #endif
if (retcode != SOCKET_ERROR) { if (retcode != SOCKET_ERROR) {
err = 0; err = 0;
} else { } else {
err = p_WSAGetLastError(); err = p_WSAGetLastError();
} }
if (err) { if (err) {
p_closesocket(s); p_closesocket(s);