libtransport.git Changeset - 680cc369de6e

Changeset - 680cc369de6e

Parent rev.

Child rev.

[Not reviewed]

Merge

0 6 0

HanzZ - 13 years ago 2012-06-04 19:51:58
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

5 files changed with 19 insertions and 14 deletions:

backends/libcommuni/main.cpp

backends/libcommuni/singleircnetworkplugin.cpp

backends/smstools3/main.cpp

include/transport/config.h

src/config.cpp

0 comments (0 inline, 0 general)

backends/libcommuni/main.cpp

➞

Show inline comments

@@ @@ -57,33 +57,33 @@ int main (int argc, char* argv[]) { @@
+	}
 // 	QStringList channels;
 // 	for (int i = 3; i < argc; ++i)
 // 	{
 // 		channels.append(argv[i]);
 // 	}
 //
 // 	MyIrcSession session;
 // 	session.setNick(argv[2]);
 // 	session.setAutoJoinChannels(channels);
 // 	session.connectToServer(argv[1], 6667);
 	Config config;
 	if (!config.load(argv[5])) {
 		std::cerr << "Can't open " << argv[1] << " configuration file.\n";
 		return 1;
+	}
 	QCoreApplication app(argc, argv);
 	Logging::initBackendLogging(&config);
 	Swift::QtEventLoop eventLoop;
-	if (config.getUnregistered().find("service.irc_server") == config.getUnregistered().end()) {
+	if (!CONFIG_HAS_KEY(&config, "service.irc_server")) {
 		np = new IRCNetworkPlugin(&config, &eventLoop, host, port);
+	}
 	else {
 		np = new SingleIRCNetworkPlugin(&config, &eventLoop, host, port);
+	}
 	return app.exec();
+}

backends/libcommuni/singleircnetworkplugin.cpp

➞

