Find libyahoo2 properly

CMakeLists.txt

@@ -63,6 +63,9 @@ find_package(pqxx)
 set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(dbus)
 
+set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
+find_package(yahoo2)
+
 find_package(Doxygen)
 
 INCLUDE(FindQt4)
@@ -162,6 +165,13 @@ if (PROTOBUF_FOUND)
 		message("Skype plugin      : no (install dbus-glib-devel)")
 	endif()
 
+	if(YAHOO2_FOUND)
+		message("Libyahoo2 plugin  : yes")
+		include_directories(${YAHOO2_INCLUDE_DIR})
+	else()
+		message("Libyahoo2 plugin  : no (install libyahoo2-devel)")
+	endif()
+
 else()
 	message("Network plugins   : no (install libprotobuf-dev)")
 	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")

backends/CMakeLists.txt

@@ -11,6 +11,10 @@ if (PROTOBUF_FOUND)
 
 	ADD_SUBDIRECTORY(swiften)
 
+	if(YAHOO2_FOUND)
+		ADD_SUBDIRECTORY(libyahoo2)
+	endif()
+
 	ADD_SUBDIRECTORY(template)
 
 if (NOT WIN32)

backends/libyahoo2/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.6)
+
+FILE(GLOB SRC *.c *.cpp)
+
+ADD_EXECUTABLE(spectrum2_libyahoo2_backend ${SRC})
+
+target_link_libraries(spectrum2_libyahoo2_backend transport pthread ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${YAHOO2_LIBRARY})
+
+INSTALL(TARGETS spectrum2_libyahoo2_backend RUNTIME DESTINATION bin)
+

backends/libyahoo2/main.cpp

@@ -0,0 +1,153 @@
+// Transport includes
+#include "transport/config.h"
+#include "transport/networkplugin.h"
+#include "transport/logging.h"
+
+// Swiften
+#include "Swiften/Swiften.h"
+
+// for signal handler
+#include "unistd.h"
+#include "signal.h"
+#include "sys/wait.h"
+#include "sys/signal.h"
+
+// Boost
+#include <boost/algorithm/string.hpp>
+using namespace boost::filesystem;
+using namespace boost::program_options;
+using namespace Transport;
+
+DEFINE_LOGGER(logger, "Yahoo2");
+
+// eventloop
+Swift::SimpleEventLoop *loop_;
+
+// Plugin
+class YahooPlugin;
+YahooPlugin * np = NULL;
+
+class YahooPlugin : public NetworkPlugin {
+	public:
+		Swift::BoostNetworkFactories *m_factories;
+		Swift::BoostIOServiceThread m_boostIOServiceThread;
+		boost::shared_ptr<Swift::Connection> m_conn;
+
+		YahooPlugin(Config *config, Swift::SimpleEventLoop *loop, const std::string &host, int port) : NetworkPlugin() {
+			this->config = config;
+			m_factories = new Swift::BoostNetworkFactories(loop);
+			m_conn = m_factories->getConnectionFactory()->createConnection();
+			m_conn->onDataRead.connect(boost::bind(&YahooPlugin::_handleDataRead, this, _1));
+			m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(host), port));
+
+			LOG4CXX_INFO(logger, "Starting the plugin.");
+		}
+
+		// NetworkPlugin uses this method to send the data to networkplugin server
+		void sendData(const std::string &string) {
+			m_conn->write(Swift::createSafeByteArray(string));
+		}
+
+		// This method has to call handleDataRead with all received data from network plugin server
+		void _handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data) {
+			std::string d(data->begin(), data->end());
+			handleDataRead(d);
+		}
+
+		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
+			handleConnected(user);
+			LOG4CXX_INFO(logger, user << ": Added buddy - Echo.");
+			handleBuddyChanged(user, "echo", "Echo", std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
+		}
+
+		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
+		}
+
+		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml = "") {
+			LOG4CXX_INFO(logger, "Sending message from " << user << " to " << legacyName << ".");
+			if (legacyName == "echo") {
+				handleMessage(user, legacyName, message);
+			}
+		}
+
+		void handleBuddyUpdatedRequest(const std::string &user, const std::string &buddyName, const std::string &alias, const std::vector<std::string> &groups) {
+			LOG4CXX_INFO(logger, user << ": Added buddy " << buddyName << ".");
+			handleBuddyChanged(user, buddyName, alias, groups, pbnetwork::STATUS_ONLINE);
+		}
+
+		void handleBuddyRemovedRequest(const std::string &user, const std::string &buddyName, const std::vector<std::string> &groups) {
+
+		}
+
+	private:
+		Config *config;
+};
+
+static void spectrum_sigchld_handler(int sig)
+{
+	int status;
+	pid_t pid;
+
+	do {
+		pid = waitpid(-1, &status, WNOHANG);
+	} while (pid != 0 && pid != (pid_t)-1);
+
+	if ((pid == (pid_t) - 1) && (errno != ECHILD)) {
+		char errmsg[BUFSIZ];
+		snprintf(errmsg, BUFSIZ, "Warning: waitpid() returned %d", pid);
+		perror(errmsg);
+	}
+}
+
+
+int main (int argc, char* argv[]) {
+	std::string host;
+	int port;
+
+	if (signal(SIGCHLD, spectrum_sigchld_handler) == SIG_ERR) {
+		std::cout << "SIGCHLD handler can't be set\n";
+		return -1;
+	}
+
+	boost::program_options::options_description desc("Usage: spectrum [OPTIONS] <config_file.cfg>\nAllowed options");
+	desc.add_options()
+		("host,h", value<std::string>(&host), "host")
+		("port,p", value<int>(&port), "port")
+		;
+	try
+	{
+		boost::program_options::variables_map vm;
+		boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
+		boost::program_options::notify(vm);
+	}
+	catch (std::runtime_error& e)
+	{
+		std::cout << desc << "\n";
+		exit(1);
+	}
+	catch (...)
+	{
+		std::cout << desc << "\n";
+		exit(1);
+	}
+
+
+	if (argc < 5) {
+		return 1;
+	}
+
+	Config config;
+	if (!config.load(argv[5])) {
+		std::cerr << "Can't open " << argv[1] << " configuration file.\n";
+		return 1;
+	}
+
+	Logging::initBackendLogging(&config);
+
+	Swift::SimpleEventLoop eventLoop;
+	loop_ = &eventLoop;
+	np = new YahooPlugin(&config, &eventLoop, host, port);
+	loop_->run();
+
+	return 0;
+}