Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-11-08 14:29:17 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-11-18 08:49:39 (GMT) |
| commit | 43479ef719ea8fc6abbf654730b47c4583140508 (patch) | |
| tree | c0a05a837b8988c0875fedb6161c08f3dcb2ffb0 /Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp | |
| parent | c82f95fd431e702137d5f2e3dda4cf0ae424e837 (diff) | |
| download | swift-43479ef719ea8fc6abbf654730b47c4583140508.zip swift-43479ef719ea8fc6abbf654730b47c4583140508.tar.bz2 | |
Improve string to HostAddress conversion API
Previously HostAddress had a constructor which allowed
initialisation via a std::string. This initialisation can
fail and this is heavily used for checking whether a string
is a valid IP address.
This constructor is removed in this commit and replaced by
a static method HostAddress::fromString, taking a string and
returning an optional HostAddress. This clearly communicates
that the conversion can fail.
Test-Information:
./scons test=all passes on macOS 10.12.1.
Change-Id: Idaafee6f84010ce541c55f267ac77ad6ac8f02b4
Diffstat (limited to 'Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp b/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp index 859dcec..e639e20 100644 --- a/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp +++ b/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp @@ -44,7 +44,7 @@ namespace Swift { try { port = boost::lexical_cast<int>(attributes.getAttributeValue("port").get_value_or("-1")); } catch(boost::bad_lexical_cast &) { } - candidate.hostPort = HostAddressPort(HostAddress(attributes.getAttributeValue("host").get_value_or("")), port); + candidate.hostPort = HostAddressPort(HostAddress::fromString(attributes.getAttributeValue("host").get_value_or("")).get_value_or(HostAddress()), port); candidate.jid = JID(attributes.getAttributeValue("jid").get_value_or("")); int priority = -1; try { @@ -70,8 +70,6 @@ namespace Swift { void JingleS5BTransportMethodPayloadParser::handleEndElement(const std::string&, const std::string&) { --level; - - } void JingleS5BTransportMethodPayloadParser::handleCharacterData(const std::string&) { |