libtransport.git Changeset - 90ef6e3128f2

Changeset - 90ef6e3128f2

Parent rev.

Child rev.

[Not reviewed]

0 17 0

Jan Kaluza - 10 years ago 2015-11-10 11:18:48
jkaluza@redhat.com

Fix HAVE_SWIFTEN_3 definition to work also in gcc. Fix the tests to work with swiften3 and also with swiften2.

17 files changed with 55 insertions and 27 deletions:

backends/libyahoo2/main.cpp

backends/swiften/main.cpp

backends/twitter/TwitterPlugin.h

include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h

include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h

include/Swiften/Network/DummyConnectionServer.h

include/Swiften/Network/DummyNetworkFactories.h

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

include/Swiften/Server/ServerStanzaChannel.h

include/transport/filetransfermanager.h

include/transport/networkpluginserver.h

include/transport/settingsadhoccommand.h

include/transport/userregistration.h

src/discoinforesponder.h

src/tests/basictest.h

src/tests/settingsadhoccommand.cpp

0 comments (0 inline, 0 general)

backends/libyahoo2/main.cpp

➞

Show inline comments

 // Transport includes
 #include "transport/config.h"
 #include "transport/networkplugin.h"
 #include "transport/logging.h"
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 // Yahoo2
 #include <yahoo2.h>
 #include <yahoo2_callbacks.h>
 #include <stdio.h>
 #include <stdarg.h>

backends/swiften/main.cpp

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ @@
 #include "boost/date_time/posix_time/posix_time.hpp"
 // Swiften
 #include "Swiften/Swiften.h"
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 #ifndef WIN32
 // for signal handler
 #include "unistd.h"
 #include "signal.h"
 #include "sys/wait.h"

backends/twitter/TwitterPlugin.h

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ @@
 #include <map>
 #include <vector>
 #include <queue>
 #include <set>
 #include <cstdio>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 #if HAVE_SWIFTEN_3
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #else
 #include "Swiften/StringCodecs/SHA1.h"
 #endif