Show inline comments

 #include "singleircnetworkplugin.h"
 #include "transport/logging.h"
 #include <IrcCommand>
 #include <IrcMessage>
 #define FROM_UTF8(WHAT) QString::fromUtf8((WHAT).c_str(), (WHAT).size())
 #define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
 DEFINE_LOGGER(logger, "SingleIRCNetworkPlugin");
 SingleIRCNetworkPlugin::SingleIRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) {
 	this->config = config;
 	m_server = config->getUnregistered().find("service.irc_server")->second;
 	if (CONFIG_HAS_KEY(config, "service.irc_server")) {
 		m_server = CONFIG_STRING(config, "service.irc_server");
+	}
 	else {
 		LOG4CXX_ERROR(logger, "No [service] irc_server defined, exiting...");
 		exit(-1);
+	}
 	m_socket = new QTcpSocket();
 	m_socket->connectToHost(FROM_UTF8(host), port);
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
 	if (config->getUnregistered().find("service.irc_identify") != config->getUnregistered().end()) {
 		m_identify = config->getUnregistered().find("service.irc_identify")->second;
 	if (CONFIG_HAS_KEY(config, "service.irc_identify")) {
 		m_identify = CONFIG_STRING(config, "service.irc_identify");
+	}
 	else {
 		m_identify = "NickServ identify $name $password";
+	}
 	LOG4CXX_INFO(logger, "SingleIRCNetworkPlugin for server " << m_server << " initialized.");
+}
 void SingleIRCNetworkPlugin::readData() {
 	size_t availableBytes = m_socket->bytesAvailable();
 	if (availableBytes == 0)
 		return;
 	std::string d = std::string(m_socket->readAll().data(), availableBytes);
 	handleDataRead(d);
+}
 void SingleIRCNetworkPlugin::sendData(const std::string &string) {
 	m_socket->write(string.c_str(), string.size());
+}
 void SingleIRCNetworkPlugin::handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 	// legacy name is users nickname
 	if (m_sessions[user] != NULL) {

backends/smstools3/main.cpp

➞

Show inline comments

@@ @@ -103,50 +103,50 @@ class SMSNetworkPlugin : public NetworkPlugin { @@
+				}
 				str = str.substr(str.find("\n") + 1);
+			}
 			std::list<BuddyInfo> roster;
 			storageBackend->getBuddies(m_internalUser, roster);
 			std::string to;
 			BOOST_FOREACH(BuddyInfo &b, roster) {
 				if (b.legacyName == from) {
 					to = b.alias;
+				}
+			}
 			if (to.empty()) {
 				LOG4CXX_WARN(logger, "Received SMS from " << from << ", but this number is not associated with any XMPP user.");
+			}
 			LOG4CXX_INFO(logger, "Forwarding SMS from " << from << " to " << to << ".");
 			handleMessage(to, from, msg);
+		}
 		void handleSMSDir() {
 			std::string dir = "/var/spool/sms/incoming/";
 			if (config->getUnregistered().find("backend.incoming_dir") != config->getUnregistered().end()) {
 				dir = config->getUnregistered().find("backend.incoming_dir")->second;
 			if (CONFIG_HAS_KEY(config, "backend.incoming_dir")) {
 				dir = CONFIG_STRING(config, "backend.incoming_dir");
+			}
 			LOG4CXX_INFO(logger, "Checking directory " << dir << " for incoming SMS.");
 			path p(dir);
 			directory_iterator end_itr;
 			for (directory_iterator itr(p); itr != end_itr; ++itr) {
 				try {
 					if (is_regular(itr->path())) {
 						handleSMS(itr->path().string());
 						remove(itr->path());
+					}
+				}
 				catch (const filesystem_error& ex) {
 					LOG4CXX_ERROR(logger, "Error when removing the SMS: " << ex.what() << ".");
+				}
+			}
 			m_timer->start();
+		}
 		void sendSMS(const std::string &to, const std::string &msg) {
 			// TODO: Probably
 			std::string data = "To: " + to + "\n";
 			data += "\n";

include/transport/config.h

➞

Show inline comments

@@ @@ -56,54 +56,53 @@ class Config { @@
 		virtual ~Config() {}
 		/// Loads data from config file.
 		/// You can pass your extra options which will be recognized by
 		/// the parser using opts parameter.
 		/// \param configfile path to config file
 		/// \param opts extra options which will be recognized by a parser
 		bool load(const std::string &configfile, boost::program_options::options_description &opts, const std::string &jid = "");
 		bool load(std::istream &ifs, boost::program_options::options_description &opts, const std::string &jid = "");
 		bool load(std::istream &ifs);
 		/// Loads data from config file.
 		/// This function loads only config variables needed by libtransport.
 		/// \see load(const std::string &, boost::program_options::options_description &)
 		/// \param configfile path to config file
 		bool load(const std::string &configfile, const std::string &jid = "");
 		bool reload();
 		bool hasKey(const std::string &key) {
 			return m_variables.find(key) != m_variables.end();
+			return m_variables.find(key) != m_variables.end() || m_unregistered.find(key) != m_unregistered.end();
+		}
 		/// Returns value of variable defined by key.
 		/// For variables in sections you can use "section.variable" key format.
 		/// \param key config variable name
 		const boost::program_options::variable_value &operator[] (const std::string &key) {
 			return m_variables[key];
 			if (m_variables.find(key) != m_variables.end()) {
 				return m_variables[key];
+			}
 			return m_unregistered[key];
+		}
 		/// Returns path to config file from which data were loaded.
 		const std::string &getConfigFile() { return m_file; }
 		const std::map<std::string, std::string> &getUnregistered() {
 			return m_unregistered;
+		}
 		/// This signal is emitted when config is loaded/reloaded.
 		boost::signal<void ()> onConfigReloaded;
 	private:
 		int m_argc;
 		char **m_argv;
 		Variables m_variables;
-		std::map<std::string, std::string> m_unregistered;
+		std::map<std::string, boost::program_options::variable_value> m_unregistered;
 		std::string m_file;
 };
+}

src/config.cpp

➞

Show inline comments

 	if (!found_working) {
 		std::vector<std::string> value;
 		value.push_back("/var/lib/spectrum2/$jid");
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.working_dir", value));
+	}
 	if (!found_pidfile) {
 		std::vector<std::string> value;
 		value.push_back("/var/run/spectrum2/$jid.pid");
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.pidfile", value));
+	}
 	if (!found_backend_port) {
 		std::vector<std::string> value;
 		std::string p = boost::lexical_cast<std::string>(getRandomPort(_jid.empty() ? jid : _jid));
 		value.push_back(p);
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.backend_port", value));
+	}
 	if (!found_database) {
 		std::vector<std::string> value;
 		value.push_back("/var/lib/spectrum2/$jid/database.sql");
 		parsed.options.push_back(boost::program_options::basic_option<char>("database.database", value));
+	}
 	BOOST_FOREACH(option &opt, parsed.options) {
 		if (opt.unregistered) {
 			m_unregistered[opt.string_key] = opt.value[0];
+			m_unregistered[opt.string_key] = variable_value(opt.value[0], false);
+		}
 		else if (opt.value[0].find("$jid") != std::string::npos) {
 			boost::replace_all(opt.value[0], "$jid", jid);
+		}
+	}
 	store(parsed, m_variables);
 	notify(m_variables);
 	onConfigReloaded();
 	return true;
+}
 bool Config::load(std::istream &ifs) {
 	options_description opts("Transport options");
 	return load(ifs, opts);
+}
 bool Config::load(const std::string &configfile, const std::string &jid) {
 	try {
 		options_description opts("Transport options");
 		return load(configfile, opts, jid);
 	} catch ( const boost::program_options::multiple_occurrences& e ) {

0 comments (0 inline, 0 general)