Changeset - 7146bdc36283
Parent rev.
Child rev.
[Not reviewed]
0 2 0
HanzZ - 14 years ago 2011-07-26 21:19:21
hanzz.k@gmail.com
support for protocol=any and prefix in JID
2 files changed with 14 insertions and 7 deletions:
backends/libpurple/main.cpp
13
6
spectrum/src/sample.cfg
1
1
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -161,37 +161,45 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 
		SpectrumEventLoop *m_loop;
 
		SpectrumNetworkPlugin(Config *config, SpectrumEventLoop *loop, const std::string &host, int port) : NetworkPlugin(loop, host, port) {
 
			this->config = config;
 
			m_loop = loop;
 
		}
 

			




	
	
	
		
 
		void handleExit() {

			




	
	
	
		
 
			m_loop->stop();

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {

			




	
	
	
		
 
			PurpleAccount *account = NULL;

			




	
	
	
		
 
			const char *protocol = CONFIG_STRING(config, "service.protocol").c_str();

			




	
	
	
		
 
			if (purple_accounts_find(legacyName.c_str(), protocol) != NULL){

			




	
	
	
		
 
			

			




	
	
	
		
 
			std::string name = legacyName;

			




	
	
	
		
 
			std::string protocol = CONFIG_STRING(config, "service.protocol");

			




	
	
	
		
 
			if (CONFIG_STRING(config, "service.protocol") == "any") {

			




	
	
	
		
 
				protocol = name.substr(0, name.find("."));

			




	
	
	
		
 
				name = name.substr(name.find(".") + 1);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			LOG4CXX_INFO(logger,  "Creating account with name '" << name.c_str() << "' and protocol '" << protocol << "'");

			




	
	
	
		
 
			if (purple_accounts_find(name.c_str(), protocol.c_str()) != NULL){

			




	
	
	
		
 
// 				Log(user, "this account already exists");

			




	
	
	
		
 
				account = purple_accounts_find(legacyName.c_str(), protocol);

			




	
	
	
		
 
				account = purple_accounts_find(name.c_str(), protocol.c_str());

			




	
	
	
		
 
// 				User *u = (User *) account->ui_data;

			




	
	
	
		
 
// 				if (u && u != user) {

			




	
	
	
		
 
// 					Log(userInfo.jid, "This account is already connected by another jid " << user->getJID());

			




	
	
	
		
 
// 					return;

			




	
	
	
		
 
// 				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else {

			




	
	
	
		
 
// 				Log(user, "creating new account");

			




	
	
	
		
 
				account = purple_account_new(legacyName.c_str(), protocol);

			




	
	
	
		
 
				account = purple_account_new(name.c_str(), protocol.c_str());

			




	
	
	
		
 

			




	
	
	
		
 
				purple_accounts_add(account);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			m_sessions[user] = account;

			




	
	
	
		
 

			




	
	
	
		
 
			// Default avatar

			




	
	
	
		
 
			char* contents;

			




	
	
	
		
 
			gsize length;

			




	
	
	
		
 
			gboolean ret = false;

			




	
	
	
		
 
			if (!CONFIG_STRING(config, "backend.avatars_directory").empty()) {

			




	
	
	
		
 
				std::string f = CONFIG_STRING(config, "backend.avatars_directory") + "/" + legacyName;

			




	
	
		
 
@@ -209,26 +217,25 @@ class SpectrumNetworkPlugin : public NetworkPlugin {

			




	
	
	
		
 

			




	
	
	
		
 
			purple_account_set_password(account, password.c_str());

			




	
	
	
		
 
			purple_account_set_enabled(account, "spectrum", TRUE);

			




	
	
	
		
 
			

			




	
	
	
		
 
			const PurpleStatusType *status_type = purple_account_get_status_type_with_primitive(account, PURPLE_STATUS_AVAILABLE);

			




	
	
	
		
 
			if (status_type != NULL) {

			




	
	
	
		
 
				purple_account_set_status(account, purple_status_type_get_id(status_type), TRUE, NULL);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			m_accounts[account] = user;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {

			




	
	
	
		
 
			const char *protocol = CONFIG_STRING(config, "service.protocol").c_str();

			




	
	
	
		
 
			PurpleAccount *account = purple_accounts_find(legacyName.c_str(), protocol);

			




	
	
	
		
 
			PurpleAccount *account = m_sessions[user];

			




	
	
	
		
 
			if (account) {

			




	
	
	
		
 
// 				VALGRIND_DO_LEAK_CHECK;

			




	
	
	
		
 
				m_sessions[user] = NULL;

			




	
	
	
		
 
				purple_account_set_enabled(account, "spectrum", FALSE);

			




	
	
	
		
 

			




	
	
	
		
 
				// Remove conversations.

			




	
	
	
		
 
				// This has to be called before m_account->ui_data = NULL;, because it uses

			




	
	
	
		
 
				// ui_data to call SpectrumMessageHandler::purpleConversationDestroyed() callback.

			




	
	
	
		
 
				GList *iter;

			




	
	
	
		
 
				for (iter = purple_get_conversations(); iter; ) {

			




	
	
	
		
 
					PurpleConversation *conv = (PurpleConversation*) iter->data;

			




	
	
	
		
 
					iter = iter->next;

			




        

    


    
    

    

        

                

                    spectrum/src/sample.cfg
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,25 +5,25 @@ server = 127.0.0.1

			




	
	
	
		
 
port = 5222

			




	
	
	
		
 
server_mode = 1

			




	
	
	
		
 
backend_host=localhost # < this option doesn't work yet

			




	
	
	
		
 
backend_port=10001

			




	
	
	
		
 
admin_username=admin

			




	
	
	
		
 
admin_password=test

			




	
	
	
		
 
#cert= #patch to PKCS#12 certificate

			




	
	
	
		
 
#cert_password= #password to that certificate if any

			




	
	
	
		
 
users_per_backend=10

			




	
	
	
		
 
backend=../../backends/libpurple/spectrum_libpurple_backend

			




	
	
	
		
 
#backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend

			




	
	
	
		
 
#protocol=prpl-jabber

			




	
	
	
		
 
protocol=prpl-msn

			




	
	
	
		
 
protocol=any

			




	
	
	
		
 
#protocol=prpl-icq

			




	
	
	
		
 

			




	
	
	
		
 
[backend]

			




	
	
	
		
 
default_avatar=catmelonhead.jpg

			




	
	
	
		
 

			




	
	
	
		
 
[logging]

			




	
	
	
		
 
#config=logging.cfg # log4cxx/log4j logging configuration file

			




	
	
	
		
 
#backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends

			




	
	
	
		
 

			




	
	
	
		
 
[database]

			




	
	
	
		
 
type = none # or "none" without database backend

			




	
	
	
		
 
database = test.sql

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-3934
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support