/*
- * Copyright (c) 1998-2009 by the citadel.org team
+ * Copyright (c) 1998-2012 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ *
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ *
*
* Inspired by NodeJS.org; thanks for the MX-Parser ;-)
*/
static void HostByAddrCb(void *data,
- int status,
- int timeouts,
- struct hostent *hostent)
+ int status,
+ int timeouts,
+ struct hostent *hostent)
{
AsyncIO *IO = data;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+ EV_DNS_LOGT_STOP(DNS.timeout);
#endif
ev_timer_stop (event_base, &IO->DNS.timeout);
return;
}
IO->DNS.Query->Data = hostent;
-/// TODO: howto free this??
}
-static void ParseAnswerA(AsyncIO *IO, unsigned char* abuf, int alen)
+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
IO->DNS.Query->DNSReplyFree(IO->DNS.Query->VParsedDNSReply);
IO->DNS.Query->VParsedDNSReply = NULL;
- IO->DNS.Query->DNSStatus = ares_parse_a_reply(abuf, alen, &host, NULL, NULL);
+ IO->DNS.Query->DNSStatus = ares_parse_a_reply(abuf,
+ alen,
+ &host,
+ NULL,
+ NULL);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ if (host != NULL)
+ ares_free_hostent(host);
+ StrBufPlain(IO->ErrMsg,
+ ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
}
IO->DNS.Query->VParsedDNSReply = host;
}
-static void ParseAnswerAAAA(AsyncIO *IO, unsigned char* abuf, int alen)
+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
IO->DNS.Query->DNSReplyFree(IO->DNS.Query->VParsedDNSReply);
IO->DNS.Query->VParsedDNSReply = NULL;
- IO->DNS.Query->DNSStatus = ares_parse_aaaa_reply(abuf, alen, &host, NULL, NULL);
+ IO->DNS.Query->DNSStatus = ares_parse_aaaa_reply(abuf,
+ alen,
+ &host,
+ NULL,
+ NULL);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ if (host != NULL)
+ ares_free_hostent(host);
+ StrBufPlain(IO->ErrMsg,
+ ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
}
IO->DNS.Query->VParsedDNSReply = host;
}
-static void ParseAnswerCNAME(AsyncIO *IO, unsigned char* abuf, int alen)
+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__);
IO->DNS.Query->DNSReplyFree(IO->DNS.Query->VParsedDNSReply);
IO->DNS.Query->VParsedDNSReply = NULL;
- IO->DNS.Query->DNSStatus = ares_parse_a_reply(abuf, alen, &host, NULL, NULL);
+ IO->DNS.Query->DNSStatus = ares_parse_a_reply(abuf,
+ alen,
+ &host,
+ NULL,
+ NULL);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ 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)
+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) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ 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)
+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) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ if (host != NULL)
+ ares_free_hostent(host);
+ StrBufPlain(IO->ErrMsg,
+ ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
}
IO->DNS.Query->VParsedDNSReply = host;
}
-static void ParseAnswerSRV(AsyncIO *IO, unsigned char* abuf, int alen)
+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) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ if (srv_out != NULL)
+ ares_free_data(srv_out);
+ StrBufPlain(IO->ErrMsg,
+ ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
}
}
-static void ParseAnswerTXT(AsyncIO *IO, unsigned char* abuf, int alen)
+static void ParseAnswerTXT(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct ares_txt_reply *txt_out;
#ifdef DEBUG_CARES
IO->DNS.Query->DNSStatus = ares_parse_txt_reply(abuf, alen, &txt_out);
if (IO->DNS.Query->DNSStatus != ARES_SUCCESS) {
- StrBufPlain(IO->ErrMsg, ares_strerror(IO->DNS.Query->DNSStatus), -1);
+ if (txt_out != NULL)
+ ares_free_data(txt_out);
+ StrBufPlain(IO->ErrMsg,
+ ares_strerror(IO->DNS.Query->DNSStatus), -1);
return;
}
IO->DNS.Query->VParsedDNSReply = txt_out;
int status,
int timeouts,
unsigned char* abuf,
- int alen)
+ int alen)
{
AsyncIO *IO = arg;
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+ EV_DNS_LOGT_STOP(DNS.timeout);
#endif
ev_timer_stop (event_base, &IO->DNS.timeout);
StrBufPlain(IO->ErrMsg, ares_strerror(status), -1);
IO->DNS.Query->DNSStatus = status;
}
-
+
ev_idle_init(&IO->unwind_stack,
IO_postdns_callback);
IO->unwind_stack.data = IO;
+ EV_DNS_LOGT_INIT(unwind_stack);
+ EV_DNS_LOGT_START(unwind_stack);
ev_idle_start(event_base, &IO->unwind_stack);
}
{
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+ EV_DNS_LOGT_STOP(DNS.timeout);
#endif
ev_idle_stop(event_base, &IO->unwind_stack);
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);
}
}
}
-void QueueGetHostByNameDone(void *Ctx,
+void QueueGetHostByNameDone(void *Ctx,
int status,
int timeouts,
struct hostent *hostent)
ev_idle_init(&IO->unwind_stack,
IO_postdns_callback);
IO->unwind_stack.data = IO;
+ 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, const char *Hostname, DNSQueryParts *QueryParts, IO_CallBack PostDNS)
+void QueueGetHostByName(AsyncIO *IO,
+ const char *Hostname,
+ DNSQueryParts *QueryParts,
+ IO_CallBack PostDNS)
{
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
InitC_ares_dns(IO);
ev_timer_init(&IO->DNS.timeout, DNStimeouttrigger_callback, 10, 1);
+ EV_DNS_LOGT_INIT(DNS.timeout);
IO->DNS.timeout.data = IO;
ares_gethostbyname(IO->DNS.Channel,
- Hostname,
+ Hostname,
AF_INET6, /* it falls back to ipv4 in doubt... */
QueueGetHostByNameDone,
IO);
+ EV_DNS_LOGT_START(DNS.timeout);
ev_timer_start(event_base, &IO->DNS.timeout);
}
-int QueueQuery(ns_type Type, const char *name, AsyncIO *IO, DNSQueryParts *QueryParts, IO_CallBack PostDNS)
+
+int QueueQuery(ns_type Type,
+ const char *name,
+ AsyncIO *IO,
+ DNSQueryParts *QueryParts,
+ IO_CallBack PostDNS)
{
int length, family;
char address_b[sizeof(struct in6_addr)];
IO->DNS.Query = QueryParts;
IO->DNS.Query->PostDNS = PostDNS;
+ IO->DNS.Start = IO->Now;
InitC_ares_dns(IO);
ev_timer_init(&IO->DNS.timeout, DNStimeouttrigger_callback, 10, 1);
IO->DNS.timeout.data = IO;
+ EV_DNS_LOGT_INIT(DNS.timeout);
switch(Type) {
case ns_t_a:
return -1;
}
- ares_gethostbyaddr(IO->DNS.Channel, address_b, length, family, HostByAddrCb, IO);
+ ares_gethostbyaddr(IO->DNS.Channel,
+ address_b,
+ length,
+ family,
+ HostByAddrCb,
+ IO);
+ EV_DNS_LOGT_START(DNS.timeout);
ev_timer_start(event_base, &IO->DNS.timeout);
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s X1\n", __FUNCTION__);
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
ares_query(IO->DNS.Channel, name, ns_c_in, Type, QueryCb, IO);
+ EV_DNS_LOGT_START(DNS.timeout);
ev_timer_start(event_base, &IO->DNS.timeout);
return 1;
}
static void DNS_send_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
AsyncIO *IO = watcher->data;
-
+
+ IO->Now = ev_now(event_base);
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
- ares_process_fd(IO->DNS.Channel, ARES_SOCKET_BAD, IO->DNS.send_event.fd);
+ ares_process_fd(IO->DNS.Channel,
+ ARES_SOCKET_BAD,
+ IO->DNS.send_event.fd);
}
static void DNS_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
AsyncIO *IO = watcher->data;
-
+
+ IO->Now = ev_now(event_base);
+
#ifdef DEBUG_CARES
EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
#endif
- ares_process_fd(IO->DNS.Channel, IO->DNS.recv_event.fd, ARES_SOCKET_BAD);
+ ares_process_fd(IO->DNS.Channel,
+ IO->DNS.recv_event.fd,
+ ARES_SOCKET_BAD);
}
-void SockStateCb(void *data, int sock, int read, int write)
+void SockStateCb(void *data, int sock, int read, int write)
{
AsyncIO *IO = data;
/* already inside of the event queue. */
{
struct sockaddr_in sin = {};
socklen_t slen;
- slen = sizeof(sin);
- if ((IO->DNS.SourcePort == 0) &&
+ slen = sizeof(sin);
+ if ((IO->DNS.SourcePort == 0) &&
(getsockname(sock, &sin, &slen) == 0))
{
IO->DNS.SourcePort = ntohs(sin.sin_port);
IO->DNS.SourcePort);
}
#endif
+ IO->Now = ev_now(event_base);
if (read) {
if ((IO->DNS.recv_event.fd != sock) &&
(IO->DNS.recv_event.fd != 0)) {
+ EV_DNS_LOG_STOP(DNS.recv_event);
ev_io_stop(event_base, &IO->DNS.recv_event);
}
IO->DNS.recv_event.fd = sock;
- ev_io_init(&IO->DNS.recv_event, DNS_recv_callback, IO->DNS.recv_event.fd, EV_READ);
+ ev_io_init(&IO->DNS.recv_event,
+ DNS_recv_callback,
+ IO->DNS.recv_event.fd,
+ EV_READ);
+ EV_DNS_LOG_INIT(DNS.recv_event);
IO->DNS.recv_event.data = IO;
+ EV_DNS_LOG_START(DNS.recv_event);
ev_io_start(event_base, &IO->DNS.recv_event);
- }
+ }
if (write) {
if ((IO->DNS.send_event.fd != sock) &&
(IO->DNS.send_event.fd != 0)) {
+ EV_DNS_LOG_STOP(DNS.send_event);
ev_io_stop(event_base, &IO->DNS.send_event);
}
IO->DNS.send_event.fd = sock;
- ev_io_init(&IO->DNS.send_event, DNS_send_callback, IO->DNS.send_event.fd, EV_WRITE);
+ ev_io_init(&IO->DNS.send_event,
+ DNS_send_callback,
+ IO->DNS.send_event.fd,
+ EV_WRITE);
IO->DNS.send_event.data = IO;
+ EV_DNS_LOG_INIT(DNS.send_event);
+ EV_DNS_LOG_START(DNS.send_event);
ev_io_start(event_base, &IO->DNS.send_event);
}
if ((read == 0) && (write == 0)) {
+ EV_DNS_LOG_STOP(DNS.recv_event);
+ EV_DNS_LOG_STOP(DNS.send_event);
ev_io_stop(event_base, &IO->DNS.recv_event);
ev_io_stop(event_base, &IO->DNS.send_event);
}
{
int r = ares_library_init(ARES_LIB_INIT_ALL);
if (0 != r) {
- // TODO
- // ThrowException(Exception::Error(String::New(ares_strerror(r))));
-//// assert(r == 0);
+
}
}
return "c-ares";
projects / citadel.git / blobdiff