From ca4c5c4e5f700bdba5c1493ed48ecaa65ba4e7f6 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sat, 15 Jan 2011 17:21:16 +0100 Subject: [PATCH] Libev migration Cleanup, print resolved IP to log --- citadel/event_client.c | 15 +-------------- citadel/modules/smtp/serv_smtpeventclient.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/citadel/event_client.c b/citadel/event_client.c index 0d9c7b998..9ad065422 100644 --- a/citadel/event_client.c +++ b/citadel/event_client.c @@ -307,23 +307,11 @@ IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents) ssize_t nbytes; AsyncIO *IO = watcher->data; -// assert(fd == IO->sock); - -// assert(fd == sb->fd); -/* - CtdlLogPrintf(CTDL_DEBUG, "EVENT <- %d : [%s%s%s%s]\n", - (int) fd, - (event&EV_TIMEOUT) ? " timeout" : "", - (event&EV_READ) ? " read" : "", - (event&EV_WRITE) ? " write" : "", - (event&EV_SIGNAL) ? " signal" : ""); -*/ nbytes = StrBuf_read_one_chunk_callback(watcher->fd, 0 /*TODO */, &IO->RecvBuf); if (nbytes > 0) { HandleInbound(IO); } else if (nbytes == 0) { - IO->Timeout(IO); -/// TODO: this is a timeout??? sock_buff_invoke_free(sb, 0); seems as if socket is gone then? + IO->Timeout(IO); /* this is a timeout... */ return; } else if (nbytes == -1) { /// TODO: FD is gone. kick it. sock_buff_invoke_free(sb, errno); @@ -405,7 +393,6 @@ IO->curr_ai->ai_family, IO->HEnt->h_addr_list[0], sizeof(struct in_addr)); -// saddr.sin_addr.s_addr = inet_addr("85.88.5.80"); saddr.sin_family = AF_INET; saddr.sin_port = htons(IO->dport); rc = connect(IO->sock, diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c index d13f5238e..fc4dc20a6 100644 --- a/citadel/modules/smtp/serv_smtpeventclient.c +++ b/citadel/modules/smtp/serv_smtpeventclient.c @@ -256,10 +256,19 @@ void get_one_mx_host_ip_done(void *Ctx, AsyncIO *IO = Ctx; SmtpOutMsg *SendMsg = IO->Data; if ((status == ARES_SUCCESS) && (hostent != NULL) ) { + unsigned long psaddr; + // TODO: IPV6 + memcpy(&psaddr, hostent->h_addr_list[0], sizeof(psaddr)); + psaddr = ntohl(psaddr); + CtdlLogPrintf(CTDL_DEBUG, - "SMTP client[%ld]: connecting to %s [ip]: %d ...\n", + "SMTP client[%ld]: connecting to %s [%d.%d.%d.%d:%d] ...\n", SendMsg->n, SendMsg->mx_host, + (psaddr >> 24) & 0xFF, + (psaddr >> 16) & 0xFF, + (psaddr >> 8) & 0xFF, + (psaddr >> 0) & 0xFF, SendMsg->IO.dport); SendMsg->MyQEntry->Status = 5; -- 2.39.2