libtransport.git Changeset - c44d57135100

Changeset - c44d57135100

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 14 years ago 2012-04-11 09:16:56
hanzz.k@gmail.com

Send backend config

2 files changed with 17 insertions and 3 deletions:

plugin/cpp/networkplugin.cpp

src/userregistry.cpp

0 comments (0 inline, 0 general)

plugin/cpp/networkplugin.cpp

➞

Show inline comments

@@ @@ -41,49 +41,63 @@ namespace Transport { @@
 	wrap.set_type(TYPE); \
 	wrap.set_payload(MESSAGE); \
 	wrap.SerializeToString(&MESSAGE);
 template <class T> std::string stringOf(T object) {
 	std::ostringstream os;
 	os << object;
 	return (os.str());
+}
 NetworkPlugin::NetworkPlugin() {
 	m_pingReceived = false;
 	double shared;
 #ifndef WIN32
 	process_mem_usage(shared, m_init_res);
 #endif
+}
 NetworkPlugin::~NetworkPlugin() {
+}
 void NetworkPlugin::sendConfig(const PluginConfig &cfg) {
 	std::string data = "[registration]";
 	data += std::string("needPassword=") + (cfg.m_needPassword ? "1" : "0");
 	data += std::string("needPassword=") + (cfg.m_needPassword ? "1" : "0") + "\n";
 	for (std::vector<std::string>::const_iterator it = cfg.m_extraFields.begin(); it != cfg.m_extraFields.end(); it++) {
 		data += std::string("extraField=") + (*it) + "\n";
+	}
 	pbnetwork::BackendConfig m;
 	m.set_config(data);
 	std::string message;
 	m.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BACKEND_CONFIG);
 	send(message);
+}
 void NetworkPlugin::handleMessage(const std::string &user, const std::string &legacyName, const std::string &msg, const std::string &nickname, const std::string &xhtml) {
 	pbnetwork::ConversationMessage m;
 	m.set_username(user);
 	m.set_buddyname(legacyName);
 	m.set_message(msg);
 	m.set_nickname(nickname);
 	m.set_xhtml(xhtml);
 	std::string message;
 	m.SerializeToString(&message);
 	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_CONV_MESSAGE);
 	send(message);
+}
 void NetworkPlugin::handleAttention(const std::string &user, const std::string &buddyName, const std::string &msg) {
 	pbnetwork::ConversationMessage m;
 	m.set_username(user);
 	m.set_buddyname(buddyName);
 	m.set_message(msg);

src/userregistry.cpp

➞

Show inline comments

@@ @@ -20,52 +20,52 @@ @@
 #include <string>
 #include <map>
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "transport/userregistry.h"
 #include "transport/logging.h"
 namespace Transport {
 DEFINE_LOGGER(logger, "UserRegistry");
 UserRegistry::UserRegistry(Config *cfg, Swift::NetworkFactories *factories) {
 	config = cfg;
 	m_removeTimer = factories->getTimerFactory()->createTimer(1);
 	m_inRemoveLater = false;
+}
 UserRegistry::~UserRegistry() { m_removeTimer->stop(); }
 void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFromClientSession *session, const Swift::SafeByteArray& password) {
 	std::vector<std::string> const &x = CONFIG_VECTOR(config,"service.admin_jid");
 	if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
 		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 		session->handlePasswordValid();
+			session->handlePasswordValid();
+		}
 		else {
 		session->handlePasswordInvalid();
+			session->handlePasswordInvalid();
+		}
 		return;
+	}
 	std::string key = user.toBare().toString();
 	// Users try to connect twice
 	if (users.find(key) != users.end()) {
 		// Kill the first session
 		LOG4CXX_INFO(logger, key << ": Removing previous session and making this one active");
 		Swift::ServerFromClientSession *tmp = users[key].session;
 		users[key].session = session;
 		tmp->handlePasswordInvalid();
+	}
 	LOG4CXX_INFO(logger, key << ": Connecting this user to find if password is valid");
 	users[key].password = Swift::safeByteArrayToString(password);
 	users[key].session = session;
 	onConnectUser(user);
 	return;
+}
 void UserRegistry::stopLogin(const Swift::JID& user, Swift::ServerFromClientSession *session) {

0 comments (0 inline, 0 general)