Merge branch 'master' of github.com:hanzz/libtransport

backends/libcommuni/CMakeLists.txt

@@ -1,10 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 FILE(GLOB HEADERS *.h)
-QT4_WRAP_CPP(SRC ${HEADERS})
+QT4_WRAP_CPP(SRC ${HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
 ADD_EXECUTABLE(spectrum2_libcommuni_backend ${SRC})
 
-target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport pthread)
+if (NOT WIN32)
+	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport pthread)
+else ()
+	target_link_libraries(spectrum2_libcommuni_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
+endif()
 
 INSTALL(TARGETS spectrum2_libcommuni_backend RUNTIME DESTINATION bin)
 

backends/libcommuni/ircnetworkplugin.cpp

@@ -11,6 +11,7 @@ DEFINE_LOGGER(logger, "IRCNetworkPlugin");
 IRCNetworkPlugin::IRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) {
 	this->config = config;
 	m_currentServer = 0;
+	m_firstPing = true;
 	m_socket = new QTcpSocket();
 	m_socket->connectToHost(FROM_UTF8(host), port);
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
@@ -48,6 +49,17 @@ void IRCNetworkPlugin::readData() {
 	if (availableBytes == 0)
 		return;
 
+	if (m_firstPing) {
+		m_firstPing = false;
+		// Users can join the network without registering if we allow
+		// one user to connect multiple IRC networks.
+		if (m_servers.empty()) {
+			NetworkPlugin::PluginConfig cfg;
+			cfg.setNeedRegistration(false);
+			sendConfig(cfg);
+		}
+	}
+
 	std::string d = std::string(m_socket->readAll().data(), availableBytes);
 	handleDataRead(d);
 }

backends/libcommuni/ircnetworkplugin.h

@@ -46,4 +46,5 @@ class IRCNetworkPlugin : public QObject, public NetworkPlugin {
 		std::vector<std::string> m_servers;
 		int m_currentServer;
 		std::string m_identify;
+		bool m_firstPing;
 };

backends/libcommuni/session.cpp

@@ -189,6 +189,7 @@ void MyIrcSession::on_messageReceived(IrcMessage *message) {
 void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {
 	QString channel;
 	QStringList members;
+	std::string nick;
 
 	IrcNumericMessage *m = (IrcNumericMessage *) message;
 	switch (m->code()) {
@@ -196,7 +197,14 @@ void MyIrcSession::on_numericMessageReceived(IrcMessage *message) {
 			m_topicData = TO_UTF8(m->parameters().value(2));
 			break;
 		case 333:
-			 np->handleSubject(user, TO_UTF8(m->parameters().value(1)) + suffix, m_topicData, TO_UTF8(m->parameters().value(2)));
+			nick = TO_UTF8(m->parameters().value(2));
+			if (nick.find("!") != std::string::npos) {
+				nick = nick.substr(0, nick.find("!"));
+			}
+			if (nick.find("/") != std::string::npos) {
+				nick = nick.substr(0, nick.find("/"));
+			}
+			np->handleSubject(user, TO_UTF8(m->parameters().value(1)) + suffix, m_topicData, nick);
 			break;
 		case 353:
 			channel = m->parameters().value(2);

backends/twitter/main.cpp

@@ -39,8 +39,9 @@ int main (int argc, char* argv[]) {
 	StorageBackend *storagebackend;
 	storagebackend = StorageBackend::createBackend(cfg, error);
 	if (storagebackend == NULL) {
-		LOG4CXX_ERROR(logger, "Error creating StorageBackend! " << error)
-		return -2;
+		LOG4CXX_ERROR(logger, "Error creating StorageBackend! " << error);
+		LOG4CXX_ERROR(logger, "Twitter backend needs storage backend configured to work! " << error);
+		return NetworkPlugin::StorageBackendNeeded;
 	}
 
 	else if (!storagebackend->connect()) {

include/transport/conversation.h

@@ -148,6 +148,8 @@ class Conversation {
 		Swift::JID m_jid;
 		std::list<Swift::JID> m_jids;
 		std::map<std::string, Participant> m_participants;
+		boost::shared_ptr<Swift::Message> m_subject;
+		bool m_sentInitialPresence;
 };
 
 }

include/transport/networkplugin.h

@@ -35,6 +35,7 @@ namespace Transport {
 /// development.
 class NetworkPlugin {
 	public:
+		enum ExitCode { StorageBackendNeeded = -2 };
 
 		class PluginConfig {
 			public:

plugin/cpp/networkplugin.cpp

@@ -63,7 +63,7 @@ NetworkPlugin::~NetworkPlugin() {
 }
 
 void NetworkPlugin::sendConfig(const PluginConfig &cfg) {
-	std::string data = "[registration]";
+	std::string data = "[registration]\n";
 	data += std::string("needPassword=") + (cfg.m_needPassword ? "1" : "0") + "\n";
 	data += std::string("needRegistration=") + (cfg.m_needRegistration ? "1" : "0") + "\n";
 

spectrum/src/main.cpp

@@ -266,7 +266,13 @@ int main(int argc, char **argv)
 	bool no_daemon = false;
 	std::string config_file;
 	std::string jid;
-
+#ifdef WIN32
+	std::string install_service_name, uninstall_service_name, run_service_name;
+	// determine the name of the currently executing file
+	char szFilePath[MAX_PATH];
+	GetModuleFileNameA(NULL, szFilePath, sizeof(szFilePath));
+	std::string exe_file(szFilePath);					
+#endif	
 	setlocale(LC_ALL, "");
 #ifndef WIN32
 #ifndef __FreeBSD__
@@ -297,8 +303,9 @@ int main(int argc, char **argv)
 		;
 #ifdef WIN32
  	desc.add_options()
- 		("install-service,i", "Install spectrum as Windows service")
- 		("uninstall-service,u", "Uninstall Windows service");
+		("install-service,i", boost::program_options::value<std::string>(&install_service_name)->default_value(""), "Install spectrum as Windows service")
+ 		("uninstall-service,u", boost::program_options::value<std::string>(&uninstall_service_name)->default_value(""), "Uninstall Windows service")
+		("run-as-service,r", boost::program_options::value<std::string>(&run_service_name)->default_value(""), "stub for Windows Service Manager");
 #endif
 	try
 	{
@@ -327,41 +334,38 @@ int main(int argc, char **argv)
 		if(vm.count("no-daemonize")) {
 			no_daemon = true;
 		}
-#ifdef WIN32
-		if (vm.count("install-service")) {
-			ServiceWrapper ntservice("Spectrum2");
+#ifdef WIN32	
+		if (!install_service_name.empty()) {				
+			// build command line for Service Manager
+			std::string service_path = exe_file + std::string(" --config ") + vm["config"].as<std::string>() 
+						+ std::string(" --run-as-service ") + install_service_name;													
+		
+			ServiceWrapper ntservice((char *)install_service_name.c_str());
 			if (!ntservice.IsInstalled()) {
-					// determine the name of the currently executing file
-				char szFilePath[MAX_PATH];
-				GetModuleFileNameA(NULL, szFilePath, sizeof(szFilePath));
-				std::string exe_file(szFilePath);
-				std::string config_file = exe_file.replace(exe_file.end() - 4, exe_file.end(), ".cfg");
-				std::string service_path = std::string(szFilePath) + std::string(" --config ") + config_file;
-
 				if (ntservice.Install((char *)service_path.c_str())) {
-					std::cout << "Successfully installed" << std::endl;
+					std::cout << "Successfully installed " << install_service_name << std::endl;
 					return 0;
 				} else {
 					std::cout << "Error installing service, are you an Administrator?" << std::endl;
 					return 1;
 				}                				
 			} else {
-				std::cout << "Already installed" << std::endl;
+				std::cout << "Already installed " << install_service_name << std::endl;
 				return 1;
 			}
 		}
-		if (vm.count("uninstall-service")) {
-			ServiceWrapper ntservice("Spectrum2");
+		if (!uninstall_service_name.empty()) {
+			ServiceWrapper ntservice((char *)uninstall_service_name.c_str());
 			if (ntservice.IsInstalled()) {
 				if (ntservice.UnInstall()) {
-					std::cout << "Successfully removed" << std::endl;
+					std::cout << "Successfully removed " << uninstall_service_name << std::endl;
 					return 0;
 				} else {
 					std::cout << "Error removing service, are you an Administrator?" << std::endl;
 					return 1;
 				}                               				
 			} else {
-				std::cout << "Service not installed" << std::endl;
+				std::cout << "Service not installed: " << uninstall_service_name << std::endl;
 				return 1;
 			}
 		}		
@@ -441,9 +445,14 @@ int main(int argc, char **argv)
     }
 #endif
 #ifdef WIN32
-	ServiceWrapper ntservice("Spectrum2");
-	if (ntservice.IsInstalled()) {
-		ntservice.RunService();
+	if (!run_service_name.empty()) {
+		ServiceWrapper ntservice((char *)run_service_name.c_str());
+		if (ntservice.IsInstalled()) {
+			ntservice.RunService();
+		} else {
+			std::cerr << "Service not installed: " << run_service_name << std::endl;
+			return 1;
+		}
 	} else {
 		mainloop();
 	}

src/conversation.cpp

@@ -33,6 +33,7 @@ Conversation::Conversation(ConversationManager *conversationManager, const std::
 // 	m_conversationManager->addConversation(this);
 	m_muc = isMUC;
 	m_jid = m_conversationManager->getUser()->getJID().toBare();
+	m_sentInitialPresence = false;
 }
 
 Conversation::~Conversation() {
@@ -128,6 +129,11 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 		BOOST_FOREACH(const Swift::JID &jid, m_jids) {
 			message->setTo(jid);
 			message->setFrom(Swift::JID(legacyName, m_conversationManager->getComponent()->getJID().toBare(), n));
+			// Subject has to be sent after our own presence (the one with code 110)
+			if (!message->getSubject().empty() && m_sentInitialPresence == false) {
+				m_subject = message;
+				return;
+			}
 			m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
 		}
 	}
@@ -169,6 +175,7 @@ Swift::Presence::ref Conversation::generatePresence(const std::string &nick, int
 		Swift::MUCUserPayload::StatusCode c;
 		c.code = 110;
 		p->addStatusCode(c);
+		m_sentInitialPresence = true;
 	}
 
 	
@@ -217,6 +224,11 @@ void Conversation::handleParticipantChanged(const std::string &nick, int flag, i
 	if (!newname.empty()) {
 		handleParticipantChanged(newname, flag, status, statusMessage);
 	}
+
+	if (m_sentInitialPresence && m_subject) {
+		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(m_subject);
+		m_subject.reset();
+	}
 }
 
 }

src/networkpluginserver.cpp

@@ -332,7 +332,13 @@ void NetworkPluginServer::start() {
 		if (result != 0) {
 			if (WIFEXITED(status)) {
 				if (WEXITSTATUS(status) != 0) {
-					LOG4CXX_ERROR(logger, "Backend can not be started, exit_code=" << WEXITSTATUS(status) << ", possible error: " << strerror(WEXITSTATUS(status)));
+					if (status == 254) {
+						LOG4CXX_ERROR(logger, "Backend can not be started, because it needs database to store data, but the database backend is not configured.");
+					}
+					else {
+						LOG4CXX_ERROR(logger, "Backend can not be started, exit_code=" << WEXITSTATUS(status) << ", possible error: " << strerror(WEXITSTATUS(status)));
+					}
+					LOG4CXX_ERROR(logger, "Check backend log for more details");
 					continue;
 				}
 			}

src/tests/conversationmanager.cpp

@@ -94,26 +94,35 @@ class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe
 
 	void handleSubjectMessages() {
 		User *user = userManager->getUser("user@localhost");
-
-		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "buddy1");
-		user->getConversationManager()->addConversation(conv);
+		TestingConversation *conv = new TestingConversation(user->getConversationManager(), "#room", true);
+		
 		conv->onMessageToSend.connect(boost::bind(&ConversationManagerTest::handleMessageReceived, this, _1, _2));
+		conv->setNickname("nickname");
+		conv->addJID("user@localhost/resource");
 
 		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 		msg->setSubject("subject");
+		msg->setType(Swift::Message::Groupchat);
 
-		// Forward it
 		conv->handleMessage(msg);
 		loop->processEvents();
+
+		// No response, because presence with code 110 has not been sent yet and we must not send
+		// subject before this one.
+		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
+
+		// this user presence - status code 110
+		conv->handleParticipantChanged("nickname", 1, Swift::StatusShow::Away, "my status message");
+		loop->processEvents();
 		
-		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
-		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[0])));
-		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[0]))->getSubject());
+		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());
+		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));
+		CPPUNIT_ASSERT_EQUAL(std::string("subject"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getSubject());
 		received.clear();
 
 		// send response
 		msg->setFrom("user@localhost/resource");
-		msg->setTo("buddy1@localhost/bot");
+		msg->setTo("#room@localhost");
 		injectMessage(msg);
 		loop->processEvents();
 		

src/usermanager.cpp

@@ -247,7 +247,8 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 		// We allow auto_register feature in gateway-mode. This allows IRC user to register
 		// the transport just by joining the room.
 		if (!m_component->inServerMode()) {
-			if (!registered && CONFIG_BOOL(m_component->getConfig(), "registration.auto_register")) {
+			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register") ||
+				!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true))) {
 				res.password = "";
 				res.jid = userkey;