- add states for the mx lookup phases
- return the propper states
- close filedescriptors if we fail one attempt
- say which connection type we have: immediate, e_again, fail
- say which NS-lookup whe do (a/aaaa)
-void ShutDownCLient(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO)
- CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
-
- ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
-
ev_timer_stop(event_base, &IO->conn_fail);
ev_io_stop(event_base, &IO->conn_event);
ev_idle_stop(event_base, &IO->unwind_stack);
ev_timer_stop(event_base, &IO->conn_fail);
ev_io_stop(event_base, &IO->conn_event);
ev_idle_stop(event_base, &IO->unwind_stack);
IO->SendBuf.fd = 0;
IO->RecvBuf.fd = 0;
}
IO->SendBuf.fd = 0;
IO->RecvBuf.fd = 0;
}
+}
+
+void ShutDownCLient(AsyncIO *IO)
+{
+ CtdlLogPrintf(CTDL_DEBUG, "EVENT x %d\n", IO->SendBuf.fd);
+ ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
+
+ StopClientWatchers(IO);
+
if (IO->DNSChannel != NULL) {
ares_destroy(IO->DNSChannel);
ev_io_stop(event_base, &IO->dns_recv_event);
if (IO->DNSChannel != NULL) {
ares_destroy(IO->DNSChannel);
ev_io_stop(event_base, &IO->dns_recv_event);
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
case eTerminateConnection:
case eAbort:
break;
case eTerminateConnection:
case eAbort:
break;
become_session(IO->CitContext);
IO_send_callback(loop, &IO->send_event, revents);
break;
become_session(IO->CitContext);
IO_send_callback(loop, &IO->send_event, revents);
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
case eTerminateConnection:
case eAbort:
/// TODO: WHUT?
case eTerminateConnection:
case eAbort:
/// TODO: WHUT?
-IO_Timout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
+IO_Timeout_callback(struct ev_loop *loop, ev_timer *watcher, int revents)
{
AsyncIO *IO = watcher->data;
ev_timer_stop (event_base, &IO->rw_timeout);
become_session(IO->CitContext);
{
AsyncIO *IO = watcher->data;
ev_timer_stop (event_base, &IO->rw_timeout);
become_session(IO->CitContext);
+ close(IO->SendBuf.fd);
+ IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+
assert(IO->Timeout);
switch (IO->Timeout(IO))
{
assert(IO->Timeout);
switch (IO->Timeout(IO))
{
AsyncIO *IO = watcher->data;
ev_timer_stop (event_base, &IO->conn_fail);
AsyncIO *IO = watcher->data;
ev_timer_stop (event_base, &IO->conn_fail);
ev_io_stop(loop, &IO->conn_event);
ev_io_stop(loop, &IO->conn_event);
+
+ close(IO->SendBuf.fd);
+ IO->SendBuf.fd = IO->RecvBuf.fd = 0;
+
become_session(IO->CitContext);
assert(IO->ConnFail);
become_session(IO->CitContext);
assert(IO->ConnFail);
CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
CtdlLogPrintf(CTDL_DEBUG, "event: %s\n", __FUNCTION__);
become_session(IO->CitContext);
- IO->DNSQuery->PostDNS(IO);
+ switch (IO->DNSQuery->PostDNS(IO))
+ {
+ case eAbort:
+ ShutDownCLient(IO);
+ default:
+ break;
+ }
}
eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
}
eNextState event_connect_socket(AsyncIO *IO, double conn_timeout, double first_rw_timeout)
ev_timer_init(&IO->conn_fail, IO_connfail_callback, conn_timeout, 0);
IO->conn_fail.data = IO;
ev_timer_init(&IO->conn_fail, IO_connfail_callback, conn_timeout, 0);
IO->conn_fail.data = IO;
- ev_timer_init(&IO->rw_timeout, IO_Timout_callback, first_rw_timeout, 0);
+ ev_timer_init(&IO->rw_timeout, IO_Timeout_callback, first_rw_timeout, 0);
IO->rw_timeout.data = IO;
if (IO->ConnectMe->IPv6)
IO->rw_timeout.data = IO;
if (IO->ConnectMe->IPv6)
rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
if (rc >= 0){
rc = connect(IO->SendBuf.fd, (struct sockaddr_in *)&IO->ConnectMe->Addr, sizeof(struct sockaddr_in));
if (rc >= 0){
+ CtdlLogPrintf(CTDL_DEBUG, "connect() immediate success.\n");
//// freeaddrinfo(res);
set_start_callback(event_base, IO, 0);
ev_timer_start(event_base, &IO->rw_timeout);
return IO->NextState;
}
else if (errno == EINPROGRESS) {
//// freeaddrinfo(res);
set_start_callback(event_base, IO, 0);
ev_timer_start(event_base, &IO->rw_timeout);
return IO->NextState;
}
else if (errno == EINPROGRESS) {
+ CtdlLogPrintf(CTDL_DEBUG, "connect() have to wait now.\n");
ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
IO->conn_event.data = IO;
ev_io_init(&IO->conn_event, IO_connestd_callback, IO->SendBuf.fd, EV_READ|EV_WRITE);
IO->conn_event.data = IO;
typedef struct AsyncIO AsyncIO;
typedef enum _eNextState {
typedef struct AsyncIO AsyncIO;
typedef enum _eNextState {
+ eSendDNSQuery,
+ eReadDNSReply,
+ eConnect,
eSendReply,
eSendMore,
eReadMessage,
eSendReply,
eSendMore,
eReadMessage,
void StopClient(AsyncIO *IO);
void StopClient(AsyncIO *IO);
+void StopClientWatchers(AsyncIO *IO);
+
void SetNextTimeout(AsyncIO *IO, double timeout);
void InitC_ares_dns(AsyncIO *IO);
void SetNextTimeout(AsyncIO *IO, double timeout);
void InitC_ares_dns(AsyncIO *IO);
Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
FreeStrBuf(&Msg->msgtext);
FreeAsyncIOContents(&Msg->IO);
Msg->HostLookup.DNSReplyFree(Msg->HostLookup.VParsedDNSReply);
FreeStrBuf(&Msg->msgtext);
FreeAsyncIOContents(&Msg->IO);
+ memset (Msg, 0, sizeof(SmtpOutMsg)); /* just to be shure... */
* - connection timeout
* -
*/
* - connection timeout
* -
*/
+ StopClientWatchers(IO);
+
if (SendMsg->pCurrRelay != NULL)
SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
if (SendMsg->pCurrRelay != NULL)
SendMsg->pCurrRelay = SendMsg->pCurrRelay->Next;
SendMsg->mx_host,
buf,
SendMsg->IO.ConnectMe->Port);
SendMsg->mx_host,
buf,
SendMsg->IO.ConnectMe->Port);
+ SendMsg->IO.NextState = eConnect;
}
/*****************************************************************************
}
/*****************************************************************************
CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
CtdlLogPrintf(CTDL_DEBUG,
CtdlLogPrintf(CTDL_DEBUG, "SMTP: %s\n", __FUNCTION__);
CtdlLogPrintf(CTDL_DEBUG,
- "SMTP client[%ld]: looking up %s : %d ...\n",
+ "SMTP client[%ld]: looking up %s-Record %s : %d ...\n",
+ (SendMsg->pCurrRelay->IPv6)? "aaaa": "a",
SendMsg->pCurrRelay->Host,
SendMsg->pCurrRelay->Port);
SendMsg->pCurrRelay->Host,
SendMsg->pCurrRelay->Port);
SendMsg->MyQEntry->Status = 5;
StrBufPrintf(SendMsg->MyQEntry->StatusMessage,
"No MX hosts found for <%s>", SendMsg->node);
SendMsg->MyQEntry->Status = 5;
StrBufPrintf(SendMsg->MyQEntry->StatusMessage,
"No MX hosts found for <%s>", SendMsg->node);
+ SendMsg->IO.NextState = eTerminateConnection;
+ IO->NextState = eReadDNSReply;
"No MX hosts found for <%s>", SendMsg->node);
return IO->NextState;
}
"No MX hosts found for <%s>", SendMsg->node);
return IO->NextState;
}
+ SendMsg->IO.NextState = eReadDNSReply;
+ return IO->NextState;
Timeout += StrLength(pMsg->msgtext) / 1024;
}
break;
Timeout += StrLength(pMsg->msgtext) / 1024;
}
break;
+ case eSendDNSQuery:
+ case eReadDNSReply:
+ case eConnect:
case eTerminateConnection:
case eAbort:
return;
case eTerminateConnection:
case eAbort:
return;
typedef enum _eSMTP_C_States {
typedef enum _eSMTP_C_States {