mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-11-18 19:14:18 +00:00
Clean up
This commit is contained in:
+4
-23
@@ -53,10 +53,6 @@ extern int verbose;
|
||||
static const char valid_label_bytes[] =
|
||||
"-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
|
||||
|
||||
#if defined(MODULE_LOCAL)
|
||||
extern int keep_resolving;
|
||||
#endif
|
||||
|
||||
int
|
||||
set_reuseport(int socket)
|
||||
{
|
||||
@@ -81,7 +77,7 @@ setinterface(int socket_fd, const char *interface_name)
|
||||
{
|
||||
struct ifreq interface;
|
||||
memset(&interface, 0, sizeof(struct ifreq));
|
||||
strncpy(interface.ifr_name, interface_name, IFNAMSIZ-1);
|
||||
strncpy(interface.ifr_name, interface_name, IFNAMSIZ - 1);
|
||||
int res = setsockopt(socket_fd, SOL_SOCKET, SO_BINDTODEVICE, &interface,
|
||||
sizeof(struct ifreq));
|
||||
return res;
|
||||
@@ -92,11 +88,10 @@ setinterface(int socket_fd, const char *interface_name)
|
||||
int
|
||||
bind_to_address(int socket_fd, const char *host)
|
||||
{
|
||||
static struct sockaddr_storage storage = {0};
|
||||
static struct sockaddr_storage storage = { 0 };
|
||||
if (storage.ss_family == AF_INET) {
|
||||
return bind(socket_fd, (struct sockaddr *)&storage, sizeof(struct sockaddr_in));
|
||||
}
|
||||
else if (storage.ss_family == AF_INET6) {
|
||||
} else if (storage.ss_family == AF_INET6) {
|
||||
return bind(socket_fd, (struct sockaddr *)&storage, sizeof(struct sockaddr_in6));
|
||||
} else if (host != NULL) {
|
||||
struct cork_ip ip;
|
||||
@@ -152,21 +147,7 @@ get_sockaddr(char *host, char *port,
|
||||
hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */
|
||||
hints.ai_socktype = SOCK_STREAM; /* We want a TCP socket */
|
||||
|
||||
int err, i;
|
||||
|
||||
for (i = 1; i < 8; i++) {
|
||||
err = getaddrinfo(host, port, &hints, &result);
|
||||
#if defined(MODULE_LOCAL)
|
||||
if (!keep_resolving)
|
||||
break;
|
||||
#endif
|
||||
if ((!block || !err)) {
|
||||
break;
|
||||
} else {
|
||||
sleep(pow(2, i));
|
||||
LOGE("failed to resolve server name, wait %.0f seconds", pow(2, i));
|
||||
}
|
||||
}
|
||||
int err = getaddrinfo(host, port, &hints, &result);
|
||||
|
||||
if (err != 0) {
|
||||
LOGE("getaddrinfo: %s", gai_strerror(err));
|
||||
|
||||
Reference in New Issue
Block a user