libtransport.git Changeset - 62fcb141926d

Changeset - 62fcb141926d

Parent rev.

Child rev.

[Not reviewed]

0 8 0

Jan Kaluza - 14 years ago 2011-06-02 13:52:19
hanzz.k@gmail.com

send authorize after logging legacy network

8 files changed with 44 insertions and 17 deletions:

backends/libpurple/main.cpp

include/transport/networkplugin.h

include/transport/networkpluginserver.h

src/networkplugin.cpp

src/networkpluginserver.cpp

src/pbnetwork.proto

src/transport.cpp

src/user.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -463,12 +463,17 @@ static PurpleCoreUiOps coreUiOps = @@
 	NULL,
 	NULL,
 	NULL,
 	NULL
 };
 static void signed_on(PurpleConnection *gc, gpointer unused) {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	np->handleConnected(np->m_accounts[account]);
+}
 static void printDebug(PurpleDebugLevel level, const char *category, const char *arg_s) {
 	std::string c("[LIBPURPLE");
 	if (category) {
 		c.push_back('/');
 		c.append(category);
@@ @@ -533,13 +538,13 @@ static bool initPurple(Config &cfg) { @@
 // 		purple_signal_connect(purple_conversations_get_handle(), "received-im-msg", &conversation_handle, PURPLE_CALLBACK(newMessageReceived), NULL);
 // 		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", &conversation_handle, PURPLE_CALLBACK(buddyTyping), NULL);
 // 		purple_signal_connect(purple_conversations_get_handle(), "buddy-typed", &conversation_handle, PURPLE_CALLBACK(buddyTyped), NULL);
 // 		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", &conversation_handle, PURPLE_CALLBACK(buddyTypingStopped), NULL);
-// 		purple_signal_connect(purple_connections_get_handle(), "signed-on", &conn_handle,PURPLE_CALLBACK(signed_on), NULL);
+		purple_signal_connect(purple_connections_get_handle(), "signed-on", &blist_handle,PURPLE_CALLBACK(signed_on), NULL);
 // 		purple_signal_connect(purple_blist_get_handle(), "buddy-removed", &blist_handle,PURPLE_CALLBACK(buddyRemoved), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", &blist_handle,PURPLE_CALLBACK(buddySignedOn), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", &blist_handle,PURPLE_CALLBACK(buddySignedOff), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "buddy-status-changed", &blist_handle,PURPLE_CALLBACK(buddyStatusChanged), NULL);
 		purple_signal_connect(purple_blist_get_handle(), "blist-node-removed", &blist_handle,PURPLE_CALLBACK(NodeRemoved), NULL);
 // 		purple_signal_connect(purple_conversations_get_handle(), "chat-topic-changed", &conversation_handle, PURPLE_CALLBACK(conv_chat_topic_changed), NULL);

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -45,12 +45,14 @@ class NetworkPlugin { @@
 		);
 		void handleParticipantChanged(const std::string &user, const std::string &nickname, const std::string &room, int flags, int status = Swift::StatusShow::None, const std::string &statusMessage = "", const std::string &newname = "");
 		void handleDisconnected(const std::string &user, const std::string &legacyName, int error, const std::string &message);
 		void handleConnected(const std::string &user);
 		void handleMessage(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &nickname = "");
 		void handleSubject(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);
@@ @@ -70,13 +72,13 @@ class NetworkPlugin { @@
 		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 handleConnected(bool error);
+		void _handleConnected(bool error);
 		void handleDisconnected();
 		void send(const std::string &data);
 		void sendPong();
 		void pingTimeout();

include/transport/networkpluginserver.h

➞

Show inline comments

@@ @@ -84,9 +84,10 @@ class NetworkPluginServer { @@
 		UserManager *m_userManager;
 		VCardResponder *m_vcardResponder;
 		Config *m_config;
 		boost::shared_ptr<Swift::ConnectionServer> m_server;
 		std::list<Client *>  m_clients;
 		Swift::Timer::ref m_pingTimer;
 		Component *m_component;
 };
+}

src/networkplugin.cpp

➞

Show inline comments

 	m_factories = new Swift::BoostNetworkFactories(loop);
 	m_host = host;
 	m_port = port;
 	m_pingReceived = false;
 	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->onConnectFinished.connect(boost::bind(&NetworkPlugin::_handleConnected, this, _1));
 	m_conn->onDisconnected.connect(boost::bind(&NetworkPlugin::handleDisconnected, this));
 	m_pingTimer = m_factories->getTimerFactory()->createTimer(30000);
 	m_pingTimer->onTick.connect(boost::bind(&NetworkPlugin::pingTimeout, this));
 	connect();
+}
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BUDDY_CHANGED);
 	send(message);
+}
 void NetworkPlugin::handleConnected(const std::string &user) {
 	pbnetwork::Connected d;
 	d.set_user(user);
 	std::string message;
 	d.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONNECTED);
 	send(message);
