Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-11-13 10:54:58 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-14 13:40:05 (GMT) |
| commit | 5d7fc97148125584a44a39a4beee1e71d9518385 (patch) | |
| tree | 9f630e8a9f69bdbd701c1b3c082bacf2b769938d /Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp | |
| parent | c0615a472f8d23ce449fd59bbb1cdf7071082a43 (diff) | |
| download | swift-5d7fc97148125584a44a39a4beee1e71d9518385.zip swift-5d7fc97148125584a44a39a4beee1e71d9518385.tar.bz2 | |
Address LinkLocal issues
Generation of TXT records might fail if any of the fields is too long,
so the result is now an optional (pending Expected). Callsites have been
updated to deal with this.
Three potentially uncaught exceptions in the Bonjour implementation have
been addressed.
Test-Information:
Unit tests pass on macOS 10.14 and Debian 9
Change-Id: Iec02c4606a18eee855362fd3c3d15614a9e72547
Diffstat (limited to 'Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp')
| -rw-r--r-- | Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp index ab1ee0c..59cf996 100644 --- a/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp +++ b/Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp | |||
| @@ -115,11 +115,13 @@ class LinkLocalConnectorTest : public CppUnit::TestFixture { | |||
| 115 | 115 | ||
| 116 | private: | 116 | private: |
| 117 | std::shared_ptr<LinkLocalConnector> createConnector(const std::string& hostname, unsigned short port) { | 117 | std::shared_ptr<LinkLocalConnector> createConnector(const std::string& hostname, unsigned short port) { |
| 118 | auto txtRecord = LinkLocalServiceInfo().toTXTRecord(); | ||
| 119 | CPPUNIT_ASSERT(txtRecord); | ||
| 118 | LinkLocalService service( | 120 | LinkLocalService service( |
| 119 | DNSSDServiceID("myname", "local."), | 121 | DNSSDServiceID("myname", "local."), |
| 120 | DNSSDResolveServiceQuery::Result( | 122 | DNSSDResolveServiceQuery::Result( |
| 121 | "myname._presence._tcp.local", hostname, port, | 123 | "myname._presence._tcp.local", hostname, port, |
| 122 | LinkLocalServiceInfo().toTXTRecord())); | 124 | *txtRecord)); |
| 123 | std::shared_ptr<LinkLocalConnector> result( | 125 | std::shared_ptr<LinkLocalConnector> result( |
| 124 | new LinkLocalConnector(service, querier, connection)); | 126 | new LinkLocalConnector(service, querier, connection)); |
| 125 | result->onConnectFinished.connect( | 127 | result->onConnectFinished.connect( |