libtransport.git Changeset - 877d783276c0

Changeset - 877d783276c0

Parent rev.

Child rev.

[Not reviewed]

0 9 0

HanzZ - 14 years ago 2011-06-03 19:40:30
hanzz.k@gmail.com

Fixed compilation with latest Swiften. Using SafeByteArray for communication with backends

9 files changed with 52 insertions and 61 deletions:

backends/libpurple/main.cpp

examples/server_connect/main.cpp

include/transport/networkplugin.h

include/transport/networkpluginserver.h

include/transport/transport.h

src/networkplugin.cpp

src/networkpluginserver.cpp

src/rostermanager.cpp

src/transport.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

 		if (icon) {
 			const gchar * data = (gchar*)purple_buddy_icon_get_data(icon, &len);
 			// Sometimes libpurple returns really broken pointers here
 			// They weren't able to do anything with that and I don't know what to do too,
 			// so it's better to hack through it by not trying to forward really broken things...
 			if (len < 300000 && data) {
-				photo = Swift::ByteArray(data, len);
+				photo = Swift::createByteArray(data, len);
 // 				const gchar *ext = (gchar*)purple_buddy_icon_get_extension(icon);
 // 				if (ext) {
 // 					std::string extension(ext);
 // 					if (extension != "icon") {
 // 						if (extension == "jpg") {
 // 							extension = "jpeg";
 // 				}
+			}
+		}
+	}
-	np->handleVCard(np->m_accounts[account], np->m_vcards[np->m_accounts[account] + name], name, fullName, nickname, photo.toString());
+	np->handleVCard(np->m_accounts[account], np->m_vcards[np->m_accounts[account] + name], name, fullName, nickname, Swift::byteArrayToString(photo));
 	np->m_vcards.erase(np->m_accounts[account] + name);
 	return NULL;
+}
 static PurpleNotifyUiOps notifyUiOps =

examples/server_connect/main.cpp

➞

Show inline comments

