libtransport.git Changeset - 4c334e9f1c0b

Changeset - 4c334e9f1c0b

Parent rev.

Child rev.

[Not reviewed]

0 7 0

HanzZ - 14 years ago 2011-12-09 13:51:50
hanzz.k@gmail.com

Move random port generating to util.cpp

7 files changed with 24 insertions and 18 deletions:

include/transport/util.h

spectrum/src/sample2.cfg

spectrum_manager/src/CMakeLists.txt

src/config.cpp

src/presenceoracle.cpp

src/transport.cpp

src/util.cpp

0 comments (0 inline, 0 general)

include/transport/util.h

➞

Show inline comments

@@ @@ -31,15 +31,17 @@ namespace Transport { @@
 namespace Util {
 void removeEverythingOlderThan(const std::vector<std::string> &dirs, time_t t);
 std::string encryptPassword(const std::string &password, const std::string &key);
 std::string decryptPassword(std::string &encrypted, const std::string &key);
 std::string serializeGroups(const std::vector<std::string> &groups);
 std::vector<std::string> deserializeGroups(std::string &groups);
 int getRandomPort(const std::string &s);
+}
+}

spectrum/src/sample2.cfg

➞

Show inline comments

@@ @@ -15,25 +15,27 @@ password = secret @@
 # XMPP server to which Spectrum connects in gateway mode.
 # In server mode, this option is ignored.
 server = 127.0.0.1
 # XMPP server port.
 port = 5222
 # Interface on which Spectrum listens for backends.
 backend_host = localhost
 # Port on which Spectrum listens for backends.
 backend_port=10001
 # By default Spectrum chooses random backend port and there's
 # no need to change it normally
 #backend_port=10001
 # Full path to PKCS#12 cetficiate used for TLS in server mode.
 #cert=
 # Certificate password if any.
 #cert_password=
 # Number of users per one legacy network backend.
 users_per_backend=10
 # Full path to backend binary.
 backend=/usr/bin/spectrum2_libpurple_backend

spectrum_manager/src/CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../src/config.cpp)
+ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../src/config.cpp ../../src/util.cpp)
 target_link_libraries(spectrum2_manager ${SWIFTEN_LIBRARY})
 INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
 INSTALL(FILES
 	spectrum_manager.cfg
 	DESTINATION /etc/spectrum2
+	)

src/config.cpp

➞

Show inline comments

@@ @@ -10,24 +10,25 @@ @@
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/config.h"
 #include "transport/util.h"
 #include <fstream>
 #ifdef _MSC_VER
 #include <direct.h>
 #define getcwd _getcwd
 #include <windows.h>
 #define PATH_MAX MAX_PATH
 #endif
 using namespace boost::program_options;
 namespace Transport {
 		if (opt.string_key == "service.jid") {
 			if (_jid.empty()) {
 				jid = opt.value[0];
+			}
 			else {
 				opt.value[0] = _jid;
 				jid = _jid;
+			}
+		}
 		else if (opt.string_key == "service.backend_port") {
 			found_backend_port = true;
 			if (opt.value[0] == "0") {
 				unsigned long r = 0;
 				BOOST_FOREACH(char c, _jid) {
 					r += (int) c;
+				}
 				srand(time(NULL) + r);
 				int randomPort = 30000 + rand() % 10000;
 				opt.value[0] = boost::lexical_cast<std::string>(randomPort);
 				opt.value[0] = boost::lexical_cast<std::string>(Util::getRandomPort(_jid.empty() ? jid : _jid));
+			}
+		}
 		else if (opt.string_key == "service.working_dir") {
 			found_working = true;
+		}
 		else if (opt.string_key == "service.pidfile") {
 			found_pidfile = true;
+		}
+	}
 	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) {
 		unsigned long r = 0;
 		BOOST_FOREACH(char c, _jid) {
 			r += (int) c;
+		}
 		srand(time(NULL) + r);
 		int randomPort = 30000 + rand() % 10000;
 		std::vector<std::string> value;
 		value.push_back(boost::lexical_cast<std::string>(randomPort));
 		std::string p = boost::lexical_cast<std::string>(Util::getRandomPort(_jid.empty() ? jid : _jid));
 		value.push_back(p);
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.backend_port", value));
+	}
 	BOOST_FOREACH(option &opt, parsed.options) {
 		if (opt.unregistered) {
 			m_unregistered[opt.string_key] = opt.value[0];
+		}
 		else if (opt.value[0].find("$jid") != std::string::npos) {
 			boost::replace_all(opt.value[0], "$jid", jid);
+		}
+	}

