libtransport.git Changeset - 5797b554ea69

Changeset - 5797b554ea69

Parent rev.

Child rev.

[Not reviewed]

0 8 0

Jan Kaluza - 14 years ago 2011-04-06 14:05:52
hanzz.k@gmail.com

Preparation for Subscriptions handling

8 files changed with 73 insertions and 69 deletions:

include/transport/rostermanager.h

include/transport/transport.h

include/transport/user.h

include/transport/usermanager.h

src/rostermanager.cpp

src/transport.cpp

src/user.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -65,12 +65,14 @@ class RosterManager { @@
 		boost::signal<void (Buddy *buddy)> onBuddySet;
 		/// Called when Buddy has been removed from this roster.
 		/// \param buddy removed Buddy
 		boost::signal<void (Buddy *buddy)> onBuddyUnset;
 		void handleSubscription(Swift::Presence::ref presence);
 	private:
 		void setBuddyCallback(Buddy *buddy);
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendRIE();
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);

include/transport/transport.h

➞

Show inline comments

@@ @@ -130,17 +130,13 @@ 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 handlePresenceReceived(Swift::Presence::ref presence);
 // 			void handleMessageReceived(Swift::Message::ref message);
 			void handlePresence(Swift::Presence::ref presence);
 			void handleSubscription(Swift::Presence::ref presence);
 			void handleProbePresence(Swift::Presence::ref presence);
 			void handleDataRead(const std::string &data);
 			void handleDataWritten(const std::string &data);
 // 			void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 			void handleCapsChanged(const Swift::JID& jid);

include/transport/user.h

➞

Show inline comments

@@ @@ -66,12 +66,14 @@ class User { @@
 		void *getData() { return m_data; }
 		/// Handles presence from XMPP JID associated with this user.
 		/// \param presence Swift::Presence.
 		void handlePresence(Swift::Presence::ref presence);
 		void handleSubscription(Swift::Presence::ref presence);
 		/// Returns language.
 		/// \return language
 		const char *getLang() { return "en"; }
 		void handleDisconnected(const std::string &error);

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -66,12 +66,15 @@ class UserManager { @@
 		/// \param user removed User class
 		boost::signal<void (User *user)> onUserDestroyed;
 	private:
 		void handlePresence(Swift::Presence::ref presence);
 		void handleMessageReceived(Swift::Message::ref message);
 		void handleGeneralPresenceReceived(Swift::Presence::ref presence);
 		void handleProbePresence(Swift::Presence::ref presence);
 		void handleSubscription(Swift::Presence::ref presence);
 // 		void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);
 		void addUser(User *user);
 		long m_onlineBuddies;
 		User *m_cachedUser;
 		std::map<std::string, User *> m_users;

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -116,7 +116,11 @@ void RosterManager::sendRIE() { @@
+	}
 	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();
+}
 void RosterManager::handleSubscription(Swift::Presence::ref presence) {
+}
+}
@@ \ No newline at end of file @@

src/transport.cpp

➞

Show inline comments

 		m_component = new Swift::Component(loop, m_factories, m_jid, CONFIG_STRING(m_config, "service.password"));
 		m_component->setSoftwareVersion("", "");
 		m_component->onConnected.connect(bind(&Component::handleConnected, this));
 		m_component->onError.connect(bind(&Component::handleConnectionError, this, _1));
 		m_component->onDataRead.connect(bind(&Component::handleDataRead, this, _1));
 		m_component->onDataWritten.connect(bind(&Component::handleDataWritten, this, _1));
 		m_component->onPresenceReceived.connect(bind(&Component::handlePresenceReceived, this, _1));
 // 		m_component->onMessageReceived.connect(bind(&Component::handleMessageReceived, this, _1));
 		m_stanzaChannel = m_component->getStanzaChannel();
 		m_iqRouter = m_component->getIQRouter();
+	}
 	m_capsMemoryStorage = new CapsMemoryStorage();
 	m_capsManager = new CapsManager(m_capsMemoryStorage, m_stanzaChannel, m_iqRouter);
@@ @@ -167,31 +165,12 @@ void Component::handleDataRead(const std::string &data) { @@
+}
 void Component::handleDataWritten(const std::string &data) {
 	onXMLOut(data);
+}
 void Component::handlePresenceReceived(Swift::Presence::ref presence) {
 	switch(presence->getType()) {
 		case Swift::Presence::Subscribe:
 		case Swift::Presence::Subscribed:
 		case Swift::Presence::Unsubscribe:
 		case Swift::Presence::Unsubscribed:
 			handleSubscription(presence);
 			break;
 		case Swift::Presence::Available:
 		case Swift::Presence::Unavailable:
 			break;
 		case Swift::Presence::Probe:
 			handleProbePresence(presence);
 			break;
 		default:
 			break;
 	};
+}
 void Component::handlePresence(Swift::Presence::ref presence) {
 	bool isMUC = presence->getPayload<MUCPayload>() != NULL;
 	// filter out login/logout presence spam
 	if (!presence->getTo().getNode().empty() && isMUC == false)
 		return;
 // 		}
+	}
 	onUserPresenceReceived(presence);