include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #include <Swiften/JID/JID.h>
 #include "transport/presenceoracle.h"
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Swift {
 class JingleSessionManager;
 class IQRouter;
 class EntityCapsProvider;

include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/StreamInitiation.h>
 #include <Swiften/Elements/Bytestreams.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/FileTransfer/IBBSendSession.h>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Swift {
 	class IQRouter;
 	class SOCKS5BytestreamServer;
 	class SOCKS5BytestreamRegistry;

include/Swiften/Network/DummyConnectionServer.h

➞

Show inline comments

@@ @@ -12,12 +12,13 @@ @@
 #include <boost/enable_shared_from_this.hpp>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Network/DummyConnection.h>
 #include <Swiften/Network/ConnectionServer.h>
 #include <Swiften/EventLoop/EventOwner.h>
 #include <Swiften/Version.h>
 namespace Swift {
 	class DummyConnectionServer : public ConnectionServer, public EventOwner, public boost::enable_shared_from_this<DummyConnectionServer> {
 		public:
 			typedef boost::shared_ptr<DummyConnectionServer> ref;
@@ @@ -29,15 +30,17 @@ namespace Swift { @@
 			static ref create(EventLoop* eventLoop) {
 				return ref(new DummyConnectionServer(eventLoop));
+			}
 			void acceptConnection(boost::shared_ptr<Swift::Connection> connection);
 			virtual boost::optional<Swift::ConnectionServer::Error> tryStart() {
 				return boost::optional<Swift::ConnectionServer::Error>();
 #if (SWIFTEN_VERSION >= 0x030000)
 			virtual boost::optional<ConnectionServer::Error> tryStart() {
 				return boost::optional<ConnectionServer::Error>();
+			}
 #endif
 			virtual void start();
 			virtual void stop();
 			virtual HostAddressPort getAddressPort() const;

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 #pragma once
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 #if HAVE_SWIFTEN_3
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/IDN/PlatformIDNConverter.h>

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -26,12 +26,17 @@ @@
 #include <Swiften/StreamStack/TLSServerLayer.h>
 #include <Swiften/Elements/StartTLSRequest.h>
 #include <Swiften/Elements/TLSProceed.h>
 #include <iostream>
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/Version.h>
 #if (SWIFTEN_VERSION >= 0x030000)
 #include <Swiften/Elements/ToplevelElement.h>
 #endif
 namespace Swift {
 ServerFromClientSession::ServerFromClientSession(
 		const std::string& id,
 		boost::shared_ptr<Connection> connection,
 		PayloadParserFactoryCollection* payloadParserFactories,
+		}
 		finishSession(AuthenticationFailedError);
+	}
+}
 #if (SWIFTEN_VERSION >= 0x030000)
 void ServerFromClientSession::handleElement(boost::shared_ptr<ToplevelElement> element) {
 #else
 void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element) {
 #endif
 	if (isInitialized()) {
 		onElementReceived(element);
+	}
 	else {
 		if (AuthRequest* authRequest = dynamic_cast<AuthRequest*>(element.get())) {
 			if (authRequest->getMechanism() == "PLAIN" || (allowSASLEXTERNAL && authRequest->getMechanism() == "EXTERNAL")) {

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ @@
 #include <Swiften/Session/Session.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Network/Connection.h>
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Swift {
 	class ProtocolHeader;
 	class Element;
 	class Stanza;
 	class PayloadParserFactoryCollection;

include/Swiften/Server/ServerStanzaChannel.h

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
 #include "Swiften/Client/StanzaChannel.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/IQ.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/TLS/Certificate.h"
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Swift {
 	class Error;
 	class ServerStanzaChannel : public StanzaChannel {
 		public:
 			void addSession(boost::shared_ptr<ServerFromClientSession> session);

include/transport/filetransfermanager.h

➞

Show inline comments

@@ @@ -17,29 +17,28 @@ @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #pragma once
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 #include <Swiften/Elements/StreamInitiationFileInfo.h>
 #if !HAVE_SWIFTEN_3
 #include <Swiften/FileTransfer/ConnectivityManager.h>
 #endif
 #include <Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h>
 #include <Swiften/FileTransfer/IncomingFileTransferManager.h>
 #if !HAVE_SWIFTEN_3
 #include <Swiften/FileTransfer/DefaultLocalJingleTransportCandidateGeneratorFactory.h>
 #include <Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelectorFactory.h>
 #else
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #endif
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
 #if !HAVE_SWIFTEN_3
 #if HAVE_SWIFTEN_3
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
 #else
 #include <Swiften/FileTransfer/ConnectivityManager.h>
 #include <Swiften/FileTransfer/DefaultLocalJingleTransportCandidateGeneratorFactory.h>
 #include <Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelectorFactory.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxy.h>
 #endif
 namespace Transport {
 class UserManager;

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ @@
 #include "Swiften/Parser/XMPPParser.h"
 #include "Swiften/Parser/XMPPParserClient.h"
 #include "Swiften/Serializer/XMPPSerializer.h"
 #include "storagebackend.h"
 #include "transport/filetransfermanager.h"
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 class UserManager;
 class User;
 class Component;

include/transport/settingsadhoccommand.h

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ @@
 #include <string>
 #include <algorithm>
 #include <map>
 #include "transport/adhoccommand.h"
 #include "transport/adhoccommandfactory.h"
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 class Component;
 class UserManager;

include/transport/userregistration.h

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ @@
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/InBandRegistrationPayload.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include <boost/signal.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 struct UserInfo;
 class Component;
 class StorageBackend;

src/discoinforesponder.h

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ @@
 #include <list>
 #include <boost/signal.hpp>
 #include "Swiften/Queries/GetResponder.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Elements/CapsInfo.h"
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 #if HAVE_SWIFTEN_3
 #include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/Crypto/PlatformCryptoProvider.h>
 #endif

src/tests/basictest.h

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ @@
 #include <Swiften/Server/Server.h>
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+#define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 using namespace Transport;
 class TestingConversation : public Conversation {
 	public:
 		TestingConversation(ConversationManager *conversationManager, const std::string &legacyName, bool muc = false) : Conversation(conversationManager, legacyName, muc) {

src/tests/settingsadhoccommand.cpp

➞

Show inline comments

@@ @@ -16,12 +16,13 @@ @@
 #include <Swiften/Server/Server.h>
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Version.h"
 #include "basictest.h"
 using namespace Transport;
 class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST_SUITE(SettingsAdHocCommandTest);
 			// form element
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm()->getField("enable_transport"));
 			// set enabled_transport = 0
 			Swift::FormField::ref f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("enable_transport");
 #if (SWIFTEN_VERSION >= 0x030000)
 			f->setBoolValue(false);
 #else
 			boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->setValue(false);
 #endif
 			std::string sessionId = getStanza(received[0])->getPayload<Swift::Command>()->getSessionID();
+			{
 			std::string value = "0";
 			int type;
 			// form element
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm()->getField("enable_transport"));
 			// set enabled_transport = 0
 			f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("enable_transport");
 #if (SWIFTEN_VERSION >= 0x030000)
 			CPPUNIT_ASSERT_EQUAL(false, f->getBoolValue());
 #else
 			CPPUNIT_ASSERT_EQUAL(false, boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->getValue());
 #endif
+		}
 		void executeTwoCommands() {
 			addUser();
 			boost::shared_ptr<Swift::Command> payload(new Swift::Command("settings"));
 			boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload);
 			// form element
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm()->getField("send_headlines"));
 			// set enabled_transport = 0
 			Swift::FormField::ref f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("send_headlines");
 #if (SWIFTEN_VERSION >= 0x030000)
 			f->setBoolValue(true);
 #else
 			boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->setValue(true);
 #endif
 			std::string sessionId = getStanza(received[0])->getPayload<Swift::Command>()->getSessionID();
 			// finish the command
 			payload = boost::shared_ptr<Swift::Command>(new Swift::Command("settings"));
 			payload->setSessionID(sessionId);
 			CPPUNIT_ASSERT_EQUAL(Swift::Command::Executing, getStanza(received[0])->getPayload<Swift::Command>()->getStatus());
 			// form element
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
 			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm()->getField("send_headlines"));
 			Swift::FormField::ref f = getStanza(received[0])->getPayload<Swift:: Command>()->getForm()->getField("send_headlines");
 #if (SWIFTEN_VERSION >= 0x030000)
 			CPPUNIT_ASSERT_EQUAL(true, f->getBoolValue());
 #else
 			CPPUNIT_ASSERT_EQUAL(true, boost::dynamic_pointer_cast<Swift::BooleanFormField>(f)->getValue());
 #endif
+		}
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (SettingsAdHocCommandTest);

0 comments (0 inline, 0 general)