libtransport.git Changeset - 9477e3f83882

Changeset - 9477e3f83882

Parent rev.

Child rev.

[Not reviewed]

0 6 1

HanzZ - 14 years ago 2011-06-28 21:57:49
hanzz.k@gmail.com

Working accounts sharing :)

7 files changed with 98 insertions and 13 deletions:

include/Swiften/Server/ServerFromClientSession.cpp

include/transport/rostermanager.h

include/transport/usermanager.h

include/transport/userregistry.h

src/rostermanager.cpp

src/rosterresponder.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

 				getXMPPLayer()->writeElement(boost::shared_ptr<AuthFailure>(new AuthFailure));
 				finishSession(NoSupportedAuthMechanismsError);
+			}
+		}
 		else if (dynamic_cast<StartTLSRequest*>(element.get()) != NULL) {
 			getXMPPLayer()->writeElement(boost::shared_ptr<TLSProceed>(new TLSProceed));
 			getStreamStack()->addLayer(tlsLayer);
 			tlsLayer->connect();
 			getXMPPLayer()->resetParser();
+		}
 		else if (IQ* iq = dynamic_cast<IQ*>(element.get())) {
 			if (boost::shared_ptr<ResourceBind> resourceBind = iq->getPayload<ResourceBind>()) {
 				setRemoteJID(JID(user_, getLocalJID().getDomain(), resourceBind->getResource()));
 				std::string bucket = "abcdefghijklmnopqrstuvwxyz";
 				std::string uuid;
 				for (int i = 0; i < 10; i++) {
 					uuid += bucket[rand() % bucket.size()];
+				}
 				setRemoteJID(JID(user_, getLocalJID().getDomain(), uuid));
 				boost::shared_ptr<ResourceBind> resultResourceBind(new ResourceBind());
 				resultResourceBind->setJID(getRemoteJID());
 				getXMPPLayer()->writeElement(IQ::createResult(JID(), iq->getID(), resultResourceBind));
+			}
 			else if (iq->getPayload<StartSession>()) {
 				getXMPPLayer()->writeElement(IQ::createResult(getRemoteJID(), iq->getID()));
 				setInitialized();
+			}
+		}
+	}
+}

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -75,24 +75,26 @@ class RosterManager { @@
 		/// Called when Buddy has been removed from this roster.
 		/// \param buddy removed Buddy
 		boost::signal<void (Buddy *buddy)> onBuddyUnset;
 		boost::signal<void (Buddy *buddy)> onBuddyAdded;
 		boost::signal<void (Buddy *buddy)> onBuddyRemoved;
 		void handleSubscription(Swift::Presence::ref presence);
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendCurrentPresences(const Swift::JID &to);
 	private:
 		void setBuddyCallback(Buddy *buddy);
 		void sendRIE();
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);
 		std::map<std::string, Buddy *> m_buddies;
 		Component *m_component;
 		RosterStorage *m_rosterStorage;
 		User *m_user;
 		Swift::Timer::ref m_setBuddyTimer;
 		Swift::Timer::ref m_RIETimer;

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -64,36 +64,25 @@ class UserManager { @@
 		/// Called when new User class is created.
 		/// \param user newly created User class
 		boost::signal<void (User *user)> onUserCreated;
 		/// Called when User class is going to be removed
 		/// \param user removed User class
 		boost::signal<void (User *user)> onUserDestroyed;
 		bool isUserConnected(const std::string &barejid) const {
 			return m_users.find(barejid) != m_users.end();
+		}
 		void connectUser(const Swift::JID &user) {
 			if (m_users.find(user.toBare().toString()) != m_users.end()) {
 				m_userRegistry->onPasswordValid(user);
+			}
 			else {
 				Swift::Presence::ref response = Swift::Presence::create();
 				response->setTo(m_component->getJID());
 				response->setFrom(user);
 				response->setType(Swift::Presence::Available);
 				m_component->onUserPresenceReceived(response);
+			}
+		}
 		void connectUser(const Swift::JID &user);
 	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;

include/transport/userregistry.h

➞

Show inline comments

@@ new file 100644 @@
 /**
  * libtransport -- C++ library for easy XMPP Transports development
+ *
  * Copyright (C) 2011, Jan Kaluza <hanzz.k@gmail.com>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * 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
  */
 #pragma once
 #include <string>
 #include <map>
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "transport/config.h"
 namespace Transport {
 class UserRegistry : public Swift::UserRegistry {
 	public:
 		UserRegistry(Config *cfg) {config = cfg;}
 		~UserRegistry() {}
 		bool isValidUserPassword(const Swift::JID& user, const Swift::SafeByteArray& password) {
 			if (!CONFIG_STRING(config, "service.admin_username").empty() && user.getNode() == CONFIG_STRING(config, "service.admin_username")) {
 				if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 					onPasswordValid(user);
+				}
 				else {
 					onPasswordInvalid(user);
+				}
 				return true;
+			}
 			users[user.toBare().toString()] = Swift::safeByteArrayToString(password);
 			onConnectUser(user);
 			return true;
+		}
 		const std::string &getUserPassword(const std::string &barejid) {
 			return users[barejid];
+		}
 		boost::signal<void (const Swift::JID &user)> onConnectUser;
 		mutable std::map<std::string, std::string> users;
 		mutable Config *config;
 };
+}

src/rostermanager.cpp

➞

Show inline comments

 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		Swift::RosterItemPayload item;
 		item.setJID(buddy->getJID().toBare());
 		item.setName(buddy->getAlias());
 		item.setGroups(buddy->getGroups());
 		item.setSubscription(Swift::RosterItemPayload::Both);
 		payload->addItem(item);
+	}
 	return payload;
+}
 void RosterManager::sendCurrentPresences(const Swift::JID &to) {
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {
 			presence->setTo(to);
 			m_component->getStanzaChannel()->sendPresence(presence);
+		}
+	}
+}
+}

src/rosterresponder.cpp

➞

Show inline comments

 		// if it's not created, lets finish this get
 		user = m_userManager->getUser(from.toBare().toString());
 		if (!user) {
 			sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
 			return true;
+		}
+	}
 	else {
 		LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
+	}
 	sendResponse(from, id, user->getRosterManager()->generateRosterPayload());
 	user->getRosterManager()->sendCurrentPresences(from);
 	return true;
+}
 bool RosterResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::RosterPayload> payload) {
 	sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
 	User *user = m_userManager->getUser(from.toBare().toString());
 	if (!user) {
 		LOG4CXX_WARN(logger, from.toBare().toString() << ": User is not logged in");
 		return true;
+	}

src/usermanager.cpp

➞

Show inline comments

  	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");
 // 	}
+}
 void UserManager::connectUser(const Swift::JID &user) {
 	if (m_users.find(user.toBare().toString()) != m_users.end()) {
 		m_userRegistry->onPasswordValid(user);
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(m_component->getJID());
 		response->setFrom(user);
 		response->setType(Swift::Presence::Available);
 		m_component->onUserPresenceReceived(response);
+	}
+}
+}

0 comments (0 inline, 0 general)