+}
 void Component::handleProbePresence(Swift::Presence::ref presence) {
+}
 void Component::handleSubscription(Swift::Presence::ref presence) {
 	// answer to subscibe
 	if (presence->getType() == Swift::Presence::Subscribe && presence->getTo().getNode().empty()) {
 // 		Log(presence->getFrom().toString().getUTF8String(), "Subscribe presence received => sending subscribed");
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom());
 		response->setType(Swift::Presence::Subscribed);
 		m_component->sendPresence(response);
 		return;
+	}
 	if (m_protocol == "irc") {
 		return;
+	}
 // 	User *user;
 // 	std::string barejid = presence->getTo().toBare().toString().getUTF8String();
 // 	std::string userkey = presence->getFrom().toBare().toString().getUTF8String();
 // 	if (Transport::instance()->protocol()->tempAccountsAllowed()) {
 // 		std::string server = barejid.substr(barejid.find("%") + 1, barejid.length() - barejid.find("%"));
 // 		userkey += server;
 // 	}
 // 	user = (User *) Transport::instance()->userManager()->getUserByJID(userkey);
 // 	if (user) {
 // 		user->handleSubscription(presence);
 // 	}
 // 	else if (presence->getType() == Swift::Presence::Unsubscribe) {
 // 		Swift::Presence::ref response = Swift::Presence::create();
 // 		response->setFrom(presence->getTo());
 // 		response->setTo(presence->getFrom());
 // 		response->setType(Swift::Presence::Unsubscribed);
 // 		m_component->sendPresence(response);
 // 	}
 // 	else {
 // // 		Log(presence->getFrom().toString().getUTF8String(), "Subscribe presence received, but this user is not logged in");
 // 	}
+}
 void Component::handleCapsChanged(const Swift::JID& jid) {
 	bool haveFeatures = m_entityCapsManager->getCaps(jid) != DiscoInfo::ref();
 	std::cout << "has capsInfo " << haveFeatures << "\n";
+}
+}

src/user.cpp

➞

Show inline comments

@@ @@ -94,12 +94,16 @@ void User::handlePresence(Swift::Presence::ref presence) { @@
 		response->setFrom(m_component->getJID());
 		response->setType(Swift::Presence::Unavailable);
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
+}
 void User::handleSubscription(Swift::Presence::ref presence) {
 	m_rosterManager->handleSubscription(presence);
+}
 void User::onConnectingTimeout() {
 	if (m_connected || m_readyForConnect)
 		return;
 	m_reconnectTimer->stop();
 	m_readyForConnect = true;
 	onReadyToConnect();

src/usermanager.cpp

➞

Show inline comments

 	m_onlineBuddies = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
 	component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
 	m_component->getStanzaChannel()->onMessageReceived.connect(bind(&UserManager::handleMessageReceived, this, _1));
 	m_component->getStanzaChannel()->onPresenceReceived.connect(bind(&UserManager::handleGeneralPresenceReceived, this, _1));
 // 	component->onDiscoInfoResponse.connect(bind(&UserManager::handleDiscoInfoResponse, this, _1, _2, _3));
+}
 UserManager::~UserManager(){
+}
 		return;
+	}
 	user->getConversationManager()->handleMessageReceived(message);
+}
 void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {
 	switch(presence->getType()) {
 		case Swift::Presence::Subscribe:
 		case Swift::Presence::Subscribed:
 		case Swift::Presence::Unsubscribe:
 		case Swift::Presence::Unsubscribed:
 			handleSubscription(presence);
 			break;
 		case Swift::Presence::Available:
 		case Swift::Presence::Unavailable:
 			break;
 		case Swift::Presence::Probe:
 			handleProbePresence(presence);
 			break;
 		default:
 			break;
 	};
+}
 void UserManager::handleProbePresence(Swift::Presence::ref presence) {
+}
 void UserManager::handleSubscription(Swift::Presence::ref presence) {
 	// answer to subscibe for transport itself
 	if (presence->getType() == Swift::Presence::Subscribe && presence->getTo().getNode().empty()) {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom());
 		response->setType(Swift::Presence::Subscribed);
 		m_component->getStanzaChannel()->sendPresence(response);
 		response = Swift::Presence::create();
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom());
 		response->setType(Swift::Presence::Subscribe);
 		m_component->getStanzaChannel()->sendPresence(response);
 		return;
+	}
 	User *user = getUser(presence->getFrom().toBare().toString());
  	if (user) {
  		user->handleSubscription(presence);
+ 	}
  	else if (presence->getType() == Swift::Presence::Unsubscribe) {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setFrom(presence->getTo());
 		response->setTo(presence->getFrom());
 		response->setType(Swift::Presence::Unsubscribed);
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
 // 	else {
 // // 		Log(presence->getFrom().toString().getUTF8String(), "Subscribe presence received, but this user is not logged in");
 // 	}
+}
+}

0 comments (0 inline, 0 general)