2828#include "ares_private.h"
2929#include <assert.h>
3030
31- static void ares__requeue_queries (struct server_connection * conn )
31+ static void ares__requeue_queries (struct server_connection * conn ,
32+ ares_status_t requeue_status )
3233{
3334 struct query * query ;
3435 ares_timeval_t now ;
3536
3637 ares__tvnow (& now );
3738
3839 while ((query = ares__llist_first_val (conn -> queries_to_conn )) != NULL ) {
39- ares__requeue_query (query , & now );
40+ ares__requeue_query (query , & now , requeue_status );
4041 }
4142}
4243
43- void ares__close_connection (struct server_connection * conn )
44+ void ares__close_connection (struct server_connection * conn ,
45+ ares_status_t requeue_status )
4446{
4547 struct server_state * server = conn -> server ;
4648 ares_channel_t * channel = server -> channel ;
@@ -58,7 +60,7 @@ void ares__close_connection(struct server_connection *conn)
5860 }
5961
6062 /* Requeue queries to other connections */
61- ares__requeue_queries (conn );
63+ ares__requeue_queries (conn , requeue_status );
6264
6365 ares__llist_destroy (conn -> queries_to_conn );
6466
@@ -74,45 +76,63 @@ void ares__close_sockets(struct server_state *server)
7476
7577 while ((node = ares__llist_node_first (server -> connections )) != NULL ) {
7678 struct server_connection * conn = ares__llist_node_val (node );
77- ares__close_connection (conn );
79+ ares__close_connection (conn , ARES_SUCCESS );
7880 }
7981}
8082
81- void ares__check_cleanup_conn (const ares_channel_t * channel ,
82- struct server_connection * conn )
83+ void ares__check_cleanup_conns (const ares_channel_t * channel )
8384{
84- ares_bool_t do_cleanup = ARES_FALSE ;
85+ ares__slist_node_t * snode ;
8586
86- if (channel == NULL || conn == NULL ) {
87+ if (channel == NULL ) {
8788 return ; /* LCOV_EXCL_LINE: DefensiveCoding */
8889 }
8990
90- if (ares__llist_len (conn -> queries_to_conn )) {
91- return ;
91+ /* Iterate across each server */
92+ for (snode = ares__slist_node_first (channel -> servers ); snode != NULL ;
93+ snode = ares__slist_node_next (snode )) {
94+
95+ struct server_state * server = ares__slist_node_val (snode );
96+ ares__llist_node_t * cnode ;
97+
98+ /* Iterate across each connection */
99+ cnode = ares__llist_node_first (server -> connections );
100+ while (cnode != NULL ) {
101+ ares__llist_node_t * next = ares__llist_node_next (cnode );
102+ struct server_connection * conn = ares__llist_node_val (cnode );
103+ ares_bool_t do_cleanup = ARES_FALSE ;
104+ cnode = next ;
105+
106+ /* Has connections, not eligible */
107+ if (ares__llist_len (conn -> queries_to_conn )) {
108+ continue ;
109+ }
110+
111+ /* If we are configured not to stay open, close it out */
112+ if (!(channel -> flags & ARES_FLAG_STAYOPEN )) {
113+ do_cleanup = ARES_TRUE ;
114+ }
115+
116+ /* If the associated server has failures, close it out. Resetting the
117+ * connection (and specifically the source port number) can help resolve
118+ * situations where packets are being dropped.
119+ */
120+ if (conn -> server -> consec_failures > 0 ) {
121+ do_cleanup = ARES_TRUE ;
122+ }
123+
124+ /* If the udp connection hit its max queries, always close it */
125+ if (!conn -> is_tcp && channel -> udp_max_queries > 0 &&
126+ conn -> total_queries >= channel -> udp_max_queries ) {
127+ do_cleanup = ARES_TRUE ;
128+ }
129+
130+ if (!do_cleanup ) {
131+ continue ;
132+ }
133+
134+ /* Clean it up */
135+ ares__close_connection (conn , ARES_SUCCESS );
136+ }
92137 }
93-
94- /* If we are configured not to stay open, close it out */
95- if (!(channel -> flags & ARES_FLAG_STAYOPEN )) {
96- do_cleanup = ARES_TRUE ;
97- }
98-
99- /* If the associated server has failures, close it out. Resetting the
100- * connection (and specifically the source port number) can help resolve
101- * situations where packets are being dropped.
102- */
103- if (conn -> server -> consec_failures > 0 ) {
104- do_cleanup = ARES_TRUE ;
105- }
106-
107- /* If the udp connection hit its max queries, always close it */
108- if (!conn -> is_tcp && channel -> udp_max_queries > 0 &&
109- conn -> total_queries >= channel -> udp_max_queries ) {
110- do_cleanup = ARES_TRUE ;
111- }
112-
113- if (!do_cleanup ) {
114- return ;
115- }
116-
117- ares__close_connection (conn );
118138}
0 commit comments