libtransport.git Changeset - 711c1674fe9d

Changeset - 711c1674fe9d

Parent rev.

Child rev.

[Not reviewed]

0 7 0

HanzZ - 12 years ago 2013-01-26 15:22:25
hanzz.k@gmail.com

Send 'http://jabber.org/protocol/muc' if MUC is supported by backend

7 files changed with 32 insertions and 13 deletions:

backends/libcommuni/ircnetworkplugin.cpp

backends/libpurple/main.cpp

include/transport/networkplugin.h

plugin/cpp/networkplugin.cpp

src/config.cpp

src/discoinforesponder.cpp

src/discoinforesponder.h

0 comments (0 inline, 0 general)

backends/libcommuni/ircnetworkplugin.cpp

➞

Show inline comments

@@ @@ -56,6 +56,7 @@ void IRCNetworkPlugin::readData() { @@
 		if (m_servers.empty()) {
 			NetworkPlugin::PluginConfig cfg;
 			cfg.setNeedRegistration(false);
 			cfg.setSupportMUC(true);
 			sendConfig(cfg);
+		}
+	}

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -43,6 +43,7 @@ DEFINE_LOGGER(logger, "backend"); @@
 int main_socket;
 static int writeInput;
 bool firstPing = true;
 using namespace Transport;
 			exit(errno);
+		}
 		std::string d = std::string(buffer, n);
 		if (firstPing) {
 			firstPing = false;
 			NetworkPlugin::PluginConfig cfg;
 			cfg.setSupportMUC(true);
 			np->sendConfig(cfg);
+		}
 		np->handleDataRead(d);
+	}
 	else {

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -39,16 +39,18 @@ class NetworkPlugin { @@
 		class PluginConfig {
 			public:
 				PluginConfig() : m_needPassword(true), m_needRegistration(false) {}
+				PluginConfig() : m_needPassword(true), m_needRegistration(false), m_supportMUC(false) {}
 				virtual ~PluginConfig() {}
 				void setNeedRegistration(bool needRegistration = false) { m_needRegistration = needRegistration; }
 				void setNeedPassword(bool needPassword = true) { m_needPassword = needPassword; }
 				void setSupportMUC(bool supportMUC = true) { m_supportMUC = supportMUC; }
 				void setExtraFields(const std::vector<std::string> &fields) { m_extraFields = fields; }
 			private:
 				bool m_needPassword;
 				bool m_needRegistration;
 				bool m_supportMUC;
 				std::vector<std::string> m_extraFields;
 				friend class NetworkPlugin;

plugin/cpp/networkplugin.cpp

➞

Show inline comments

@@ @@ -71,6 +71,9 @@ void NetworkPlugin::sendConfig(const PluginConfig &cfg) { @@
 		data += std::string("extraField=") + (*it) + "\n";
+	}
 	data += "[features]\n";
 	data += std::string("muc=") + (cfg.m_supportMUC ? "1" : "0") + "\n";
 	pbnetwork::BackendConfig m;
 	m.set_config(data);

src/config.cpp

➞

Show inline comments

 		("registration.needRegistration", value<bool>()->default_value(false), "")
 		("registration.extraField", value<std::vector<std::string> >()->multitoken(), "")
 		("features.receipts", value<bool>()->default_value(false), "")
 		("features.muc", value<bool>()->default_value(false), "")
+	;
 	std::stringstream ifs(backendConfig);

src/discoinforesponder.cpp

➞

Show inline comments

@@ @@ -39,28 +39,31 @@ namespace Transport { @@
 DiscoInfoResponder::DiscoInfoResponder(Swift::IQRouter *router, Config *config) : Swift::GetResponder<DiscoInfo>(router) {
 	m_config = config;
-	m_config->onBackendConfigUpdated.connect(boost::bind(&DiscoInfoResponder::updateBuddyFeatures, this));
+	m_config->onBackendConfigUpdated.connect(boost::bind(&DiscoInfoResponder::updateFeatures, this));
 	m_buddyInfo = NULL;
 	m_transportInfo.addIdentity(DiscoInfo::Identity(CONFIG_STRING(m_config, "identity.name"),
 													CONFIG_STRING(m_config, "identity.category"),
 													CONFIG_STRING(m_config, "identity.type")));
 	std::list<std::string> features;
 	features.push_back("jabber:iq:register");
 	features.push_back("jabber:iq:gateway");
 	features.push_back("jabber:iq:private");
 	features.push_back("http://jabber.org/protocol/disco#info");
 	features.push_back("http://jabber.org/protocol/commands");
 	setTransportFeatures(features);
 	updateBuddyFeatures();
 	updateFeatures();
+}
 DiscoInfoResponder::~DiscoInfoResponder() {
 	delete m_buddyInfo;
+}
 void DiscoInfoResponder::updateBuddyFeatures() {
 void DiscoInfoResponder::updateFeatures() {
 	std::list<std::string> features2;
 	features2.push_back("jabber:iq:register");
 	features2.push_back("jabber:iq:gateway");
 	features2.push_back("jabber:iq:private");
 	features2.push_back("http://jabber.org/protocol/disco#info");
 	features2.push_back("http://jabber.org/protocol/commands");
 	if (CONFIG_BOOL_DEFAULTED(m_config, "features.muc", false)) {
 		features2.push_back("http://jabber.org/protocol/muc");
+	}
 	setTransportFeatures(features2);
 	std::list<std::string> features;
 	features.push_back("http://jabber.org/protocol/disco#items");
 	features.push_back("http://jabber.org/protocol/disco#info");

src/discoinforesponder.h

➞

Show inline comments

 	private:
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::DiscoInfo> payload);
-		void updateBuddyFeatures();
+		void updateFeatures();
 		Swift::DiscoInfo m_transportInfo;
 		Swift::DiscoInfo *m_buddyInfo;

0 comments (0 inline, 0 general)