libtransport.git Changeset - 9338b6103a9a

Changeset - 9338b6103a9a

Parent rev.

Child rev.

[Not reviewed]

Merge

0 6 0

Jan Kaluza - 13 years ago 2012-03-21 08:48:56
hanzz.k@gmail.com

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

5 files changed with 27 insertions and 1 deletions:

backends/libpurple/main.cpp

plugin/cpp/networkplugin.cpp

spectrum/src/sample.cfg

src/logging.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -21,12 +21,19 @@ @@
 #include "errno.h"
 #ifdef WITH_LIBEVENT
 #include <event.h>
 #endif
 #ifdef WIN32
 #include "win32/win32dep.h"
 #define ssize_t SSIZE_T
 #include <process.h>
 #define getpid _getpid
 #endif
 using namespace log4cxx;
 static LoggerPtr logger_libpurple = log4cxx::Logger::getLogger("libpurple");
 static LoggerPtr logger = log4cxx::Logger::getLogger("backend");
 int main_socket;
 static int writeInput;

plugin/cpp/networkplugin.cpp

➞

Show inline comments

@@ @@ -25,12 +25,14 @@ @@
 #ifndef WIN32
 #include <arpa/inet.h>
 #else
 #include <winsock2.h>
 #include <stdint.h>
 #include <process.h>
 #define getpid _getpid
 #endif
 using namespace log4cxx;
 static LoggerPtr logger = Logger::getLogger("NetworkPlugin");

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ server = 127.0.0.1 @@
 port = 5222
 server_mode = 1
 backend_host=localhost
 pidfile=./test.pid
 # < this option doesn't work yet
 #backend_port=10001
-admin_username=admin
+admin_jid=admin@localhost
 admin_password=test
 #cert=server.pfx #patch to PKCS#12 certificate
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 backend=../..//backends/libpurple/spectrum2_libpurple_backend
 protocol=prpl-xmpp

src/logging.cpp

➞

Show inline comments

@@ @@ -40,12 +40,14 @@ @@
 #include <pwd.h>
 #include <grp.h>
 #include <sys/resource.h>
 #include "libgen.h"
 #else
 #include <windows.h>
 #include <process.h>
 #define getpid _getpid
 #endif
 using namespace boost::filesystem;
 using namespace log4cxx;
 namespace Transport {

src/usermanager.cpp

➞

Show inline comments

 	User *user = getUser(userkey);
 	// Create user class if it's not there
 	if (!user) {
 		// Admin user is not legacy network user, so do not create User class instance for him
 		if (m_component->inServerMode() && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 			// Send admin contact to the user.
 			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 			Swift::RosterItemPayload item;
 			item.setJID(m_component->getJID());
 			item.setName("Admin");
 			item.setSubscription(Swift::RosterItemPayload::Both);
 			payload->addItem(item);
 			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
 			request->send();
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(presence->getFrom());
 			response->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendPresence(response);
 			return;
+		}
 		// No user and unavailable presence -> answer with unavailable
 		if (presence->getType() == Swift::Presence::Unavailable) {
 			Swift::Presence::ref response = Swift::Presence::create();

0 comments (0 inline, 0 general)