libtransport.git Changeset - fd4946efe48c

Changeset - fd4946efe48c

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 13 years ago 2013-02-11 21:24:19
hanzz.k@gmail.com

Libcommuni: Do not enable JID escaping for IRC

5 files changed with 28 insertions and 4 deletions:

backends/libcommuni/ircnetworkplugin.cpp

include/transport/networkplugin.h

plugin/cpp/networkplugin.cpp

src/config.cpp

src/tests/config.cpp

0 comments (0 inline, 0 general)

backends/libcommuni/ircnetworkplugin.cpp

➞

Show inline comments

@@ @@ -50,18 +50,19 @@ void IRCNetworkPlugin::readData() { @@
 		return;
 	if (m_firstPing) {
 		m_firstPing = false;
 		// Users can join the network without registering if we allow
 		// one user to connect multiple IRC networks.
 		NetworkPlugin::PluginConfig cfg;
 		if (m_servers.empty()) {
 			NetworkPlugin::PluginConfig cfg;
 			cfg.setNeedRegistration(false);
 			cfg.setSupportMUC(true);
 			sendConfig(cfg);
+		}
 		cfg.setSupportMUC(true);
 		cfg.disableJIDEscaping();
 		sendConfig(cfg);
+	}
 	std::string d = std::string(m_socket->readAll().data(), availableBytes);
 	handleDataRead(d);
+}

include/transport/networkplugin.h

➞

Show inline comments

@@ @@ -36,26 +36,29 @@ namespace Transport { @@
 class NetworkPlugin {
 	public:
 		enum ExitCode { StorageBackendNeeded = -2 };
 		class PluginConfig {
 			public:
 				PluginConfig() : m_needPassword(true), m_needRegistration(false), m_supportMUC(false), m_rawXML(false) {}
 				PluginConfig() : m_needPassword(true), m_needRegistration(false), m_supportMUC(false), m_rawXML(false),
 				m_disableJIDEscaping(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; }
 				void setRawXML(bool rawXML = false) { m_rawXML = rawXML; }
 				void disableJIDEscaping() { m_disableJIDEscaping = true; }
 			private:
 				bool m_needPassword;
 				bool m_needRegistration;
 				bool m_supportMUC;
 				bool m_rawXML;
 				bool m_disableJIDEscaping;
 				std::vector<std::string> m_extraFields;
 				friend class NetworkPlugin;
 		};
 		/// Creates new NetworkPlugin and connects the Spectrum2 NetworkPluginServer.

plugin/cpp/networkplugin.cpp

➞

Show inline comments

@@ @@ -71,12 +71,14 @@ 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";
 	data += std::string("rawxml=") + (cfg.m_rawXML ? "1" : "0") + "\n";
 	data += std::string("disable_jid_escaping=") + (cfg.m_disableJIDEscaping ? "1" : "0") + "\n";
 	pbnetwork::BackendConfig m;
 	m.set_config(data);
 	std::string message;
 	m.SerializeToString(&message);

src/config.cpp

➞

Show inline comments

 		("registration.needPassword", value<bool>()->default_value(true), "")
 		("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), "")
 		("features.rawxml", value<bool>()->default_value(false), "")
 		("features.disable_jid_escaping", value<bool>()->default_value(false), "")
+	;
 	std::stringstream ifs(backendConfig);
 	parsed_options parsed = parse_config_file(ifs, opts, true);
 	store(parsed, m_backendConfig);
 	notify(m_backendConfig);
 	onBackendConfigUpdated();
 	if (CONFIG_BOOL_DEFAULTED(this, "features.disable_jid_escaping", false)) {
 		Variables::iterator it(m_variables.find("service.jid_escaping"));
 		boost::program_options::variable_value& vx(it->second);
 		vx.value() = false;
+	}
+}
 Config *Config::createFromArgs(int argc, char **argv, std::string &error, std::string &host, int &port) {
 	std::string jid;
 	std::ostringstream os;
 	std::string configFile;

src/tests/config.cpp

➞

Show inline comments

@@ @@ -23,12 +23,13 @@ @@
 using namespace Transport;
 class ConfigTest : public CPPUNIT_NS :: TestFixture{
 	CPPUNIT_TEST_SUITE(ConfigTest);
 	CPPUNIT_TEST(setStringTwice);
 	CPPUNIT_TEST(updateBackendConfig);
 	CPPUNIT_TEST(updateBackendConfigJIDEscaping);
 	CPPUNIT_TEST(unregisteredList);
 	CPPUNIT_TEST(unregisteredString);
 	CPPUNIT_TEST(unregisteredListAsString);
 	CPPUNIT_TEST(unregisteredStringAsList);
 	CPPUNIT_TEST_SUITE_END();
@@ @@ -54,12 +55,22 @@ class ConfigTest : public CPPUNIT_NS :: TestFixture{ @@
 		cfg.updateBackendConfig("[registration]\nneedPassword=0\n");
 		CPPUNIT_ASSERT(cfg.hasKey("registration.needPassword"));
 		CPPUNIT_ASSERT_EQUAL(false, CONFIG_BOOL(&cfg, "registration.needPassword"));
+	}
 	void updateBackendConfigJIDEscaping() {
 		Config cfg;
 		std::istringstream ifs("service.jids = irc.freenode.org\n");
 		cfg.load(ifs);
 		CPPUNIT_ASSERT_EQUAL(true, CONFIG_BOOL(&cfg, "service.jid_escaping"));
 		cfg.updateBackendConfig("[features]\ndisable_jid_escaping=1\n");
 		CPPUNIT_ASSERT_EQUAL(false, CONFIG_BOOL(&cfg, "service.jid_escaping"));
+	}
 	void unregisteredList() {
 		Config cfg;
 		std::istringstream ifs("service.irc_server = irc.freenode.org\nservice.irc_server=localhost\n");
 		cfg.load(ifs);
 		CPPUNIT_ASSERT_EQUAL(2, (int) CONFIG_LIST(&cfg, "service.irc_server").size());
+	}

0 comments (0 inline, 0 general)