libtransport.git Changeset - 2add374fbd61

Changeset - 2add374fbd61

Parent rev.

Child rev.

[Not reviewed]

0 8 0

Jan Kaluza - 14 years ago 2011-05-18 16:25:52
hanzz.k@gmail.com

working messaging and PM (only if you send it to user@server.tld, so normal PMs doesn't work yet)

8 files changed with 53 insertions and 13 deletions:

backends/libircclient-qt/main.cpp

backends/libircclient-qt/session.cpp

include/transport/conversation.h

include/transport/networkplugin.h

src/conversation.cpp

src/networkplugin.cpp

src/networkpluginserver.cpp

src/pbnetwork.proto

0 comments (0 inline, 0 general)

backends/libircclient-qt/main.cpp

➞

Show inline comments

@@ @@ -22,49 +22,53 @@ IRCNetworkPlugin * np = NULL; @@
 class IRCNetworkPlugin : public NetworkPlugin {
 	public:
 		IRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) : NetworkPlugin(loop, host, port) {
 			this->config = config;
+		}
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 			Swift::JID jid(legacyName);
 			MyIrcSession *session = new MyIrcSession(user, this);
 			session->setNick(QString::fromStdString(jid.getNode()));
 			session->connectToServer(QString::fromStdString(jid.getDomain()), 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) {
 			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.
 			handleRoomChanged(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));
+		}
 		std::map<std::string, MyIrcSession *> m_sessions;
 	private:
 		Config *config;
 };

backends/libircclient-qt/session.cpp

➞

Show inline comments

+{
     qDebug() << "nick changed:" << receiver() << origin << nick;
+}
 void MyIrcBuffer::on_modeChanged(const QString& origin, const QString& mode, const QString& args)
+{
     qDebug() << "mode changed:" << receiver() << origin << mode << args;
+}
 void MyIrcBuffer::on_topicChanged(const QString& origin, const QString& topic)
+{
     qDebug() << "topic changed:" << receiver() << origin << topic;
+}
 void MyIrcBuffer::on_invited(const QString& origin, const QString& receiver, const QString& channel)
+{
     qDebug() << "invited:" << Irc::Buffer::receiver() << origin << receiver << channel;
+}
 void MyIrcBuffer::on_kicked(const QString& origin, const QString& nick, const QString& message)
