From c199bf8d2cdff939eac41894da82cbe6f137c1a7 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 16 Feb 2011 15:29:55 +0100 Subject: [PATCH] b/f: fixes bug introduced in 3a6d778. --- apps/voicemail/AmMail.cpp | 3 ++- apps/voicemail/AmSmtpClient.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/voicemail/AmMail.cpp b/apps/voicemail/AmMail.cpp index 6dcc49df..ef62b271 100644 --- a/apps/voicemail/AmMail.cpp +++ b/apps/voicemail/AmMail.cpp @@ -107,7 +107,8 @@ void AmMailDeamon::run() AnswerMachineFactory::SmtpServerPort)) { WARN("Mail deamon could not connect to SMTP server at <%s:%i>\n", - server_address.c_str(),AnswerMachineFactory::SmtpServerPort); + AnswerMachineFactory::SmtpServerAddress.c_str(), + AnswerMachineFactory::SmtpServerPort); continue; } diff --git a/apps/voicemail/AmSmtpClient.cpp b/apps/voicemail/AmSmtpClient.cpp index 70d2cee7..1fe9dfcf 100644 --- a/apps/voicemail/AmSmtpClient.cpp +++ b/apps/voicemail/AmSmtpClient.cpp @@ -38,6 +38,8 @@ #include "AmUtils.h" #include "log.h" +#include "sip/resolver.h" + #define B64_FRAME_LINE_SIZE 15 #define B64_MAX_BUF_LINES 45 @@ -83,7 +85,7 @@ bool AmSmtpClient::connect(const string& _server_ip, unsigned short _server_port sockaddr_storage _sa; dns_handle _dh; - if(resolver::instance->resolve_name(server_ip.c_str(), + if(resolver::instance()->resolve_name(server_ip.c_str(), &_dh,&_sa,IPv4) < 0) { ERROR("address not valid (smtp server: %s)\n",server_ip.c_str()); return false;