1 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp
index 2975193..09b664f 100644
--- a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp
+++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp
@@ -1,51 +1,50 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
  * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h>
 
 #include <memory>
 #include <vector>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h>
 
 static const unsigned int LOCAL_PREFERENCE = 0;
 
 namespace Swift {
 
 LocalJingleTransportCandidateGenerator::LocalJingleTransportCandidateGenerator(
         SOCKS5BytestreamServerManager* s5bServerManager,
         SOCKS5BytestreamProxiesManager* s5bProxy,
         const JID& ownJID,
         IDGenerator* idGenerator,
         const FileTransferOptions& options) :
             s5bServerManager(s5bServerManager),
             s5bProxy(s5bProxy),
             ownJID(ownJID),
             idGenerator(idGenerator),
             triedServerInit_(false),
             triedForwarding_(false),
             triedProxyDiscovery_(false),
             options_(options) {
 }
 
 LocalJingleTransportCandidateGenerator::~LocalJingleTransportCandidateGenerator() {
     SWIFT_LOG_ASSERT(!s5bServerInitializeRequest, warning) << std::endl;
 }
 
@@ -113,79 +112,80 @@ void LocalJingleTransportCandidateGenerator::handlePortForwardingSetup(bool /* s
     if (s5bServerPortForwardingUser_) {
         s5bServerPortForwardingUser_->onSetup.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handlePortForwardingSetup, this, _1));
     }
     triedForwarding_ = true;
     checkS5BCandidatesReady();
 }
 
 void LocalJingleTransportCandidateGenerator::handleDiscoveredProxiesChanged() {
     if (s5bProxy) {
         s5bProxy->onDiscoveredProxiesChanged.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleDiscoveredProxiesChanged, this));
     }
     triedProxyDiscovery_ = true;
     checkS5BCandidatesReady();
 }
 
 void LocalJingleTransportCandidateGenerator::checkS5BCandidatesReady() {
     if ((!options_.isDirectAllowed()  || (options_.isDirectAllowed()  && triedServerInit_)) &&
         (!options_.isProxiedAllowed() || (options_.isProxiedAllowed() && triedProxyDiscovery_)) &&
         (!options_.isAssistedAllowed()  || (options_.isAssistedAllowed()  && triedForwarding_))) {
         emitOnLocalTransportCandidatesGenerated();
     }
 }
 
 
 void LocalJingleTransportCandidateGenerator::emitOnLocalTransportCandidatesGenerated() {
     std::vector<JingleS5BTransportPayload::Candidate> candidates;
 
     if (options_.isDirectAllowed()) {
         // get direct candidates
         std::vector<HostAddressPort> directCandidates = s5bServerManager->getHostAddressPorts();
-        foreach(HostAddressPort addressPort, directCandidates) {
+        for(auto&& addressPort : directCandidates) {
             if (addressPort.getAddress().getRawAddress().is_v6() &&
                 addressPort.getAddress().getRawAddress().to_v6().is_link_local()) {
                 continue;
             }
             JingleS5BTransportPayload::Candidate candidate;
             candidate.type = JingleS5BTransportPayload::Candidate::DirectType;
             candidate.jid = ownJID;
             candidate.hostPort = addressPort;
             candidate.priority = 65536 * 126 + LOCAL_PREFERENCE;
             candidate.cid = idGenerator->generateID();
             candidates.push_back(candidate);
         }
     }
 
     if (options_.isAssistedAllowed()) {
         // get assissted candidates
         std::vector<HostAddressPort> assisstedCandidates = s5bServerManager->getAssistedHostAddressPorts();
-        foreach(HostAddressPort addressPort, assisstedCandidates) {
+        for (auto&& addressPort : assisstedCandidates) {
             JingleS5BTransportPayload::Candidate candidate;
             candidate.type = JingleS5BTransportPayload::Candidate::AssistedType;
             candidate.jid = ownJID;
             candidate.hostPort = addressPort;
             candidate.priority = 65536 * 120 + LOCAL_PREFERENCE;
             candidate.cid = idGenerator->generateID();
             candidates.push_back(candidate);
         }
     }
 
     if (options_.isProxiedAllowed() && s5bProxy->getOrDiscoverS5BProxies().is_initialized()) {
-        foreach(S5BProxyRequest::ref proxy, s5bProxy->getOrDiscoverS5BProxies().get()) {
+        for (auto&& proxy : s5bProxy->getOrDiscoverS5BProxies().get()) {
             if (proxy->getStreamHost()) { // FIXME: Added this test, because there were cases where this wasn't initialized. Investigate this. (Remko)
                 JingleS5BTransportPayload::Candidate candidate;
                 candidate.type = JingleS5BTransportPayload::Candidate::ProxyType;
                 candidate.jid = (*proxy->getStreamHost()).jid;
-                HostAddress address = (*proxy->getStreamHost()).host;
-                assert(address.isValid());
-                candidate.hostPort = HostAddressPort(address, (*proxy->getStreamHost()).port);
-                candidate.priority = 65536 * 10 + LOCAL_PREFERENCE;
-                candidate.cid = idGenerator->generateID();
-                candidates.push_back(candidate);
+                auto address = HostAddress::fromString((*proxy->getStreamHost()).host);
+                if (address) {
+                    candidate.hostPort = HostAddressPort(address.get(), (*proxy->getStreamHost()).port);
+                    candidate.priority = 65536 * 10 + LOCAL_PREFERENCE;
+                    candidate.cid = idGenerator->generateID();
+                    candidates.push_back(candidate);
+                }
             }
         }
     }
 
     onLocalTransportCandidatesGenerated(candidates);
 }
 
 }