struct hostent *hostent)
{
AsyncIO *IO = data;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
IO->DNSQuery->DNSStatus = status;
if (status != ARES_SUCCESS) {
// ResolveError(*cb, status);
static void ParseAnswerA(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct hostent* host;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
static void ParseAnswerAAAA(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct hostent* host;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
{
struct hostent* host;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
+
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
IO->DNSQuery->VParsedDNSReply = NULL;
static void ParseAnswerMX(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct ares_mx_reply *mx_out;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
static void ParseAnswerNS(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct hostent* host;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
static void ParseAnswerSRV(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct ares_srv_reply *srv_out;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
static void ParseAnswerTXT(AsyncIO *IO, unsigned char* abuf, int alen)
{
struct ares_txt_reply *txt_out;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
if (IO->DNSQuery->VParsedDNSReply != NULL)
IO->DNSQuery->DNSReplyFree(IO->DNSQuery->VParsedDNSReply);
int alen)
{
AsyncIO *IO = arg;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
IO->DNSQuery->DNSStatus = status;
if (status == ARES_SUCCESS)
IO_postdns_callback);
IO->unwind_stack.data = IO;
ev_idle_start(event_base, &IO->unwind_stack);
- syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
}
void QueryCbDone(AsyncIO *IO)
{
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
+
ev_idle_stop(event_base, &IO->unwind_stack);
}
void InitC_ares_dns(AsyncIO *IO)
{
int optmask = 0;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
+
if (IO->DNSChannel == NULL) {
optmask |= ARES_OPT_SOCK_STATE_CB;
IO->DNSOptions.sock_state_cb = SockStateCb;
struct hostent *hostent)
{
AsyncIO *IO = (AsyncIO *) Ctx;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
IO->DNSQuery->DNSStatus = status;
IO->DNSQuery->VParsedDNSReply = hostent;
IO_postdns_callback);
IO->unwind_stack.data = IO;
ev_idle_start(event_base, &IO->unwind_stack);
- syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
}
void QueueGetHostByName(AsyncIO *IO, const char *Hostname, DNSQueryParts *QueryParts, IO_CallBack PostDNS)
{
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
+
IO->DNSQuery = QueryParts;
IO->DNSQuery->PostDNS = PostDNS;
ares_gethostbyaddr(IO->DNSChannel, address_b, length, family, HostByAddrCb, IO);
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s X1\n", __FUNCTION__);
+#endif
return 1;
default:
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %sX2\n", __FUNCTION__);
+#endif
return 0;
}
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
ares_query(IO->DNSChannel, name, ns_c_in, Type, QueryCb, IO);
return 1;
}
{
AsyncIO *IO = watcher->data;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
+
ares_process_fd(IO->DNSChannel, 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;
+#ifdef DEBUG_CARES
+ EV_syslog(LOG_DEBUG, "C-ARES: %s\n", __FUNCTION__);
+#endif
+
ares_process_fd(IO->DNSChannel, IO->dns_recv_event.fd, ARES_SOCKET_BAD);
}
void SockStateCb(void *data, int sock, int read, int write)
{
-/*
+ /*
struct timeval tvbuf, maxtv, *ret;
int64_t time = 10;
*/
AsyncIO *IO = data;
-/* already inside of the event queue. */
+/* already inside of the event queue. */
+#ifdef DEBUG_CARES
+{
+ struct sockaddr_in sin = {};
+ socklen_t slen;
+ slen = sizeof(sin);
+ if ((IO->DnsSourcePort == 0) &&
+ (getsockname(sock, &sin, &slen) == 0))
+ {
+ IO->DnsSourcePort = ntohs(sin.sin_port);
+ }
+ EV_syslog(LOG_DEBUG, "C-ARES: %s %d|%d Sock %d port %hu\n",
+ __FUNCTION__,
+ read,
+ write,
+ sock,
+ IO->DnsSourcePort);
+}
+#endif
if (read) {
if ((IO->dns_recv_event.fd != sock) &&
int nRemain;
StrBuf *MsgData;
AsyncIO *IO = &Msg->IO;
- EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
IDestructQueItem = DecreaseQReference(Msg->MyQItem);
"");
FreeStrBuf(&MsgData);
}
+ RemoveContext(Msg->IO.CitContext);
if (IDestructQueItem)
RemoveQItem(Msg->MyQItem);
-
- RemoveContext(Msg->IO.CitContext);
DeleteSmtpOutMsg(Msg);
}
SendMsg->IO.IOBuf = NewStrBuf();
SendMsg->IO.NextState = eReadMessage;
-
+
return SendMsg;
}
int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
int MsgCount)
{
+ AsyncIO *IO;
SmtpOutMsg *SendMsg;
syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
SendMsg = new_smtp_outmsg(MyQItem, MyQEntry, MsgCount);
+ IO = &SendMsg->IO;
if (KeepMsgText) SendMsg->msgtext = MsgText;
else SendMsg->msgtext = NewStrBufDup(MsgText);
SubC = CloneContext (CC);
SubC->session_specific_data = (char*) SendMsg;
SendMsg->IO.CitContext = SubC;
-
- syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> \n",
+
+ EVS_syslog(LOG_DEBUG,
+ "SMTP: %s new context %s - %p\n", __FUNCTION__,
+ ChrPtr(SendMsg->MyQEntry->Recipient),
+ SendMsg);
+ syslog(LOG_DEBUG, "SMTP Starting: [%ld] <%s> CC <%d> \n",
SendMsg->MyQItem->MessageID,
- ChrPtr(SendMsg->MyQEntry->Recipient));
+ ChrPtr(SendMsg->MyQEntry->Recipient),
+ ((CitContext*)SendMsg->IO.CitContext)->cs_pid);
if (SendMsg->pCurrRelay == NULL)
QueueEventContext(&SendMsg->IO,
resolve_mx_records);
#define QID ((SmtpOutMsg*)IO->Data)->MyQItem->MessageID
#define N ((SmtpOutMsg*)IO->Data)->n
-#define EVS_syslog(LEVEL, FORMAT, ...) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, IO->ID, QID, N, __VA_ARGS__)
-#define EVSM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, IO->ID, QID, N)
+#define EVS_syslog(LEVEL, FORMAT, ...) syslog(LEVEL, "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, IO->ID, CCID, QID, N, __VA_ARGS__)
+#define EVSM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]CC[%d]S[%ld][%ld]" FORMAT, IO->ID, CCID, QID, N)
+#define EVNCS_syslog(LEVEL, FORMAT, ...) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, IO->ID, QID, N, __VA_ARGS__)
+#define EVNCSM_syslog(LEVEL, FORMAT) syslog(LEVEL, "IO[%ld]S[%ld][%ld]" FORMAT, IO->ID, QID, N)