+{
     qDebug() << "kicked:" << receiver() << origin << nick << message;
+}
 void MyIrcBuffer::on_messageReceived(const QString& origin, const QString& message, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "message received:" << receiver() << origin << message
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
 void MyIrcBuffer::on_messageReceived(const QString& origin, const QString& message, Irc::Buffer::MessageFlags flags) {
 	qDebug() << "message received:" << receiver() << origin << message << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
 	if (!receiver().startsWith("#") && (flags & Irc::Buffer::EchoFlag))
 		return;
 	np->handleMessage(user, receiver().toStdString(), message.toStdString(), origin.toStdString());
+}
 void MyIrcBuffer::on_noticeReceived(const QString& origin, const QString& notice, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "notice received:" << receiver() << origin << notice
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
+}
 void MyIrcBuffer::on_ctcpRequestReceived(const QString& origin, const QString& request, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "ctcp request received:" << receiver() << origin << request
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
+}
 void MyIrcBuffer::on_ctcpReplyReceived(const QString& origin, const QString& reply, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "ctcp reply received:" << receiver() << origin << reply
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");
+}
 void MyIrcBuffer::on_ctcpActionReceived(const QString& origin, const QString& action, Irc::Buffer::MessageFlags flags)
+{
     qDebug() << "ctcp action received:" << receiver() << origin << action
              << (flags & Irc::Buffer::IdentifiedFlag ? "(identified!)" : "(not identified)");

include/transport/conversation.h

➞

Show inline comments

@@ @@ -20,43 +20,44 @@ @@
 #pragma once
 #include <string>
 #include <algorithm>
 #include "transport/transport.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Elements/Message.h"
 namespace Transport {
 class ConversationManager;
 class Conversation {
 	public:
 		/// Constructor.
 		Conversation(ConversationManager *conversationManager, const std::string &legacyName);
 		/// Destructor
 		virtual ~Conversation();
 		const std::string &getLegacyName() { return m_legacyName; }
 		void handleMessage(boost::shared_ptr<Swift::Message> &message);
+		void handleMessage(boost::shared_ptr<Swift::Message> &message, const std::string &nickname = "");
 		void handleParticipantChanged(const std::string &nickname, int flag);
 		void setNickname(const std::string &nickname) {
 			m_nickname = nickname;
+		}
 		virtual void sendMessage(boost::shared_ptr<Swift::Message> &message) = 0;
 		ConversationManager *getConversationManager() {
 			return m_conversationManager;
+		}
 	private:
 		ConversationManager *m_conversationManager;
 		std::string m_legacyName;
 		std::string m_nickname;
 		int m_muc;
 };
+}

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -27,49 +27,49 @@ @@
 #include "Swiften/Network/ConnectionServer.h"
 #include "Swiften/Network/Connection.h"
 #include "Swiften/Network/BoostTimerFactory.h"
 #include "Swiften/Network/BoostNetworkFactories.h"
 #include "Swiften/Network/BoostIOServiceThread.h"
 #include "Swiften/Network/Connection.h"
 #include "storagebackend.h"
 namespace Transport {
 class NetworkPlugin {
 	public:
 		NetworkPlugin(Swift::EventLoop *loop, const std::string &host, int port);
 		virtual ~NetworkPlugin();
 		void handleBuddyChanged(const std::string &user, const std::string &buddyName, const std::string &alias,
 			const std::string &groups, int status, const std::string &statusMessage = "", const std::string &iconHash = ""
 		);
 		void handleParticipantChanged(const std::string &user, const std::string &nickname, const std::string &room, int flags);
 		void handleDisconnected(const std::string &user, const std::string &legacyName, int error, const std::string &message);
 		void handleMessage(const std::string &user, const std::string &legacyName, const std::string &message);
+		void handleMessage(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &nickname = "");
 		void handleRoomChanged(const std::string &user, const std::string &room, const std::string &nickname);
 		virtual void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) = 0;
 		virtual void handleLogoutRequest(const std::string &user, const std::string &legacyName) = 0;
 		virtual void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message) = 0;
 		virtual void handleJoinRoomRequest(const std::string &/*user*/, const std::string &/*room*/, const std::string &/*nickname*/, const std::string &/*pasword*/) {}
 		virtual void handleLeaveRoomRequest(const std::string &/*user*/, const std::string &/*room*/) {}
 	private:
 		void connect();
 		void handleLoginPayload(const std::string &payload);
 		void handleLogoutPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload);
 		void handleJoinRoomPayload(const std::string &payload);
 		void handleLeaveRoomPayload(const std::string &payload);
 		void handleDataRead(const Swift::ByteArray&);
 		void handleConnected(bool error);
 		void handleDisconnected();
 		void send(const std::string &data);
 		void sendPong();

src/conversation.cpp

➞

Show inline comments

@@ @@ -10,66 +10,88 @@ @@
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <iostream>
 #include "transport/conversation.h"
 #include "transport/conversationmanager.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/buddy.h"
 #include "transport/rostermanager.h"
 namespace Transport {
 Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName) : m_conversationManager(conversationManager) {
 	m_legacyName = legacyName;
 	m_conversationManager->setConversation(this);
 	m_muc = -1;
+}
 Conversation::~Conversation() {
 	m_conversationManager->unsetConversation(this);
+}
 void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message) {
 void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, const std::string &nickname) {
 	if (m_muc == -1)
 		m_muc = message->getType() != Swift::Message::Groupchat;
 	if (m_muc == 0) {
 		message->setType(Swift::Message::Groupchat);
+	}
 	else {
 		message->setType(Swift::Message::Chat);
+	}
 	if (message->getType() != Swift::Message::Groupchat) {
 		message->setTo(m_conversationManager->getUser()->getJID().toBare());
 		// normal message
 		if (nickname.empty()) {
 			Buddy *buddy = m_conversationManager->getUser()->getRosterManager()->getBuddy(m_legacyName);
 			if (buddy) {
 				std::cout << m_legacyName << " 222222\n";
 				message->setFrom(buddy->getJID());
+			}
 			else {
 				std::cout << m_legacyName << " 1111111\n";
 				// TODO: escape from and setFrom
+			}
+		}
 		// PM message
 		else {
 			message->setFrom(Swift::JID(nickname, m_conversationManager->getComponent()->getJID().toBare(), "user"));
+		}
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
+	}
 	else {
 		message->setTo(m_conversationManager->getUser()->getJID().toString());
 		message->setFrom(Swift::JID(m_legacyName, m_conversationManager->getComponent()->getJID().toBare(), nickname));
 		m_conversationManager->getComponent()->getStanzaChannel()->sendMessage(message);
+	}
+}
 void Conversation::handleParticipantChanged(const std::string &nick, int flag) {
 	std::string nickname = nick;
 	if (nickname.find("@") == 0) {
 		nickname = nickname.substr(1);
+	}
 	Swift::Presence::ref presence = Swift::Presence::create();
  	presence->setFrom(Swift::JID(m_legacyName, m_conversationManager->getComponent()->getJID().toBare(), nickname));
 	presence->setTo(m_conversationManager->getUser()->getJID().toString());
 	presence->setType(Swift::Presence::Available);
 	Swift::MUCUserPayload *p = new Swift::MUCUserPayload ();
 	if (m_nickname == nickname) {
 		Swift::MUCUserPayload::StatusCode c;
 		c.code = 110;
 		p->addStatusCode(c);
+	}
 	p->addItem(Swift::MUCUserPayload::Item(Swift::MUCOccupant::Member, Swift::MUCOccupant::Participant));
 	presence->addPayload(boost::shared_ptr<Swift::Payload>(p));
 	m_conversationManager->getComponent()->getStanzaChannel()->sendPresence(presence);

src/networkplugin.cpp

➞

Show inline comments

@@ @@ -34,53 +34,54 @@ namespace Transport { @@
 #define WRAP(MESSAGE, TYPE) 	pbnetwork::WrapperMessage wrap; \
 	wrap.set_type(TYPE); \
 	wrap.set_payload(MESSAGE); \
 	wrap.SerializeToString(&MESSAGE);
 NetworkPlugin::NetworkPlugin(Swift::EventLoop *loop, const std::string &host, int port) {
 	m_factories = new Swift::BoostNetworkFactories(loop);
 	m_host = host;
 	m_port = port;
 	m_conn = m_factories->getConnectionFactory()->createConnection();
 	m_conn->onDataRead.connect(boost::bind(&NetworkPlugin::handleDataRead, this, _1));
 	m_conn->onConnectFinished.connect(boost::bind(&NetworkPlugin::handleConnected, this, _1));
 	m_conn->onDisconnected.connect(boost::bind(&NetworkPlugin::handleDisconnected, this));
 	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(1000);
 	m_reconnectTimer->onTick.connect(boost::bind(&NetworkPlugin::connect, this));
 	connect();
+}
 NetworkPlugin::~NetworkPlugin() {
 	delete m_factories;
+}
 void NetworkPlugin::handleMessage(const std::string &user, const std::string &legacyName, const std::string &msg) {
+void NetworkPlugin::handleMessage(const std::string &user, const std::string &legacyName, const std::string &msg, const std::string &nickname) {
 	pbnetwork::ConversationMessage m;
 	m.set_username(user);
 	m.set_buddyname(legacyName);
 	m.set_message(msg);
 	m.set_nickname(nickname);
 	std::string message;
 	m.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);
 // 	std::cout << "SENDING MESSAGE\n";
 	send(message);
+}
 void NetworkPlugin::handleBuddyChanged(const std::string &user, const std::string &buddyName, const std::string &alias,
 			const std::string &groups, int status, const std::string &statusMessage, const std::string &iconHash) {
 	pbnetwork::Buddy buddy;
 	buddy.set_username(user);
 	buddy.set_buddyname(buddyName);
 	buddy.set_alias(alias);
 	buddy.set_groups(groups);
 	buddy.set_status(status);
 	buddy.set_statusmessage(statusMessage);
 	buddy.set_iconhash(iconHash);
 	std::string message;
 	buddy.SerializeToString(&message);

src/networkpluginserver.cpp

➞

Show inline comments

 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.room());
 	if (!conv) {
 		return;
+	}
 	conv->setNickname(payload.nickname());
+}
 void NetworkPluginServer::handleConvMessagePayload(const std::string &data) {
 	pbnetwork::ConversationMessage payload;
 // 	std::cout << "payload...\n";
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 // 	std::cout << "payload 2...\n";
 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;
 	boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 	msg->setBody(payload.message());
 	NetworkConversation *conv = (NetworkConversation *) user->getConversationManager()->getConversation(payload.buddyname());
 	if (!conv) {
 		conv = new NetworkConversation(user->getConversationManager(), payload.buddyname());
 		conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
+	}
 	boost::shared_ptr<Swift::Message> msg(new Swift::Message());
 	msg->setBody(payload.message());
 	conv->handleMessage(msg);
 	else {
 		// groupchat messages can be created only for conversations initiated from XMPP side, not from legacy network side.
 		// ie. you can't create Groupchat conversation from legacy network side.
 		if (!payload.nickname().empty()) {
 			msg->setType(Swift::Message::Groupchat);
+		}
+	}
 	conv->handleMessage(msg, payload.nickname());
+}
 void NetworkPluginServer::handleDataRead(boost::shared_ptr<Swift::Connection> c, const Swift::ByteArray &data) {
 	long expected_size = 0;
 	m_data += data.toString();
 // 	std::cout << "received data; size = " << m_data.size() << "\n";
 	while (m_data.size() != 0) {
 		if (m_data.size() >= 4) {
 			unsigned char * head = (unsigned char*) m_data.c_str();
 			expected_size = (((((*head << 8) | *(head + 1)) << 8) | *(head + 2)) << 8) | *(head + 3);
 			//expected_size = m_data[0];
 // 			std::cout << "expected_size=" << expected_size << "\n";
 			if (m_data.size() - 4 < expected_size)
 				return;
+		}
 		else {
 			return;
+		}
 		std::string msg = m_data.substr(4, expected_size);
 		m_data.erase(0, 4 + expected_size);
 		pbnetwork::WrapperMessage wrapper;
 		if (wrapper.ParseFromString(msg) == false) {
 	if (!conv) {
 		return;
+	}
 	delete conv;
+}
 void NetworkPluginServer::handleUserDestroyed(User *user) {
 	UserInfo userInfo = user->getUserInfo();
 	pbnetwork::Logout logout;
 	logout.set_user(user->getJID().toBare());
 	logout.set_legacyname(userInfo.uin);
 	std::string message;
 	logout.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_LOGOUT);
 	send(m_client, message);
+}
 void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &msg) {
 	pbnetwork::ConversationMessage m;
-	m.set_username(conv->getConversationManager()->getUser()->getUserInfo().uin);
+	m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());
 	m.set_buddyname(conv->getLegacyName());
 	m.set_message(msg->getBody());
 	std::string message;
 	m.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);
 	send(m_client, message);
