Changeset - 2b834d16abc8
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Sarang Bharadwaj - 13 years ago 2012-04-12 20:37:52
sarang.bh@gmail.com
Added code to handle errors during Server creation
2 files changed with 18 insertions and 0 deletions:
include/transport/transport.h
2
src/transport.cpp
16
0 comments (0 inline, 0 general)
include/transport/transport.h
➞
Show inline comments
 
@@ -34,12 +34,13 @@
 
#include "Swiften/Jingle/JingleSessionManager.h"
 

			




	
	
	
		
 
#include <boost/bind.hpp>

			




	
	
	
		
 
#include "transport/config.h"

			




	
	
	
		
 
#include "transport/factory.h"

			




	
	
	
		
 
#include "transport/presenceoracle.h"

			




	
	
	
		
 
#include <Swiften/Network/BoostConnectionServer.h>

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 
	// typedef enum { 	CLIENT_FEATURE_ROSTERX = 2,

			




	
	
	
		
 
	// 				CLIENT_FEATURE_XHTML_IM = 4,

			




	
	
	
		
 
	// 				CLIENT_FEATURE_FILETRANSFER = 8,

			




	
	
	
		
 
	// 				CLIENT_FEATURE_CHATSTATES = 16

			




	
	
		
 
@@ -162,12 +163,13 @@ namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
// 			boost::signal<void (boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid)> onDiscoInfoResponse;

			




	
	
	
		
 

			




	
	
	
		
 
		private:

			




	
	
	
		
 
			void handleConnected();

			




	
	
	
		
 
			void handleConnectionError(const Swift::ComponentError &error);

			




	
	
	
		
 
			void handleServerStopped(boost::optional<Swift::BoostConnectionServer::Error> e);

			




	
	
	
		
 
			void handlePresence(Swift::Presence::ref presence);

			




	
	
	
		
 
			void handleDataRead(const Swift::SafeByteArray &data);

			




	
	
	
		
 
			void handleDataWritten(const Swift::SafeByteArray &data);

			




	
	
	
		
 

			




	
	
	
		
 
			void handleDiscoInfoResponse(boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid);

			




	
	
	
		
 
			void handleCapsChanged(const Swift::JID& jid);

			




        

    


    
    

    

        

                

                    src/transport.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -200,12 +200,17 @@ void Component::start() {

			




	
	
	
		
 
		m_component->connect(CONFIG_STRING(m_config, "service.server"), CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_reconnectTimer->stop();

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (m_server) {

			




	
	
	
		
 
		LOG4CXX_INFO(logger, "Starting component in server mode on port " << CONFIG_INT(m_config, "service.port"));

			




	
	
	
		
 
		m_server->start();

			




	
	
	
		
 

			




	
	
	
		
 
		//Type casting to BoostConnectionServer since onStopped signal is not defined in ConnectionServer

			




	
	
	
		
 
		//Ideally, onStopped must be defined in ConnectionServer

			




	
	
	
		
 
		boost::dynamic_pointer_cast<Swift::BoostConnectionServer>(m_server->getConnectionServer())->onStopped.connect(boost::bind(&Component::handleServerStopped, this, _1));

			




	
	
	
		
 
		

			




	
	
	
		
 
		// We're connected right here, because we're in server mode...

			




	
	
	
		
 
		handleConnected();

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::stop() {

			




	
	
		
 
@@ -223,12 +228,23 @@ void Component::stop() {

			




	
	
	
		
 

			




	
	
	
		
 
void Component::handleConnected() {

			




	
	
	
		
 
	onConnected();

			




	
	
	
		
 
	m_reconnectCount = 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Component::handleServerStopped(boost::optional<Swift::BoostConnectionServer::Error> e) {

			




	
	
	
		
 
	if(e != NULL ) {

			




	
	
	
		
 
		if(*e == Swift::BoostConnectionServer::Conflict)

			




	
	
	
		
 
			LOG4CXX_INFO(logger, "Port "<< CONFIG_INT(m_config, "service.port") << " already in use! Stopping server..");

			




	
	
	
		
 
		if(*e == Swift::BoostConnectionServer::UnknownError)

			




	
	
	
		
 
			LOG4CXX_INFO(logger, "Unknown error occured! Stopping server..");

			




	
	
	
		
 
		exit(1);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void Component::handleConnectionError(const ComponentError &error) {

			




	
	
	
		
 
	onConnectionError(error);

			




	
	
	
		
 
// 	if (m_reconnectCount == 2)

			




	
	
	
		
 
// 		Component::instance()->userManager()->removeAllUsers();

			




	
	
	
		
 
	std::string str = "Unknown error";

			




	
	
	
		
 
	switch (error.getType()) {

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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