Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
cdc7cadb
Commit
cdc7cadb
authored
Jun 18, 2021
by
Ming Rui Zhang
Committed by
Adrien Béraud
Jun 29, 2021
Browse files
sipaccountbase: ensure the value for published ip address
Gitlab: #567 Change-Id: I9fdb1601f407759a8b6ef73bccc32769e5693b5b
parent
d5021c78
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sip/sipaccountbase.cpp
View file @
cdc7cadb
...
...
@@ -293,9 +293,8 @@ SIPAccountBase::unserialize(const YAML::Node& node)
parseValue
(
node
,
Conf
::
INTERFACE_KEY
,
interface_
);
parseValue
(
node
,
Conf
::
SAME_AS_LOCAL_KEY
,
publishedSameasLocal_
);
std
::
string
publishedIpAddress
;
parseValue
(
node
,
Conf
::
PUBLISH_ADDR_KEY
,
publishedIpAddress
);
IpAddr
publishedIp
{
publishedIpAddress
};
parseValue
(
node
,
Conf
::
PUBLISH_ADDR_KEY
,
publishedIpAddress_
);
IpAddr
publishedIp
{
publishedIpAddress_
};
if
(
publishedIp
and
not
publishedSameasLocal_
)
setPublishedAddress
(
publishedIp
);
...
...
@@ -332,6 +331,9 @@ SIPAccountBase::setAccountDetails(const std::map<std::string, std::string>& deta
parseBool
(
details
,
Conf
::
CONFIG_PUBLISHED_SAMEAS_LOCAL
,
publishedSameasLocal_
);
parseString
(
details
,
Conf
::
CONFIG_PUBLISHED_ADDRESS
,
publishedIpAddress_
);
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_
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment