Changeset - cb1e126ab60e
Parent rev.
Child rev.
[Not reviewed]
0 5 0
Jan Kaluza - 13 years ago 2012-08-29 15:03:21
hanzz.k@gmail.com
Fixed login when client answers with invalid disco#info. Web-interface tweaks
5 files changed with 88 insertions and 11 deletions:
spectrum_manager/src/main.cpp
1
1
spectrum_manager/src/methods.cpp
6
1
spectrum_manager/src/server.cpp
74
7
spectrum_manager/src/server.h
3
1
src/user.cpp
4
1
0 comments (0 inline, 0 general)
spectrum_manager/src/main.cpp
➞
Show inline comments
 
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
 
	}
 
	else if (command[0] == "server") {
 
		Server server(&config);
 
		server.start(8080, "test", "test");
 
		server.start(8080);
 
		while (1) { sleep(10); }
 
	}
 
	else {
spectrum_manager/src/methods.cpp
➞
Show inline comments
 
@@ -129,6 +129,7 @@ int isRunning(const std::string &pidfile) {
 
}
 

			




	
	
	
		
 
void start_instances(ManagerConfig *config, const std::string &_jid) {

			




	
	
	
		
 
	response = "";

			




	
	
	
		
 
	path p(CONFIG_STRING(config, "service.config_directory"));

			




	
	
	
		
 

			




	
	
	
		
 
	try {

			




	
	
		
 
@@ -195,6 +196,7 @@ void start_instances(ManagerConfig *config, const std::string &_jid) {

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void stop_instances(ManagerConfig *config, const std::string &_jid) {

			




	
	
	
		
 
	response = "";

			




	
	
	
		
 
	path p(CONFIG_STRING(config, "service.config_directory"));

			




	
	
	
		
 

			




	
	
	
		
 
	try {

			




	
	
		
 
@@ -361,6 +363,7 @@ static void handleDataRead(boost::shared_ptr<Swift::Connection> m_conn, boost::s

			




	
	
	
		
 
				continue;

			




	
	
	
		
 
			}

			




	
	
	
		
 
			m_conn->onDataRead.disconnect(boost::bind(&handleDataRead, m_conn, _1));

			




	
	
	
		
 
			m_conn->disconnect();

			




	
	
	
		
 
			response = payload.config();

			




	
	
	
		
 
			std::cout << payload.config() << "\n";

			




	
	
	
		
 
// 			exit(0);

			




	
	
		
 
@@ -396,6 +399,7 @@ static void handleConnected(boost::shared_ptr<Swift::Connection> m_conn, const s

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &networkFactories, const std::string &jid, const std::string &message) {

			




	
	
	
		
 
	response = "";

			




	
	
	
		
 
	path p(CONFIG_STRING(config, "service.config_directory"));

			




	
	
	
		
 

			




	
	
	
		
 
	try {

			




	
	
		
 
@@ -444,8 +448,9 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		if (!found) {

			




	
	
	
		
 
			response = "Config file for Spectrum instance with this JID was not found\n";

			




	
	
	
		
 
			std::cerr << "Config file for Spectrum instance with this JID was not found\n";

			




	
	
	
		
 
			exit(20);

			




	
	
	
		
 
// 			exit(20);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
	catch (const filesystem_error& ex) {

			




        

    


    
    

    

        

                

                    spectrum_manager/src/server.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -144,6 +144,8 @@ static void generate_session_id(char *buf, const char *random,

			




	
	
	
		
 
Server::Server(ManagerConfig *config) {

			




	
	
	
		
 
	srand((unsigned) time(0));

			




	
	
	
		
 
	m_config = config;

			




	
	
	
		
 
	m_user = CONFIG_STRING(m_config, "service.admin_username");

			




	
	
	
		
 
	m_password = CONFIG_STRING(m_config, "service.admin_password");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
Server::~Server() {

			




	
	
		
 
@@ -156,9 +158,7 @@ static void *_event_handler(enum mg_event event, struct mg_connection *conn) {

			




	
	
	
		
 
	return static_cast<Server *>(request_info->user_data)->event_handler(event, conn);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool Server::start(int port, const std::string &user, const std::string &password) {

			




	
	
	
		
 
	m_user = user;

			




	
	
	
		
 
	m_password = password;

			




	
	
	
		
 
bool Server::start(int port) {

			




	
	
	
		
 
	const char *options[] = {

			




	
	
	
		
 
		"listening_ports", boost::lexical_cast<std::string>(port).c_str(),

			




	
	
	
		
 
		"num_threads", "1",

			




	
	
		
 
@@ -306,13 +306,69 @@ void Server::serve_login(struct mg_connection *conn, const struct mg_request_inf

			




	
	
	
		
 
	print_html(conn, request_info, html);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Server::serve_onlineusers(struct mg_connection *conn, const struct mg_request_info *request_info) {

			




	
	
	
		
 
	std::string html = get_header();

			




	
	
	
		
 
	char jid[255];

			




	
	
	
		
 
	get_qsvar(request_info, "jid", jid, sizeof(jid));

			




	
	
	
		
 

			




	
	
	
		
 
	html += std::string("<h2>") + jid + " online users</h2><table><tr><th>JID<th>Command</th></tr>";

			




	
	
	
		
 

			




	
	
	
		
 
	Swift::SimpleEventLoop eventLoop;

			




	
	
	
		
 
	Swift::BoostNetworkFactories networkFactories(&eventLoop);

			




	
	
	
		
 

			




	
	
	
		
 
	ask_local_server(m_config, networkFactories, jid, "online_users");

			




	
	
	
		
 
	eventLoop.runUntilEvents();

			




	
	
	
		
 
	while(get_response().empty()) {

			




	
	
	
		
 
		eventLoop.runUntilEvents();

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	std::string response = get_response();

			




	
	
	
		
 
	std::vector<std::string> users;

			




	
	
	
		
 
	boost::split(users, response, boost::is_any_of("\n"));

			




	
	
	
		
 

			




	
	
	
		
 
	BOOST_FOREACH(std::string &user, users) {

			




	
	
	
		
 
		html += "<tr><td>" + user + "</td><td></td></tr>";

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	html += "</table><a href=\"/\">Back to main page</a>";

			




	
	
	
		
 
	html += "</body></html>";

			




	
	
	
		
 
	print_html(conn, request_info, html);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Server::serve_cmd(struct mg_connection *conn, const struct mg_request_info *request_info) {

			




	
	
	
		
 
	std::string html = get_header();

			




	
	
	
		
 
	char jid[255];

			




	
	
	
		
 
	get_qsvar(request_info, "jid", jid, sizeof(jid));

			




	
	
	
		
 
	char cmd[4096];

			




	
	
	
		
 
	get_qsvar(request_info, "cmd", cmd, sizeof(cmd));

			




	
	
	
		
 

			




	
	
	
		
 
	html += std::string("<h2>") + jid + " command result</h2>";

			




	
	
	
		
 

			




	
	
	
		
 
	Swift::SimpleEventLoop eventLoop;

			




	
	
	
		
 
	Swift::BoostNetworkFactories networkFactories(&eventLoop);

			




	
	
	
		
 

			




	
	
	
		
 
	ask_local_server(m_config, networkFactories, jid, cmd);

			




	
	
	
		
 
	while(get_response().empty()) {

			




	
	
	
		
 
		eventLoop.runUntilEvents();

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	std::string response = get_response();

			




	
	
	
		
 
	

			




	
	
	
		
 
	html += "<pre>" + response + "</pre>";

			




	
	
	
		
 

			




	
	
	
		
 
	html += "<a href=\"/\">Back to main page</a>";

			




	
	
	
		
 
	html += "</body></html>";

			




	
	
	
		
 
	print_html(conn, request_info, html);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void Server::serve_start(struct mg_connection *conn, const struct mg_request_info *request_info) {

			




	
	
	
		
 
	std::string html= get_header() ;

			




	
	
	
		
 
	char jid[255];

			




	
	
	
		
 
	get_qsvar(request_info, "jid", jid, sizeof(jid));

			




	
	
	
		
 

			




	
	
	
		
 
	start_instances(m_config, jid);

			




	
	
	
		
 
	html += "<b>" + get_response() + "</b>";

			




	
	
	
		
 
	html += "<b>" + get_response() + "</b><br/><a href=\"/\">Back to main page</a>";

			




	
	
	
		
 
	html += "</body></html>";

			




	
	
	
		
 
	print_html(conn, request_info, html);

			




	
	
	
		
 
}

			




	
	
		
 
@@ -323,18 +379,18 @@ void Server::serve_stop(struct mg_connection *conn, const struct mg_request_info

			




	
	
	
		
 
	get_qsvar(request_info, "jid", jid, sizeof(jid));

			




	
	
	
		
 

			




	
	
	
		
 
	stop_instances(m_config, jid);

			




	
	
	
		
 
	html += "<b>" + get_response() + "</b>";

			




	
	
	
		
 
	html += "<b>" + get_response() + "</b><br/><a href=\"/\">Back to main page</a>";

			




	
	
	
		
 
	html += "</body></html>";

			




	
	
	
		
 
	print_html(conn, request_info, html);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void Server::serve_root(struct mg_connection *conn, const struct mg_request_info *request_info) {

			




	
	
	
		
 
	std::vector<std::string> list = show_list(m_config, false);

			




	
	
	
		
 
	std::string html= get_header() + "<h2>List of instances</h2><table><tr><th>JID<th>Status</th><th>Command</th></tr>";

			




	
	
	
		
 
	std::string html= get_header() + "<h2>List of instances</h2><table><tr><th>JID<th>Status</th><th>Command</th><th>Run command</th></tr>";

			




	
	
	
		
 

			




	
	
	
		
 
	BOOST_FOREACH(std::string &instance, list) {

			




	
	
	
		
 
		html += "<tr>";

			




	
	
	
		
 
		html += "<td>" + instance + "</td>";

			




	
	
	
		
 
		html += "<td><a href=\"/onlineusers?jid=" + instance + "\">" + instance + "</a></td>";

			




	
	
	
		
 
		Swift::SimpleEventLoop eventLoop;

			




	
	
	
		
 
		Swift::BoostNetworkFactories networkFactories(&eventLoop);

			




	
	
	
		
 

			




	
	
		
 
@@ -346,10 +402,17 @@ void Server::serve_root(struct mg_connection *conn, const struct mg_request_info

			




	
	
	
		
 
		html += "<td>" + get_response() + "</td>";

			




	
	
	
		
 
		if (get_response().find("Running") == 0) {

			




	
	
	
		
 
			html += "<td><a href=\"/stop?jid=" + instance + "\">Stop</a></td>";

			




	
	
	
		
 
			html += "<td><form action=\"/cmd\">";

			




	
	
	
		
 
			html += "<input type=\"hidden\" name=\"jid\" value=\"" + instance + "\"></input>";

			




	
	
	
		
 
			html += "<input type=\"text\" name=\"cmd\"></input>";

			




	
	
	
		
 
			html += "<input type=\"submit\" value=\"Run\"></input>";

			




	
	
	
		
 
			html += "</form></td>";

			




	
	
	
		
 
		}

			




	
	
	
		
 
		else {

			




	
	
	
		
 
			html += "<td><a href=\"/start?jid=" + instance + "\">Start</a></td>";

			




	
	
	
		
 
			html += "<td></td>";

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		html += "</tr>";

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
		
 
@@ -370,6 +433,10 @@ void *Server::event_handler(enum mg_event event, struct mg_connection *conn) {

			




	
	
	
		
 
			serve_login(conn, request_info);

			




	
	
	
		
 
		} else if (strcmp(request_info->uri, "/") == 0) {

			




	
	
	
		
 
			serve_root(conn, request_info);

			




	
	
	
		
 
		} else if (strcmp(request_info->uri, "/onlineusers") == 0) {

			




	
	
	
		
 
			serve_onlineusers(conn, request_info);

			




	
	
	
		
 
		} else if (strcmp(request_info->uri, "/cmd") == 0) {

			




	
	
	
		
 
			serve_cmd(conn, request_info);

			




	
	
	
		
 
		} else if (strcmp(request_info->uri, "/start") == 0) {

			




	
	
	
		
 
			serve_start(conn, request_info);

			




	
	
	
		
 
		} else if (strcmp(request_info->uri, "/stop") == 0) {

			




        

    


    
    

    

        

                

                    spectrum_manager/src/server.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -46,7 +46,7 @@ class Server {

			




	
	
	
		
 
		/// Destructor

			




	
	
	
		
 
		virtual ~Server();

			




	
	
	
		
 

			




	
	
	
		
 
		bool start(int port, const std::string &user, const std::string &password);

			




	
	
	
		
 
		bool start(int port);

			




	
	
	
		
 

			




	
	
	
		
 
		void *event_handler(enum mg_event event, struct mg_connection *conn);

			




	
	
	
		
 

			




	
	
		
 
@@ -55,6 +55,8 @@ class Server {

			




	
	
	
		
 
		void serve_root(struct mg_connection *conn, const struct mg_request_info *request_info);

			




	
	
	
		
 
		void serve_start(struct mg_connection *conn, const struct mg_request_info *request_info);

			




	
	
	
		
 
		void serve_stop(struct mg_connection *conn, const struct mg_request_info *request_info);

			




	
	
	
		
 
		void serve_onlineusers(struct mg_connection *conn, const struct mg_request_info *request_info);

			




	
	
	
		
 
		void serve_cmd(struct mg_connection *conn, const struct mg_request_info *request_info);

			




	
	
	
		
 
		void print_html(struct mg_connection *conn, const struct mg_request_info *request_info, const std::string &html);

			




	
	
	
		
 

			




	
	
	
		
 
	private:

			




        

    


    
    

    

        

                

                    src/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -58,7 +58,7 @@ User::User(const Swift::JID &jid, UserInfo &userInfo, Component *component, User

			




	
	
	
		
 
	m_resources = 0;

			




	
	
	
		
 
	m_reconnectCounter = 0;

			




	
	
	
		
 

			




	
	
	
		
 
	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(10000);

			




	
	
	
		
 
	m_reconnectTimer = m_component->getNetworkFactories()->getTimerFactory()->createTimer(5000);

			




	
	
	
		
 
	m_reconnectTimer->onTick.connect(boost::bind(&User::onConnectingTimeout, this)); 

			




	
	
	
		
 

			




	
	
	
		
 
	m_rosterManager = new RosterManager(this, m_component);

			




	
	
		
 
@@ -199,6 +199,9 @@ void User::handlePresence(Swift::Presence::ref presence) {

			




	
	
	
		
 
					m_readyForConnect = true;

			




	
	
	
		
 
					onReadyToConnect();

			




	
	
	
		
 
				}

			




	
	
	
		
 
				else {

			




	
	
	
		
 
					m_reconnectTimer->start();

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else if (m_component->inServerMode()) {

			




	
	
	
		
 
				LOG4CXX_INFO(logger, m_jid.toString() << ": Ready to be connected to legacy network");

			




        

    



    


    



    



      

      





    
    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