Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix ares__sortaddrinfo, use wrappers for sock_funcs (#258)

Browse Source 
Some socket functions weren't exposed for use by other areas of the library.  Expose
those and make use of them in ares__sortaddrinfo().

Fix By: Andrew Selivanov (@ki11roy)
pull/260/head
Andrew Selivanov 6 years ago committed by Brad House
parent 9f1fdbf5dd
commit ba1aa0635a
4 changed files with 54 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ares__close_sockets.c
  2. 11
      ares__sortaddrinfo.c
  3. 8
      ares_private.h
  4. 78
      ares_process.c

4
ares__close_sockets.c
Unescape View File

@ -48,14 +48,14 @@ void ares__close_sockets(ares_channel channel, struct server_state *server)
if (server->tcp_socket != ARES_SOCKET_BAD)
{
SOCK_STATE_CALLBACK(channel, server->tcp_socket, 0, 0);
ares__socket_close(channel, server->tcp_socket);
ares__close_socket(channel, server->tcp_socket);
server->tcp_socket = ARES_SOCKET_BAD;
server->tcp_connection_generation = ++channel->tcp_connection_generation;
}
if (server->udp_socket != ARES_SOCKET_BAD)
{
SOCK_STATE_CALLBACK(channel, server->udp_socket, 0, 0);
ares__socket_close(channel, server->udp_socket);
ares__close_socket(channel, server->udp_socket);
server->udp_socket = ARES_SOCKET_BAD;
}
}

11
ares__sortaddrinfo.c
Unescape View File

@ -401,7 +401,7 @@ static int find_src_addr(ares_channel channel,
return 0;
}
sock = channel->sock_funcs->asocket(addr->sa_family, SOCK_DGRAM, IPPROTO_UDP, channel->sock_func_cb_data);
sock = ares__open_socket(channel, addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
if (sock == -1)
{
if (errno == EAFNOSUPPORT)
@ -416,23 +416,22 @@ static int find_src_addr(ares_channel channel,
do
{
ret = channel->sock_funcs->aconnect(sock, addr, len, channel->sock_func_cb_data);
ret = ares__connect_socket(channel, sock, addr, len);
}
while (ret == -1 && errno == EINTR);
if (ret == -1)
{
channel->sock_funcs->aclose(sock, channel->sock_func_cb_data);
ares__close_socket(channel, sock);
return 0;
}
if (getsockname(sock, src_addr, &len) == -1)
{
channel->sock_funcs->aclose(sock, channel->sock_func_cb_data);
ares__close_socket(channel, sock);
return -1;
}
channel->sock_funcs->aclose(sock, channel->sock_func_cb_data);
ares__close_socket(channel, sock);
return 1;
}

8
ares_private.h
Unescape View File

@ -364,7 +364,13 @@ int ares__sortaddrinfo(ares_channel channel, struct ares_addrinfo *ai);
long ares__tvdiff(struct timeval t1, struct timeval t2);
#endif
void ares__socket_close(ares_channel, ares_socket_t);
ares_socket_t ares__open_socket(ares_channel channel,
int af, int type, int protocol);
void ares__close_socket(ares_channel, ares_socket_t);
int ares__connect_socket(ares_channel channel,
ares_socket_t sockfd,
const struct sockaddr *addr,
ares_socklen_t addrlen);
#define ARES_SWAP_BYTE(a,b) \
{ unsigned char swapByte = *(a); *(a) = *(b); *(b) = swapByte; }

78
ares_process.c
Unescape View File

@ -1039,30 +1039,6 @@ static int configure_socket(ares_socket_t s, int family, ares_channel channel)
return 0;
}
static ares_socket_t open_socket(ares_channel channel, int af, int type, int protocol)
{
if (channel->sock_funcs != 0)
return channel->sock_funcs->asocket(af,
type,
protocol,
channel->sock_func_cb_data);
return socket(af, type, protocol);
}
static int connect_socket(ares_channel channel, ares_socket_t sockfd,
const struct sockaddr * addr,
ares_socklen_t addrlen)
{
if (channel->sock_funcs != 0)
return channel->sock_funcs->aconnect(sockfd,
addr,
addrlen,
channel->sock_func_cb_data);
return connect(sockfd, addr, addrlen);
}
static int open_tcp_socket(ares_channel channel, struct server_state *server)
{
ares_socket_t s;
@ -1107,14 +1083,14 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
}
/* Acquire a socket. */
s = open_socket(channel, server->addr.family, SOCK_STREAM, 0);
s = ares__open_socket(channel, server->addr.family, SOCK_STREAM, 0);
if (s == ARES_SOCKET_BAD)
return -1;
/* Configure it. */
if (configure_socket(s, server->addr.family, channel) < 0)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return -1;
}
@ -1131,7 +1107,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
setsockopt(s, IPPROTO_TCP, TCP_NODELAY,
(void *)&opt, sizeof(opt)) == -1)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return -1;
}
#endif
@ -1142,19 +1118,19 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
channel->sock_config_cb_data);
if (err < 0)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return err;
}
}
/* Connect to the server. */
if (connect_socket(channel, s, sa, salen) == -1)
if (ares__connect_socket(channel, s, sa, salen) == -1)
{
int err = SOCKERRNO;
if (err != EINPROGRESS && err != EWOULDBLOCK)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return -1;
}
}
@ -1165,7 +1141,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server)
channel->sock_create_cb_data);
if (err < 0)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return err;
}
}
@ -1220,14 +1196,14 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
}
/* Acquire a socket. */
s = open_socket(channel, server->addr.family, SOCK_DGRAM, 0);
s = ares__open_socket(channel, server->addr.family, SOCK_DGRAM, 0);
if (s == ARES_SOCKET_BAD)
return -1;
/* Set the socket non-blocking. */
if (configure_socket(s, server->addr.family, channel) < 0)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return -1;
}
@ -1237,19 +1213,19 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
channel->sock_config_cb_data);
if (err < 0)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return err;
}
}
/* Connect to the server. */
if (connect_socket(channel, s, sa, salen) == -1)
if (ares__connect_socket(channel, s, sa, salen) == -1)
{
int err = SOCKERRNO;
if (err != EINPROGRESS && err != EWOULDBLOCK)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return -1;
}
}
@ -1260,7 +1236,7 @@ static int open_udp_socket(ares_channel channel, struct server_state *server)
channel->sock_create_cb_data);
if (err < 0)
{
ares__socket_close(channel, s);
ares__close_socket(channel, s);
return err;
}
}
@ -1464,7 +1440,33 @@ void ares__free_query(struct query *query)
ares_free(query);
}
void ares__socket_close(ares_channel channel, ares_socket_t s)
ares_socket_t ares__open_socket(ares_channel channel,
int af, int type, int protocol)
{
if (channel->sock_funcs)
return channel->sock_funcs->asocket(af,
type,
protocol,
channel->sock_func_cb_data);
else
return socket(af, type, protocol);
}
int ares__connect_socket(ares_channel channel,
ares_socket_t sockfd,
const struct sockaddr *addr,
ares_socklen_t addrlen)
{
if (channel->sock_funcs)
return channel->sock_funcs->aconnect(sockfd,
addr,
addrlen,
channel->sock_func_cb_data);
else
return connect(sockfd, addr, addrlen);
}
void ares__close_socket(ares_channel channel, ares_socket_t s)
{
if (channel->sock_funcs)
channel->sock_funcs->aclose(s, channel->sock_func_cb_data);

Write Preview
Loading…
Cancel
Save