Changeset - 347ed2861846
Parent rev.
Child rev.
[Not reviewed]
0 2 0
HanzZ - 14 years ago 2011-10-28 08:55:47
hanzz.k@gmail.com
Working variable
2 files changed with 31 insertions and 2 deletions:
backends/libpurple/main.cpp
19
src/config.cpp
12
2
0 comments (0 inline, 0 general)
backends/libpurple/main.cpp
➞
Show inline comments
 
@@ -48,62 +48,81 @@ int m_sock;
 
static int writeInput;
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
template <class T> T fromString(const std::string &str) {

			




	
	
	
		
 
	T i;

			




	
	
	
		
 
	std::istringstream os(str);

			




	
	
	
		
 
	os >> i;

			




	
	
	
		
 
	return i;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
template <class T> std::string stringOf(T object) {

			




	
	
	
		
 
	std::ostringstream os;

			




	
	
	
		
 
	os << object;

			




	
	
	
		
 
	return (os.str());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static void transportDataReceived(gpointer data, gint source, PurpleInputCondition cond);

			




	
	
	
		
 

			




	
	
	
		
 
class SpectrumNetworkPlugin;

			




	
	
	
		
 

			




	
	
	
		
 
GKeyFile *keyfile;

			




	
	
	
		
 
SpectrumNetworkPlugin *np;

			




	
	
	
		
 

			




	
	
	
		
 
std::string replaceAll(

			




	
	
	
		
 
  std::string result,

			




	
	
	
		
 
  const std::string& replaceWhat,

			




	
	
	
		
 
  const std::string& replaceWithWhat)

			




	
	
	
		
 
{

			




	
	
	
		
 
  while(1)

			




	
	
	
		
 
  {

			




	
	
	
		
 
	const int pos = result.find(replaceWhat);

			




	
	
	
		
 
	if (pos==-1) break;

			




	
	
	
		
 
	result.replace(pos,replaceWhat.size(),replaceWithWhat);

			




	
	
	
		
 
  }

			




	
	
	
		
 
  return result;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static std::string KEYFILE_STRING(const std::string &cat, const std::string &key, const std::string &def = "") {

			




	
	
	
		
 
	gchar *str = g_key_file_get_string(keyfile, cat.c_str(), key.c_str(), 0);

			




	
	
	
		
 
	if (!str) {

			




	
	
	
		
 
		return def;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	std::string ret(str);

			




	
	
	
		
 
	free(str);

			




	
	
	
		
 

			




	
	
	
		
 
	if (ret.find("#") != std::string::npos) {

			




	
	
	
		
 
		ret = ret.substr(0, ret.find("#"));

			




	
	
	
		
 
		while(*(ret.end() - 1) == ' ') {

			




	
	
	
		
 
			ret.erase(ret.end() - 1);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (ret.find("$jid") != std::string::npos) {

			




	
	
	
		
 
		std::string jid = KEYFILE_STRING("service", "jid");

			




	
	
	
		
 
		ret = replaceAll(ret, "$jid", jid);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	return ret;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#define KEYFILE_BOOL(CAT, KEY) g_key_file_get_boolean(keyfile, CAT, KEY, 0)

			




	
	
	
		
 

			




	
	
	
		
 
static gboolean nodaemon = FALSE;

			




	
	
	
		
 
static gchar *logfile = NULL;

			




	
	
	
		
 
static gchar *lock_file = NULL;

			




	
	
	
		
 
static gchar *host = NULL;

			




	
	
	
		
 
static int port = 10000;

			




	
	
	
		
 
static gboolean ver = FALSE;

			




	
	
	
		
 
static gboolean list_purple_settings = FALSE;

			




	
	
	
		
 

			




	
	
	
		
 
struct FTData {

			




	
	
	
		
 
	unsigned long id;

			




	
	
	
		
 
	unsigned long timer;

			




	
	
	
		
 
	bool paused;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static GOptionEntry options_entries[] = {

			




	
	
	
		
 
	{ "nodaemon", 'n', 0, G_OPTION_ARG_NONE, &nodaemon, "Disable background daemon mode", NULL },

			




	
	
	
		
 
	{ "logfile", 'l', 0, G_OPTION_ARG_STRING, &logfile, "Set file to log", NULL },

			




	
	
	
		
 
	{ "pidfile", 'p', 0, G_OPTION_ARG_STRING, &lock_file, "File where to write transport PID", NULL },

			




	
	
	
		
 
	{ "version", 'v', 0, G_OPTION_ARG_NONE, &ver, "Shows Spectrum version", NULL },

			




        

    


    
    

    

        

                

                    src/config.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -39,93 +39,103 @@ bool Config::load(const std::string &configfile, boost::program_options::options

			




	
	
	
		
 
	m_file = configfile;

			




	
	
	
		
 
	bool ret = load(ifs, opts);

			




	
	
	
		
 
	ifs.close();

			




	
	
	
		
 

			




	
	
	
		
 
	char path[PATH_MAX] = "";

			




	
	
	
		
 
	if (m_file.find_first_of("/") != 0) {

			




	
	
	
		
 
		getcwd(path, PATH_MAX);

			




	
	
	
		
 
		m_file = std::string(path) + "/" + m_file;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return ret;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool Config::load(std::istream &ifs, boost::program_options::options_description &opts) {

			




	
	
	
		
 
	m_unregistered.clear();

			




	
	
	
		
 
	opts.add_options()

			




	
	
	
		
 
		("service.jid", value<std::string>()->default_value(""), "Transport Jabber ID")

			




	
	
	
		
 
		("service.server", value<std::string>()->default_value(""), "Server to connect to")

			




	
	
	
		
 
		("service.password", value<std::string>()->default_value(""), "Password used to auth the server")

			




	
	
	
		
 
		("service.port", value<int>()->default_value(0), "Port the server is listening on")

			




	
	
	
		
 
		("service.user", value<std::string>()->default_value(""), "The name of user Spectrum runs as.")

			




	
	
	
		
 
		("service.group", value<std::string>()->default_value(""), "The name of group Spectrum runs as.")

			




	
	
	
		
 
		("service.backend", value<std::string>()->default_value("libpurple_backend"), "Backend")

			




	
	
	
		
 
		("service.protocol", value<std::string>()->default_value(""), "Protocol")

			




	
	
	
		
 
		("service.pidfile", value<std::string>()->default_value("/var/run/spectrum2/spectrum2.pid"), "Full path to pid file")

			




	
	
	
		
 
		("service.working_dir", value<std::string>()->default_value("/var/lib/spectrum2"), "Working dir")

			




	
	
	
		
 
		("service.pidfile", value<std::string>()->default_value("/var/run/spectrum2/$jid.pid"), "Full path to pid file")

			




	
	
	
		
 
		("service.working_dir", value<std::string>()->default_value("/var/lib/spectrum2/$jid"), "Working dir")

			




	
	
	
		
 
		("service.allowed_servers", value<std::string>()->default_value(""), "Only users from these servers can connect")

			




	
	
	
		
 
		("service.server_mode", value<bool>()->default_value(false), "True if Spectrum should behave as server")

			




	
	
	
		
 
		("service.users_per_backend", value<int>()->default_value(100), "Number of users per one legacy network backend")

			




	
	
	
		
 
		("service.backend_host", value<std::string>()->default_value("localhost"), "Host to bind backend server to")

			




	
	
	
		
 
		("service.backend_port", value<std::string>()->default_value("10000"), "Port to bind backend server to")

			




	
	
	
		
 
		("service.cert", value<std::string>()->default_value(""), "PKCS#12 Certificate.")

			




	
	
	
		
 
		("service.cert_password", value<std::string>()->default_value(""), "PKCS#12 Certificate password.")

			




	
	
	
		
 
		("service.admin_jid", value<std::string>()->default_value(""), "Administrator jid.")

			




	
	
	
		
 
		("service.admin_password", value<std::string>()->default_value(""), "Administrator password.")

			




	
	
	
		
 
		("service.reuse_old_backends", value<bool>()->default_value(true), "True if Spectrum should use old backends which were full in the past.")

			




	
	
	
		
 
		("service.idle_reconnect_time", value<int>()->default_value(0), "Time in seconds after which idle users are reconnected to let their backend die.")

			




	
	
	
		
 
		("service.memory_collector_time", value<int>()->default_value(0), "Time in seconds after which backend with most memory is set to die.")

			




	
	
	
		
 
		("service.more_resources", value<bool>()->default_value(false), "Allow more resources to be connected in server mode at the same time.")

			




	
	
	
		
 
		("service.enable_privacy_lists", value<bool>()->default_value(true), "")

			




	
	
	
		
 
		("identity.name", value<std::string>()->default_value("Spectrum 2 Transport"), "Name showed in service discovery.")

			




	
	
	
		
 
		("identity.category", value<std::string>()->default_value("gateway"), "Disco#info identity category. 'gateway' by default.")

			




	
	
	
		
 
		("identity.type", value<std::string>()->default_value(""), "Type of transport ('icq','msn','gg','irc', ...)")

			




	
	
	
		
 
		("registration.enable_public_registration", value<bool>()->default_value(true), "True if users should be able to register.")

			




	
	
	
		
 
		("registration.language", value<std::string>()->default_value("en"), "Default language for registration form")

			




	
	
	
		
 
		("registration.instructions", value<std::string>()->default_value(""), "Instructions showed to user in registration form")

			




	
	
	
		
 
		("registration.username_field", value<std::string>()->default_value(""), "Label for username field")

			




	
	
	
		
 
		("registration.username_mask", value<std::string>()->default_value(""), "Username mask")

			




	
	
	
		
 
		("registration.encoding", value<std::string>()->default_value("en"), "Default encoding in registration form")

			




	
	
	
		
 
		("database.type", value<std::string>()->default_value("none"), "Database type.")

			




	
	
	
		
 
		("database.database", value<std::string>()->default_value(""), "Database used to store data")

			




	
	
	
		
 
		("database.server", value<std::string>()->default_value("localhost"), "Database server.")

			




	
	
	
		
 
		("database.user", value<std::string>()->default_value(""), "Database user.")

			




	
	
	
		
 
		("database.password", value<std::string>()->default_value(""), "Database Password.")

			




	
	
	
		
 
		("database.port", value<int>()->default_value(0), "Database port.")

			




	
	
	
		
 
		("database.prefix", value<std::string>()->default_value(""), "Prefix of tables in database")

			




	
	
	
		
 
		("logging.config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for Spectrum 2 instance")

			




	
	
	
		
 
		("logging.backend_config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for backends")

			




	
	
	
		
 
		("backend.default_avatar", value<std::string>()->default_value(""), "Full path to default avatar")

			




	
	
	
		
 
		("backend.avatars_directory", value<std::string>()->default_value(""), "Path to directory with avatars")

			




	
	
	
		
 
		("backend.no_vcard_fetch", value<bool>()->default_value(false), "True if VCards for buddies should not be fetched. Only avatars will be forwarded.")

			




	
	
	
		
 
	;

			




	
	
	
		
 

			




	
	
	
		
 
	parsed_options parsed = parse_config_file(ifs, opts, true);

			




	
	
	
		
 

			




	
	
	
		
 
	std::string jid = "";

			




	
	
	
		
 
	BOOST_FOREACH(option opt, parsed.options) {

			




	
	
	
		
 
		if (opt.string_key == "service.jid") {

			




	
	
	
		
 
			jid = opt.value[0];

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	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);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	store(parsed, m_variables);

			




	
	
	
		
 
	notify(m_variables);

			




	
	
	
		
 

			




	
	
	
		
 
	onConfigReloaded();

			




	
	
	
		
 

			




	
	
	
		
 
	return true;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool Config::load(std::istream &ifs) {

			




	
	
	
		
 
	options_description opts("Transport options");

			




	
	
	
		
 
	return load(ifs, opts);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool Config::load(const std::string &configfile) {

			




	
	
	
		
 
	options_description opts("Transport options");

			




	
	
	
		
 
	return load(configfile, opts);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool Config::reload() {

			




	
	
	
		
 
	if (m_file.empty()) {

			




	
	
	
		
 
		return false;

			




	
	
	
		
 
	}

			




        

    



    


    



    



      

      





    
    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