libtransport.git Changeset - bc3971f7d258

Changeset - bc3971f7d258

Parent rev.

Child rev.

[Not reviewed]

0 5 2

HanzZ - 14 years ago 2011-10-23 18:50:10
hanzz.k@gmail.com

IRC backends work again

7 files changed with 108 insertions and 58 deletions:

CMakeLists.txt

backends/libircclient-qt/ircnetworkplugin.cpp

backends/libircclient-qt/ircnetworkplugin.h

backends/libircclient-qt/main.cpp

include/transport/networkplugin.h

spectrum/src/sample.cfg

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -45,25 +45,25 @@ find_package(Protobuf REQUIRED) @@
 set(IRCClientQt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(IRCClientQt)
 set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(log4cxx)
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 find_package(Doxygen)
 INCLUDE(FindQt4)
 FIND_PACKAGE(Qt4 COMPONENTS QtCore)
+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
 # ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
 ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
 ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
 message("  Supported features")
 message("-----------------------")
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
 	include_directories(${SQLITE3_INCLUDE_DIR})
 	message("SQLite3           : yes")
 else (SQLITE3_FOUND)

backends/libircclient-qt/ircnetworkplugin.cpp

➞

Show inline comments

@@ new file 100644 @@
 #include "ircnetworkplugin.h"
 IRCNetworkPlugin::IRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) {
 	this->config = config;
 	m_socket = new QTcpSocket();
 	m_socket->connectToHost(QString::fromStdString(host), port);
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
+}
 void IRCNetworkPlugin::readData() {
 	size_t availableBytes = m_socket->bytesAvailable();
 	if (availableBytes == 0)
 		return;
 	std::cout << "READ\n";
 	std::string d = std::string(m_socket->readAll().data(), availableBytes);
 	handleDataRead(d);
+}
 void IRCNetworkPlugin::sendData(const std::string &string) {
 	m_socket->write(string.c_str(), string.size());
+}
 void IRCNetworkPlugin::handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 	MyIrcSession *session = new MyIrcSession(user, this);
 	std::string h = user.substr(0, user.find("@"));
 	session->setNick(QString::fromStdString(h.substr(0, h.find("%"))));
 	session->connectToServer(QString::fromStdString(h.substr(h.find("%") + 1)), 6667);
 	std::cout << "CONNECTING IRC NETWORK " << h.substr(h.find("%") + 1) << "\n";
 	m_sessions[user] = session;
+}
 void IRCNetworkPlugin::handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 	if (m_sessions[user] == NULL)
 		return;
 	m_sessions[user]->disconnectFromServer();
 	m_sessions[user]->deleteLater();
+}
 void IRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/) {
 	std::cout << "MESSAGE " << user << " " << legacyName << "\n";
 	if (m_sessions[user] == NULL)
 		return;
 	m_sessions[user]->message(QString::fromStdString(legacyName), QString::fromStdString(message));
 	std::cout << "SENT\n";
+}
 void IRCNetworkPlugin::handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password) {
 	std::cout << "JOIN\n";
 	if (m_sessions[user] == NULL)
 		return;
 	m_sessions[user]->addAutoJoinChannel(QString::fromStdString(room));
 	m_sessions[user]->join(QString::fromStdString(room), QString::fromStdString(password));
 	// update nickname, because we have nickname per session, no nickname per room.
 	handleRoomNicknameChanged(user, room, m_sessions[user]->nick().toStdString());
+}
 void IRCNetworkPlugin::handleLeaveRoomRequest(const std::string &user, const std::string &room) {
 	std::cout << "PART\n";
 	if (m_sessions[user] == NULL)
 		return;
 	m_sessions[user]->part(QString::fromStdString(room));
 	m_sessions[user]->removeAutoJoinChannel(QString::fromStdString(room));
+}

backends/libircclient-qt/ircnetworkplugin.h

➞

Show inline comments

@@ new file 100644 @@
 #pragma once
 #include "transport/config.h"
 #include "transport/networkplugin.h"
 #include "session.h"
 #include <QtCore>
 #include <QtNetwork>
 #include "Swiften/EventLoop/Qt/QtEventLoop.h"
 #include "ircnetworkplugin.h"
 class IRCNetworkPlugin : public QObject, public NetworkPlugin {
 	Q_OBJECT
 	public:
 		IRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port);
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password);
 		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*/);
 		void handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password);
 		void handleLeaveRoomRequest(const std::string &user, const std::string &room);
 		std::map<std::string, MyIrcSession *> m_sessions;
 	public slots:
 		void readData();
 		void sendData(const std::string &string);
 	private:
 		Config *config;
 		QTcpSocket *m_socket;
 };
@@ \ No newline at end of file @@

backends/libircclient-qt/main.cpp

➞

Show inline comments

