static void ParseAnswerA(AsyncIO *IO, unsigned char* abuf, int alen)
{
- struct hostent* host;
+ struct hostent* host = NULL;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
NULL,
NULL);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (host != NULL)
+ ares_free_hostent(host);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
static void ParseAnswerAAAA(AsyncIO *IO, unsigned char* abuf, int alen)
{
- struct hostent* host;
+ struct hostent* host = NULL;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
NULL,
NULL);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (host != NULL)
+ ares_free_hostent(host);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
static void ParseAnswerCNAME(AsyncIO *IO, unsigned char* abuf, int alen)
{
- struct hostent* host;
+ struct hostent* host = NULL;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
NULL,
NULL);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (host != NULL)
+ ares_free_hostent(host);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
static void ParseAnswerMX(AsyncIO *IO, unsigned char* abuf, int alen)
{
- struct ares_mx_reply *mx_out;
+ struct ares_mx_reply *mx_out = NULL;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
IO->DNS.Query->DNSStatus = ares_parse_mx_reply(abuf, alen, &mx_out);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (mx_out != NULL)
+ ares_free_data(mx_out);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
static void ParseAnswerNS(AsyncIO *IO, unsigned char* abuf, int alen)
{
- struct hostent* host;
+ struct hostent* host = NULL;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
IO->DNS.Query->DNSStatus = ares_parse_ns_reply(abuf, alen, &host);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (host != NULL)
+ ares_free_hostent(host);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
static void ParseAnswerSRV(AsyncIO *IO, unsigned char* abuf, int alen)
{
- struct ares_srv_reply *srv_out;
+ struct ares_srv_reply *srv_out = NULL;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
IO->DNS.Query->DNSStatus = ares_parse_srv_reply(abuf, alen, &srv_out);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (srv_out != NULL)
+ ares_free_data(srv_out);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
IO->DNS.Query->DNSStatus = ares_parse_txt_reply(abuf, alen, &txt_out);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
+ if (txt_out != NULL)
+ ares_free_data(txt_out);
StrBufPlain(IO->ErrMsg,
ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
void DestructCAres(AsyncIO *IO)
{
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+ EV_DNS_LOGT_STOP(DNS.timeout);
+#endif
+ EV_DNS_LOG_STOP(DNS.recv_event);
+ ev_io_stop(event_base, &IO->DNS.recv_event);
+ EV_DNS_LOG_STOP(DNS.send_event);
+ ev_io_stop(event_base, &IO->DNS.send_event);
+ ev_timer_stop (event_base, &IO->DNS.timeout);
+ ev_idle_stop(event_base, &IO->unwind_stack);
ares_destroy_options(&IO->DNS.Options);
}
EV_DNS_LOGT_INIT(unwind_stack);
EV_DNS_LOGT_START(unwind_stack);
ev_idle_start(event_base, &IO->unwind_stack);
+ ev_timer_stop (event_base, &IO->DNS.timeout);
}
void QueueGetHostByName(AsyncIO *IO,
IO->DNS.Query = QueryParts;
IO->DNS.Query->PostDNS = PostDNS;
+ IO->DNS.Start = IO->Now;
InitC_ares_dns(IO);
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
{
AsyncIO *IO = watcher->data;
+ IO->Now = ev_now(event_base);
+
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
IO->DNS.SourcePort);
}
#endif
+ IO->Now = ev_now(event_base);
if (read) {
if ((IO->DNS.recv_event.fd != sock) &&