diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-03 18:13:16 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-03 18:13:16 +0100 |
| commit | b6eaaf49b62a316f99f43a666c6925068ffa354f (patch) | |
| tree | 2d8d19aa5f10068727b66f8f6fb35712b73a12bc /src/smtp.c | |
| parent | 490f4f89875e468ef7bed54a005eacb7822287df (diff) | |
| download | rspamd-b6eaaf49b62a316f99f43a666c6925068ffa354f.tar.gz rspamd-b6eaaf49b62a316f99f43a666c6925068ffa354f.zip | |
Upgrade rdns.
Diffstat (limited to 'src/smtp.c')
| -rw-r--r-- | src/smtp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/smtp.c b/src/smtp.c index 8ef68a675..6b7fbe1eb 100644 --- a/src/smtp.c +++ b/src/smtp.c @@ -592,11 +592,11 @@ smtp_dns_cb (struct rspamd_dns_reply *reply, void *arg) switch (session->state) { case SMTP_STATE_RESOLVE_REVERSE: /* Parse reverse reply and start resolve of this ip */ - if (reply->code != DNS_RC_NOERROR) { + if (reply->code != RDNS_RC_NOERROR) { rspamd_conditional_debug(rspamd_main->logger, session->client_addr.s_addr, __FUNCTION__, "DNS error: %s", dns_strerror (reply->code)); - if (reply->code == DNS_RC_NXDOMAIN) { + if (reply->code == RDNS_RC_NXDOMAIN) { session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_UNAVAILABLE); } else { @@ -610,17 +610,18 @@ smtp_dns_cb (struct rspamd_dns_reply *reply, void *arg) elt = reply->elements->data; session->hostname = memory_pool_strdup (session->pool, elt->ptr.name); session->state = SMTP_STATE_RESOLVE_NORMAL; - make_dns_request (session->resolver, session->s, session->pool, smtp_dns_cb, session, DNS_REQUEST_A, session->hostname); + make_dns_request (session->resolver, session->s, session->pool, + smtp_dns_cb, session, RDNS_REQUEST_A, session->hostname); } } break; case SMTP_STATE_RESOLVE_NORMAL: - if (reply->code != DNS_RC_NOERROR) { + if (reply->code != RDNS_RC_NOERROR) { rspamd_conditional_debug(rspamd_main->logger, session->client_addr.s_addr, __FUNCTION__, "DNS error: %s", dns_strerror (reply->code)); - if (reply->code == DNS_RC_NXDOMAIN) { + if (reply->code == RDNS_RC_NXDOMAIN) { session->hostname = memory_pool_strdup (session->pool, XCLIENT_HOST_UNAVAILABLE); } else { @@ -714,7 +715,7 @@ accept_socket (gint fd, short what, void *arg) session->s = new_async_session (session->pool, NULL, NULL, free_smtp_session, session); session->state = SMTP_STATE_RESOLVE_REVERSE; if (! make_dns_request (session->resolver, session->s, session->pool, - smtp_dns_cb, session, DNS_REQUEST_PTR, &session->client_addr)) { + smtp_dns_cb, session, RDNS_REQUEST_PTR, &session->client_addr)) { msg_err ("cannot resolve %s", inet_ntoa (session->client_addr)); g_free (session); close (nfd); |