jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

* #28529: sip: fix port range unserialization

Browse Source
This commit is contained in:
Tristan Matthews
2013-08-16 14:04:25 -04:00
parent 04650efd69
commit 6ffe2aeac7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/src/sip/sipaccount.cpp
View File

@ -155,15 +155,13 @@ serializeRange(Conf::MappingNode &accountMap, const char *minKey, const char *ma
void
unserializeRange(const Conf::YamlNode &mapNode, const char *minKey, const char *maxKey, std::pair<uint16_t, uint16_t> &range)
{
std::stringstream ss;
ss << mapNode.getValue(minKey);
uint16_t tmp;
ss >> tmp;
int tmp = 0;
mapNode.getValue(minKey, &tmp);
if (tmp)
range.first = tmp;
ss.str("");
ss << mapNode.getValue(maxKey);
ss >> tmp;
mapNode.getValue(maxKey, &tmp);
if (tmp)
range.second = tmp;
}
@ -323,9 +321,9 @@ void SIPAccount::serialize(Conf::YamlEmitter &emitter)
ScalarNode userAgent(userAgent_);
accountmap.setKeyValue(USER_AGENT_KEY, &userAgent);
std::array<std::unique_ptr<ScalarNode>, 2> audioPortNodes(serializeRange(accountmap, AUDIO_PORT_MIN_KEY, AUDIO_PORT_MAX_KEY, audioPortRange_));
auto audioPortNodes(serializeRange(accountmap, AUDIO_PORT_MIN_KEY, AUDIO_PORT_MAX_KEY, audioPortRange_));
#ifdef SFL_VIDEO
std::array<std::unique_ptr<ScalarNode>, 2> videoPortNodes(serializeRange(accountmap, VIDEO_PORT_MIN_KEY, VIDEO_PORT_MAX_KEY, videoPortRange_));
auto videoPortNodes(serializeRange(accountmap, VIDEO_PORT_MIN_KEY, VIDEO_PORT_MAX_KEY, videoPortRange_));
#endif
try {