@@ @@ -3,85 +3,33 @@ @@
+ *
  * This example is free, and not covered by LGPL license. There is no
  * restriction applied to their modification, redistribution, using and so on.
  * You can study them, modify them, use them in your own program - either
  * completely or partially. By using it you may give me some credits in your
  * program, but you don't have to.
  */
 #include "transport/config.h"
 #include "transport/networkplugin.h"
 #include "session.h"
 #include <QtCore>
 #include <QtNetwork>
 #include "Swiften/EventLoop/Qt/QtEventLoop.h"
 #include "ircnetworkplugin.h"
 using namespace boost::program_options;
 using namespace Transport;
 class IRCNetworkPlugin;
 IRCNetworkPlugin * np = NULL;
 class IRCNetworkPlugin : public NetworkPlugin {
 	public:
 		IRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) : NetworkPlugin() {
 			this->config = config;
+		}
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 			MyIrcSession *session = new MyIrcSession(user, this);
 			session->setNick(QString::fromStdString(user.substr(0, user.find("@"))));
 			session->connectToServer(QString::fromStdString(user.substr(user.find("@") + 1)), 6667);
 // 			std::cout << "CONNECTING IRC NETWORK " << jid.getNode() << " " << jid.getDomain() << "\n";
 			m_sessions[user] = session;
+		}
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 			if (m_sessions[user] == NULL)
 				return;
 			m_sessions[user]->disconnectFromServer();
 			m_sessions[user]->deleteLater();
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &/*xhtml*/) {
 			std::cout << "MESSAGE " << user << " " << legacyName << "\n";
 			if (m_sessions[user] == NULL)
 				return;
 			m_sessions[user]->message(QString::fromStdString(legacyName), QString::fromStdString(message));
 			std::cout << "SENT\n";
+		}
 		void handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password) {
 			std::cout << "JOIN\n";
 			if (m_sessions[user] == NULL)
 				return;
 			m_sessions[user]->addAutoJoinChannel(QString::fromStdString(room));
 			m_sessions[user]->join(QString::fromStdString(room), QString::fromStdString(password));
 			// update nickname, because we have nickname per session, no nickname per room.
 			handleRoomNicknameChanged(user, room, m_sessions[user]->nick().toStdString());
+		}
 		void handleLeaveRoomRequest(const std::string &user, const std::string &room) {
 			std::cout << "PART\n";
 			if (m_sessions[user] == NULL)
 				return;
 			m_sessions[user]->part(QString::fromStdString(room));
 			m_sessions[user]->removeAutoJoinChannel(QString::fromStdString(room));
+		}
 		std::map<std::string, MyIrcSession *> m_sessions;
 	private:
 		Config *config;
 };
 int main (int argc, char* argv[]) {
 	std::string host;
 	int port;
 	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
+	{

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -208,25 +208,24 @@ class NetworkPlugin { @@
 		virtual void handleFTStartRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*fileName*/, unsigned long size, unsigned long ftID) {}
 		virtual void handleFTFinishRequest(const std::string &/*user*/, const std::string &/*buddyName*/, const std::string &/*fileName*/, unsigned long size, unsigned long ftID) {}
 		virtual void handleFTPauseRequest(unsigned long ftID) {}
 		virtual void handleFTContinueRequest(unsigned long ftID) {}
 		virtual void handleExitRequest() { exit(1); }
 		void handleDataRead(std::string &data);
 		virtual void sendData(const std::string &string) {}
 	private:
 		void connect();
 		void handleLoginPayload(const std::string &payload);
 		void handleLogoutPayload(const std::string &payload);
 		void handleStatusChangedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload);
 		void handleJoinRoomPayload(const std::string &payload);
 		void handleLeaveRoomPayload(const std::string &payload);
 		void handleVCardPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleBuddyRemovedPayload(const std::string &payload);
 		void handleChatStatePayload(const std::string &payload, int type);
 		void handleAttentionPayload(const std::string &payload);
 		void handleFTStartPayload(const std::string &payload);

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -2,28 +2,28 @@ @@
 jid = localhost
 password = secret
 server = 127.0.0.1
 port = 5222
 server_mode = 1
 backend_host=localhost # < this option doesn't work yet
 backend_port=10001
 admin_username=admin
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_libpurple_backend
+#backend=/home/hanzz/code/libtransport/backends/libpurple/spectrum2_libpurple_backend
 #backend=/usr/bin/mono /home/hanzz/code/networkplugin-csharp/msnp-sharp-backend/bin/Debug/msnp-sharp-backend.exe
 #backend=/home/hanzz/code/libtransport/backends/frotz/spectrum2_frotz_backend
-#backend=../../backends/libircclient-qt/spectrum2_libircclient-qt_backend
+backend=/home/hanzz/code/libtransport/backends/libircclient-qt/spectrum2_libircclient-qt_backend
 #protocol=prpl-msn
 protocol=any
 #protocol=prpl-icq
 [backend]
 #default_avatar=catmelonhead.jpg
 #no_vcard_fetch=true
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

src/networkpluginserver.cpp

➞

Show inline comments

 	delete c;
+}
 void NetworkPluginServer::handleConnectedPayload(const std::string &data) {
 	pbnetwork::Connected payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	User *user = m_userManager->getUser(payload.user());
 	if (!user) {
 		LOG4CXX_ERROR(logger, "Connected payload received for unknown user " << payload.user());
 		return;
+	}
 	user->setConnected(true);
 	m_component->m_userRegistry->onPasswordValid(payload.user());
+}
 void NetworkPluginServer::handleDisconnectedPayload(const std::string &data) {
 	pbnetwork::Disconnected payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;

0 comments (0 inline, 0 general)