Skip to content
Snippets Groups Projects
Commit cdc7cadb authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Adrien Béraud
Browse files

sipaccountbase: ensure the value for published ip address

Gitlab: #567

Change-Id: I9fdb1601f407759a8b6ef73bccc32769e5693b5b
parent d5021c78
No related branches found
No related tags found
No related merge requests found
...@@ -293,9 +293,8 @@ SIPAccountBase::unserialize(const YAML::Node& node) ...@@ -293,9 +293,8 @@ SIPAccountBase::unserialize(const YAML::Node& node)
parseValue(node, Conf::INTERFACE_KEY, interface_); parseValue(node, Conf::INTERFACE_KEY, interface_);
parseValue(node, Conf::SAME_AS_LOCAL_KEY, publishedSameasLocal_); parseValue(node, Conf::SAME_AS_LOCAL_KEY, publishedSameasLocal_);
std::string publishedIpAddress; parseValue(node, Conf::PUBLISH_ADDR_KEY, publishedIpAddress_);
parseValue(node, Conf::PUBLISH_ADDR_KEY, publishedIpAddress); IpAddr publishedIp {publishedIpAddress_};
IpAddr publishedIp {publishedIpAddress};
if (publishedIp and not publishedSameasLocal_) if (publishedIp and not publishedSameasLocal_)
setPublishedAddress(publishedIp); setPublishedAddress(publishedIp);
...@@ -332,6 +331,9 @@ SIPAccountBase::setAccountDetails(const std::map<std::string, std::string>& deta ...@@ -332,6 +331,9 @@ SIPAccountBase::setAccountDetails(const std::map<std::string, std::string>& deta
parseBool(details, Conf::CONFIG_PUBLISHED_SAMEAS_LOCAL, publishedSameasLocal_); parseBool(details, Conf::CONFIG_PUBLISHED_SAMEAS_LOCAL, publishedSameasLocal_);
parseString(details, Conf::CONFIG_PUBLISHED_ADDRESS, publishedIpAddress_); parseString(details, Conf::CONFIG_PUBLISHED_ADDRESS, publishedIpAddress_);
parseInt(details, Conf::CONFIG_PUBLISHED_PORT, publishedPort_); parseInt(details, Conf::CONFIG_PUBLISHED_PORT, publishedPort_);
IpAddr publishedIp {publishedIpAddress_};
if (publishedIp and not publishedSameasLocal_)
setPublishedAddress(publishedIp);
parseString(details, Conf::CONFIG_ACCOUNT_DTMF_TYPE, dtmfType_); parseString(details, Conf::CONFIG_ACCOUNT_DTMF_TYPE, dtmfType_);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment