Libev migration Cleanup, print resolved IP to log

diff --git a/citadel/event_client.c b/citadel/event_client.c
index 0d9c7b998a16b446ca987e02f6eec65cefc11751..9ad065422341a98ec8da5035c0dd31245c74c3bc 100644 (file)
--- 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 d13f5238e1a74183d73a11742ba94012dde5e092..fc4dc20a64ed1ee83704760ee4fc4a130f3cb088 100644 (file)
--- 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;