@@ @@ -12,13 +12,14 @@ @@
 using namespace Transport;
 class DummyUserRegistry : public Swift::UserRegistry {
 	public:
 		DummyUserRegistry() {}
 		virtual bool isValidUserPassword(const Swift::JID&, const std::string&) const {
 		virtual bool isValidUserPassword(const Swift::JID&user, const Swift::SafeByteArray&) const {
 			onPasswordValid(user.toString());
 			return true;
+		}
 };
 int main(void)
+{

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -71,21 +71,21 @@ class NetworkPlugin { @@
 		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 handleVCardPayload(const std::string &payload);
-		void handleDataRead(const Swift::ByteArray&);
+		void handleDataRead(const Swift::SafeByteArray&);
 		void _handleConnected(bool error);
 		void handleDisconnected();
 		void send(const std::string &data);
 		void sendPong();
 		void pingTimeout();
-		std::string m_data;
+		Swift::SafeByteArray m_data;
 		std::string m_host;
 		int m_port;
 		Swift::BoostNetworkFactories *m_factories;
 		Swift::BoostIOServiceThread m_boostIOServiceThread;
 		boost::shared_ptr<Swift::Connection> m_conn;
 		Swift::Timer::ref m_pingTimer;

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -41,26 +41,26 @@ class VCardResponder; @@
 class NetworkPluginServer {
 	public:
 		struct Client {
 			bool pongReceived;
 			std::list<User *> users;
-			std::string data;
+			Swift::SafeByteArray data;
 			boost::shared_ptr<Swift::Connection> connection;
 		};
 		NetworkPluginServer(Component *component, Config *config, UserManager *userManager);
 		virtual ~NetworkPluginServer();
 		void handleMessageReceived(NetworkConversation *conv, boost::shared_ptr<Swift::Message> &message);
 	private:
 		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);
 		void handleSessionFinished(Client *c);
-		void handleDataRead(Client *c, const Swift::ByteArray&);
+		void handleDataRead(Client *c, const Swift::SafeByteArray&);
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
 		void handleBuddyChangedPayload(const std::string &payload);
 		void handleConvMessagePayload(const std::string &payload, bool subject = false);
 		void handleParticipantChangedPayload(const std::string &payload);

include/transport/transport.h

➞

Show inline comments

@@ @@ -130,14 +130,14 @@ namespace Transport { @@
 // 			boost::signal<void (boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid)> onDiscoInfoResponse;
 		private:
 			void handleConnected();
 			void handleConnectionError(const Swift::ComponentError &error);
 			void handlePresence(Swift::Presence::ref presence);
 			void handleDataRead(const std::string &data);
 			void handleDataWritten(const std::string &data);
 			void handleDataRead(const Swift::SafeByteArray &data);
 			void handleDataWritten(const Swift::SafeByteArray &data);
 // 			void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 			void handleCapsChanged(const Swift::JID& jid);
 			Swift::BoostNetworkFactories *m_factories;
 			Swift::Component *m_component;

src/networkplugin.cpp

➞

Show inline comments

 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);
 	send(message);
+}
 void NetworkPlugin::handleConnected(const std::string &user) {
 	std::cout << "LOGIN SENT\n";
 	pbnetwork::Connected d;
 	d.set_user(user);
 	std::string message;
 	d.SerializeToString(&message);
 		return;
+	}
 	handleVCardRequest(payload.username(), payload.buddyname(), payload.id());
+}
 void NetworkPlugin::handleDataRead(const Swift::ByteArray &data) {
 	long expected_size = 0;
 	m_data += data.toString();
 // 	std::cout << "received data; size = " << m_data.size() << "\n";
 void NetworkPlugin::handleDataRead(const Swift::SafeByteArray &data) {
 	m_data.insert(m_data.begin(), data.begin(), data.end());
 	while (m_data.size() != 0) {
 		unsigned int expected_size;
 		if (m_data.size() >= 4) {
 			expected_size = (((((m_data[0] << 8) | m_data[1]) << 8) | m_data[2]) << 8) | m_data[3];
 // 			std::cout << "expected_size=" << expected_size << "\n";
 			expected_size = *((unsigned int*) &m_data[0]);
 			expected_size = ntohl(expected_size);
 			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) {
 			// TODO: ERROR
 		if (wrapper.ParseFromArray(&m_data[4], expected_size) == false) {
 			m_data.erase(m_data.begin(), m_data.begin() + 4 + expected_size);
 			return;
+		}
 		m_data.erase(m_data.begin(), m_data.begin() + 4 + expected_size);
 		switch(wrapper.type()) {
 			case pbnetwork::WrapperMessage_Type_TYPE_LOGIN:
 				handleLoginPayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_LOGOUT:
 				return;
+		}
+	}
+}
 void NetworkPlugin::send(const std::string &data) {
 	std::string header("    ");
 // 	std::cout << data.size() << "\n";
 	boost::int32_t size = data.size();
 	for (int i = 0; i != 4; ++i) {
 		header.at(i) = static_cast<char>(size >> (8 * (3 - i)));
 // 		std::cout << std::hex << (int) header.at(i) << "\n";
+	}
 	m_conn->write(Swift::ByteArray(header + data));
 	char header[4];
 	*((int*)(header)) = htonl(data.size());
 	m_conn->write(Swift::createSafeByteArray(std::string(header, 4) + data));
+}
 void NetworkPlugin::sendPong() {
 	m_pingReceived = true;
 	std::string message;
 	pbnetwork::WrapperMessage wrap;
 	wrap.set_type(pbnetwork::WrapperMessage_Type_TYPE_PONG);
 	wrap.SerializeToString(&message);
 	send(message);
-// 	std::cout << "SENDING PONG\n";
 	std::cout << "SENDING PONG\n";
+}
 void NetworkPlugin::pingTimeout() {
 	std::cout << "PINGTIMEOUT " << m_pingReceived << " " << this << "\n";
 	if (m_pingReceived == false) {
 		exit(1);

src/networkpluginserver.cpp

➞

Show inline comments

+	}
 	exec_(CONFIG_STRING(m_config, "service.backend").c_str(), "localhost", "10000", m_config->getConfigFile().c_str());
+}
 void NetworkPluginServer::handleConnectedPayload(const std::string &data) {
 	pbnetwork::Connected payload;
 	std::cout << "CONNECTED LOGIN 2 " << payload.user() << "\n";
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
-	std::cout << "CONNECTED LOGIN 2 " << payload.user() << "\n";
+	std::cout << "CONNECTED LOGIN 3 " << payload.user() << "\n";
 	m_component->m_userRegistry->onPasswordValid(payload.user());
 // 	std::cout << payload.name() << "\n";
+}
 void NetworkPluginServer::handleDisconnectedPayload(const std::string &data) {
 	pbnetwork::Disconnected payload;
 		// TODO: ERROR
 		return;
+	}
 	std::cout << "OMG?\n";
 	boost::shared_ptr<Swift::VCard> vcard(new Swift::VCard());
 	vcard->setFullName(payload.fullname());
-	vcard->setPhoto(Swift::ByteArray(payload.photo()));
+	vcard->setPhoto(Swift::createByteArray(payload.photo()));
 	vcard->setNickname(payload.nickname());
 	m_vcardResponder->sendVCard(payload.id(), vcard);
+}
 void NetworkPluginServer::handleBuddyChangedPayload(const std::string &data) {
 		conv->onMessageToSend.connect(boost::bind(&NetworkPluginServer::handleMessageReceived, this, _1, _2));
+	}
 	conv->handleMessage(msg, payload.nickname());
+}
 void NetworkPluginServer::handleDataRead(Client *c, const Swift::ByteArray &data) {
 	long expected_size = 0;
 	c->data += data.toString();
 // 	std::cout << "received data; size = " << m_data.size() << "\n";
 void NetworkPluginServer::handleDataRead(Client *c, const Swift::SafeByteArray &data) {
 	c->data.insert(c->data.begin(), data.begin(), data.end());
 	while (c->data.size() != 0) {
 		unsigned int expected_size;
 		if (c->data.size() >= 4) {
 			unsigned char * head = (unsigned char*) c->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";
 			expected_size = *((unsigned int*) &c->data[0]);
 			expected_size = ntohl(expected_size);
 			if (c->data.size() - 4 < expected_size)
 				return;
+		}
 		else {
 			return;
+		}
 		std::string msg = c->data.substr(4, expected_size);
 		c->data.erase(0, 4 + expected_size);
 		pbnetwork::WrapperMessage wrapper;
 		if (wrapper.ParseFromString(msg) == false) {
 			// TODO: ERROR
 		if (wrapper.ParseFromArray(&c->data[4], expected_size) == false) {
 			c->data.erase(c->data.begin(), c->data.begin() + 4 + expected_size);
 			return;
+		}
 		c->data.erase(c->data.begin(), c->data.begin() + 4 + expected_size);
 		switch(wrapper.type()) {
 			case pbnetwork::WrapperMessage_Type_TYPE_CONNECTED:
 				handleConnectedPayload(wrapper.payload());
 				break;
 			case pbnetwork::WrapperMessage_Type_TYPE_DISCONNECTED:
 				return;
+		}
+	}
+}
 void NetworkPluginServer::send(boost::shared_ptr<Swift::Connection> &c, const std::string &data) {
 	std::string header("    ");
 	for (int i = 0; i != 4; ++i)
 		header.at(i) = static_cast<char>(data.size() >> (8 * (3 - i)));
 	c->write(Swift::ByteArray(header + data));
 	char header[4];
 	*((int*)(header)) = htonl(data.size());
 	c->write(Swift::createSafeByteArray(std::string(header, 4) + data));
+}
 void NetworkPluginServer::pingTimeout() {
 	std::cout << "pingtimeout\n";
 	for (std::list<Client *>::const_iterator it = m_clients.begin(); it != m_clients.end(); it++) {
 		if ((*it)->pongReceived) {

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) { @@
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
 	item.setGroups(buddy->getGroups());
 	payload->addItem(item);
-	Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_component->getIQRouter(), m_user->getJID().toBare());
+	Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_user->getJID().toBare(), m_component->getIQRouter());
 	request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, buddy->getName()));
 	request->send();
+}
 void RosterManager::setBuddyCallback(Buddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
@@ @@ -121,16 +121,16 @@ void RosterManager::sendRIE() { @@
 	m_RIETimer->stop();
 	Swift::RosterItemExchangePayload::ref payload = Swift::RosterItemExchangePayload::ref(new Swift::RosterItemExchangePayload());
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		Swift::RosterItemExchangePayload::Item item;
 		item.jid = buddy->getJID().toBare();
 		item.name = buddy->getAlias();
 		item.action = Swift::RosterItemExchangePayload::Add;
 		item.groups = buddy->getGroups();
 		item.setJID(buddy->getJID().toBare());
 		item.setName(buddy->getAlias());
 		item.setAction(Swift::RosterItemExchangePayload::Item::Add);
 		item.setGroups(buddy->getGroups());
 		payload->addItem(item);
+	}
 	boost::shared_ptr<Swift::GenericRequest<Swift::RosterItemExchangePayload> > request(new Swift::GenericRequest<Swift::RosterItemExchangePayload>(Swift::IQ::Set, m_user->getJID(), payload, m_component->getIQRouter()));
 	request->send();

src/transport.cpp

➞

Show inline comments

@@ @@ -33,14 +33,14 @@ namespace Transport { @@
 class MyUserRegistry : public Swift::UserRegistry {
 	public:
 		MyUserRegistry(Component *c) {component = c;}
 		~MyUserRegistry() {}
 		bool isValidUserPassword(const JID& user, const std::string& password) const {
 			users[user.toBare().toString()] = password;
 		bool isValidUserPassword(const JID& user, const Swift::SafeByteArray& password) const {
 			users[user.toBare().toString()] = Swift::safeByteArrayToString(password);
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(component->getJID());
 			response->setFrom(user);
 			response->setType(Swift::Presence::Available);
 			component->onUserPresenceReceived(response);
 			std::cout << "CONNECTED LOGIN 1" << user.toString() << "\n";
 // 	if (m_reconnectCount == 2)
 // 		Component::instance()->userManager()->removeAllUsers();
 	m_reconnectTimer->start();
+}
 void Component::handleDataRead(const std::string &data) {
 	onXMLIn(data);
 void Component::handleDataRead(const Swift::SafeByteArray &data) {
 	onXMLIn(safeByteArrayToString(data));
+}
 void Component::handleDataWritten(const std::string &data) {
 	onXMLOut(data);
 void Component::handleDataWritten(const Swift::SafeByteArray &data) {
 	onXMLOut(safeByteArrayToString(data));
+}
 void Component::handlePresence(Swift::Presence::ref presence) {
 	bool isMUC = presence->getPayload<MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
 	// filter out login/logout presence spam
 	if (!presence->getTo().getNode().empty() && isMUC == false)

0 comments (0 inline, 0 general)