+}
 void NetworkPluginServer::sendPing() {
 	std::string message;
 	pbnetwork::WrapperMessage wrap;
 	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PING);
 	wrap.SerializeToString(&message);
 	send(m_client, message);
 	m_pongReceived = false;
 	std::cout << "SENDING PING\n";
+}
+}

src/pbnetwork.proto

➞

Show inline comments

@@ @@ -16,48 +16,49 @@ message Login { @@
 	required string user = 1;
 	required string legacyName = 2;
 	required string password = 3;
+}
 message Logout {
 	required string user = 1;
 	required string legacyName = 2;
+}
 message Buddy {
 	required string userName = 1;
 	required string buddyName = 2;
 	required string alias = 3;
 	required string groups = 4;
 	required int32 status = 5;
 	optional string statusMessage = 6;
 	optional string iconHash = 7;
+}
 message ConversationMessage {
 	required string userName = 1;
 	required string buddyName = 2;
 	required string message = 3;
 	optional string nickname = 4;
+}
 message Room {
 	required string userName = 1;
 	required string nickname = 2;
 	required string room = 3;
 	optional string password = 4;
+}
 message Participant {
 	required string userName = 1;
 	required string room = 2;
 	required string nickname = 3;
 	required int32 flag = 4;
+}
 message WrapperMessage {
 	enum Type {
 		TYPE_CONNECTED 				= 1;
 		TYPE_DISCONNECTED 			= 2;
 		TYPE_LOGIN 					= 3;
 		TYPE_LOGOUT 				= 4;
 		TYPE_BUDDY_CHANGED			= 6;
 		TYPE_BUDDY_REMOVED			= 7;

0 comments (0 inline, 0 general)