Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-25 02:03:42 +00:00
Code Releases Activity

Refine buffer handling

Browse Source
This commit is contained in:
Max Lv
2015-11-30 15:03:04 +08:00
committed by Max Lv
parent f4fa30da5c
commit b0600a8784
29 changed files with 2616 additions and 1397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/netutils.c
+3 -5
View File
@@ -77,7 +77,7 @@ size_t get_sockaddr(char *host, char *port, struct sockaddr_storage *storage, in
struct addrinfo *result, *rp;
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */
hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */
hints.ai_socktype = SOCK_STREAM; /* We want a TCP socket */
int err, i;
@@ -97,20 +97,18 @@ size_t get_sockaddr(char *host, char *port, struct sockaddr_storage *storage, in
return -1;
}
for (rp = result; rp != NULL; rp = rp->ai_next) {
for (rp = result; rp != NULL; rp = rp->ai_next)
if (rp->ai_family == AF_INET) {
memcpy(storage, rp->ai_addr, sizeof(struct sockaddr_in));
break;
}
}
if (rp == NULL) {
for (rp = result; rp != NULL; rp = rp->ai_next) {
for (rp = result; rp != NULL; rp = rp->ai_next)
if (rp->ai_family == AF_INET6) {
memcpy(storage, rp->ai_addr, sizeof(struct sockaddr_in6));
break;
}
}
}
if (rp == NULL) {