+}
 void NetworkPlugin::handleDisconnected(const std::string &user, const std::string &legacyName, int error, const std::string &msg) {
 	pbnetwork::Disconnected d;
 	d.set_user(user);
 	d.set_name(legacyName);
 	d.set_error(error);
 	d.set_message(msg);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_ROOM_NICKNAME_CHANGED);
 	send(message);
+}
-void NetworkPlugin::handleConnected(bool error) {
+void NetworkPlugin::_handleConnected(bool error) {
 	if (error) {
 		std::cerr << "Connecting error\n";
 		m_pingTimer->stop();
 		exit(1);
+	}
 	else {

src/networkpluginserver.cpp

➞

Show inline comments

 	buddy->setIconHash(payload.iconhash());
+}
 NetworkPluginServer::NetworkPluginServer(Component *component, Config *config, UserManager *userManager) {
 	m_userManager = userManager;
 	m_config = config;
 	component->m_factory = new NetworkFactory(this);
 	m_component = component;
 	m_component->m_factory = new NetworkFactory(this);
 	m_userManager->onUserCreated.connect(boost::bind(&NetworkPluginServer::handleUserCreated, this, _1));
 	m_userManager->onUserDestroyed.connect(boost::bind(&NetworkPluginServer::handleUserDestroyed, this, _1));
 	m_pingTimer = component->getFactories()->getTimerFactory()->createTimer(10000);
 	m_pingTimer->onTick.connect(boost::bind(&NetworkPluginServer::pingTimeout, this));
 void NetworkPluginServer::handleConnectedPayload(const std::string &data) {
 	pbnetwork::Connected payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	std::cout << "CONNECTED LOGIN 2 " << 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;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	User *user = m_userManager->getUser(payload.user());
 	if (!user)
+	if (!user) {
 		return;
+	}
 	m_component->m_userRegistry->onPasswordInvalid(payload.user());
 	user->handleDisconnected(payload.message());
+}
 void NetworkPluginServer::handleVCardPayload(const std::string &data) {
 	pbnetwork::VCard payload;
 	if (payload.ParseFromString(data) == false) {

src/pbnetwork.proto

➞

Show inline comments

 package pbnetwork;
 message Connected {
 	required string user = 1;
 	required string name = 2;
+}
 message Disconnected {
 	required string user = 1;
 	required string name = 2;
 	required int32 error = 3;

src/transport.cpp

➞

Show inline comments

@@ @@ -31,19 +31,26 @@ using namespace boost; @@
 namespace Transport {
 class MyUserRegistry : public Swift::UserRegistry {
 	public:
 		MyUserRegistry() {}
+		MyUserRegistry(Component *c) {component = c;}
 		~MyUserRegistry() {}
 		bool isValidUserPassword(const JID& user, const std::string& password) const {
 			users[user.toBare().toString()] = 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";
 			return true;
+		}
 		mutable std::map<std::string, std::string> users;
 		mutable Component *component;
 };
 Component::Component(Swift::EventLoop *loop, Config *config, Factory *factory) {
 	m_component = NULL;
 	m_userRegistry = NULL;
 	m_server = NULL;
 	m_factories = new BoostNetworkFactories(loop);
 	m_reconnectTimer = m_factories->getTimerFactory()->createTimer(1000);
 	m_reconnectTimer->onTick.connect(bind(&Component::connect, this));
 	if (CONFIG_BOOL(m_config, "service.server_mode")) {
 		m_userRegistry = new MyUserRegistry();
+		m_userRegistry = new MyUserRegistry(this);
 		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));
 		m_server->start();
 		m_stanzaChannel = m_server->getStanzaChannel();
 		m_iqRouter = m_server->getIQRouter();
 		m_server->addPayloadParserFactory(new GenericPayloadParserFactory<StorageParser>("private", "jabber:iq:private"));
 	// filter out login/logout presence spam
 	if (!presence->getTo().getNode().empty() && isMUC == false)
 		return;
 	// filter out bad presences
 	if (!presence->getFrom().isValid()) {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(presence->getFrom());
 		response->setFrom(presence->getTo());
 		response->setType(Swift::Presence::Error);
 		response->addPayload(boost::shared_ptr<Payload>(new ErrorPayload(ErrorPayload::JIDMalformed, ErrorPayload::Modify)));
 		m_component->sendPresence(response);
 		return;
+	}
 	// check if we have this client's capabilities and ask for them
 	bool haveFeatures = false;
 	if (presence->getType() != Swift::Presence::Unavailable) {

src/user.cpp

➞

Show inline comments

@@ @@ -74,12 +74,16 @@ void User::handlePresence(Swift::Presence::ref presence) { @@
 			if (capsInfo && capsInfo->getHash() == "sha-1") {
 				if (m_entityCapsManager->getCaps(presence->getFrom()) != Swift::DiscoInfo::ref()) {
 					m_readyForConnect = true;
 					onReadyToConnect();
+				}
+			}
 			else if (m_component->inServerMode()) {
 					m_readyForConnect = true;
 					onReadyToConnect();
+			}
 			else {
 				m_reconnectTimer->start();
+			}
+		}
+	}
 	std::cout << "HANDLE PRESENCE\n";

0 comments (0 inline, 0 general)