src/presenceoracle.cpp

➞

Show inline comments

@@ @@ -10,24 +10,25 @@ @@
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/presenceoracle.h"
 #include "Swiften/Swiften.h"
 #include <boost/bind.hpp>
 using namespace Swift;
 namespace Transport {
 PresenceOracle::PresenceOracle(StanzaChannel* stanzaChannel) {
 	stanzaChannel_ = stanzaChannel;
 	stanzaChannel_->onPresenceReceived.connect(boost::bind(&PresenceOracle::handleIncomingPresence, this, _1));
 	stanzaChannel_->onAvailableChanged.connect(boost::bind(&PresenceOracle::handleStanzaChannelAvailableChanged, this, _1));
+}
@@ @@ -37,27 +38,28 @@ PresenceOracle::~PresenceOracle() { @@
 	stanzaChannel_->onAvailableChanged.disconnect(boost::bind(&PresenceOracle::handleStanzaChannelAvailableChanged, this, _1));
+}
 void PresenceOracle::handleStanzaChannelAvailableChanged(bool available) {
 	if (available) {
 		entries_.clear();
+	}
+}
 void PresenceOracle::handleIncomingPresence(Presence::ref presence) {
 	// ignore presences for some contact, we're checking only presences for the transport itself here.
 	if (!presence->getTo().getNode().empty()) {
 	bool isMUC = presence->getPayload<MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
 	// filter out login/logout presence spam
 	if (!presence->getTo().getNode().empty() && isMUC == false)
 		return;
+	}
 	JID bareJID(presence->getFrom().toBare());
 	if (presence->getType() == Presence::Subscribe) {
+	}
 	else {
 		Presence::ref passedPresence = presence;
 		if (presence->getType() == Presence::Unsubscribe) {
 			/* 3921bis says that we don't follow up with an unavailable, so simulate this ourselves */
 			passedPresence = Presence::ref(new Presence());
 			passedPresence->setType(Presence::Unavailable);
 			passedPresence->setFrom(bareJID);
 			passedPresence->setStatus(presence->getStatus());

src/transport.cpp

➞

Show inline comments

@@ @@ -36,24 +36,25 @@ @@
 #include "Swiften/Serializer/PayloadSerializers/XHTMLIMSerializer.h"
 #include "Swiften/Parser/PayloadParsers/StatsParser.h"
 #include "Swiften/Serializer/PayloadSerializers/StatsSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SpectrumErrorSerializer.h"
 #include "transport/BlockParser.h"
 #include "transport/BlockSerializer.h"
 #include "Swiften/Parser/PayloadParsers/InvisibleParser.h"
 #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h"
 #include "log4cxx/logger.h"
 #include "log4cxx/consoleappender.h"
 #include "log4cxx/patternlayout.h"
 #include "log4cxx/propertyconfigurator.h"
 #include "Swiften/Swiften.h"
 using namespace Swift;
 using namespace boost;
 using namespace log4cxx;
 namespace Transport {
 static LoggerPtr logger = Logger::getLogger("Component");
 static LoggerPtr logger_xml = Logger::getLogger("Component.XML");
 Component::Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories, Config *config, Factory *factory, Transport::UserRegistry *userRegistry) {
 	m_component = NULL;

src/util.cpp

➞

Show inline comments

 	std::vector<std::string> ret;
 	if (groups.empty()) {
 		return ret;
+	}
 	boost::split(ret, groups, boost::is_any_of("\n"));
 	if (ret.back().empty()) {
 		ret.erase(ret.end() - 1);
+	}
 	return ret;
+}
 int getRandomPort(const std::string &s) {
 	unsigned long r = 0;
 	BOOST_FOREACH(char c, s) {
 		r += (int) c;
+	}
 	srand(time(NULL) + r);
 	return 30000 + rand() % 10000;
+}
+}
+}

0 comments (0 inline, 0 general)