Library code style update + some minor backports from Pro edition

This commit is contained in:
Erik Zandvliet 2018-12-03 23:51:48 +01:00 committed by Thulinma
parent 593b291e85
commit 2607113727
68 changed files with 4538 additions and 4665 deletions

View file

@ -7,53 +7,55 @@
#define PACKAGE_VERSION "unknown"
#endif
#include <string>
#include "json.h"
#include <signal.h>
#include <string>
/// Contains utility code, not directly related to streaming media
namespace Util {
namespace Util{
/// Deals with parsing configuration from commandline options.
class Config {
private:
JSON::Value vals; ///< Holds all current config values
int long_count;
static void signal_handler(int signum, siginfo_t * sigInfo, void * ignore);
public:
//variables
static bool is_active; ///< Set to true by activate(), set to false by the signal handler.
static unsigned int printDebugLevel;
static std::string streamName; ///< Used by debug messages to identify the stream name
//functions
Config();
Config(std::string cmd);
void addOption(std::string optname, JSON::Value option);
void printHelp(std::ostream & output);
bool parseArgs(int & argc, char ** & argv);
bool hasOption(const std::string & optname);
JSON::Value & getOption(std::string optname, bool asArray = false);
std::string getString(std::string optname);
long long int getInteger(std::string optname);
bool getBool(std::string optname);
void activate();
int threadServer(Socket::Server & server_socket, int (*callback)(Socket::Connection & S));
int forkServer(Socket::Server & server_socket, int (*callback)(Socket::Connection & S));
int serveThreadedSocket(int (*callback)(Socket::Connection & S));
int serveForkedSocket(int (*callback)(Socket::Connection & S));
int servePlainSocket(int (*callback)(Socket::Connection & S));
void addOptionsFromCapabilities(const JSON::Value & capabilities);
void addBasicConnectorOptions(JSON::Value & capabilities);
void addConnectorOptions(int port, JSON::Value & capabilities);
class Config{
private:
JSON::Value vals; ///< Holds all current config values
int long_count;
static void signal_handler(int signum, siginfo_t *sigInfo, void *ignore);
public:
// variables
static bool is_active; ///< Set to true by activate(), set to false by the signal handler.
static uint32_t printDebugLevel;
static std::string streamName; ///< Used by debug messages to identify the stream name
// functions
Config();
Config(std::string cmd);
void addOption(std::string optname, JSON::Value option);
void printHelp(std::ostream &output);
bool parseArgs(int &argc, char **&argv);
bool hasOption(const std::string &optname);
JSON::Value &getOption(std::string optname, bool asArray = false);
std::string getString(std::string optname);
int64_t getInteger(std::string optname);
bool getBool(std::string optname);
void activate();
int threadServer(Socket::Server &server_socket, int (*callback)(Socket::Connection &S));
int forkServer(Socket::Server &server_socket, int (*callback)(Socket::Connection &S));
int serveThreadedSocket(int (*callback)(Socket::Connection &S));
int serveForkedSocket(int (*callback)(Socket::Connection &S));
int servePlainSocket(int (*callback)(Socket::Connection &S));
void addOptionsFromCapabilities(const JSON::Value &capabilities);
void addBasicConnectorOptions(JSON::Value &capabilities);
void addConnectorOptions(int port, JSON::Value &capabilities);
};
/// Gets directory the current executable is stored in.
std::string getMyPath();
/// Gets all executables in getMyPath that start with "Mist".
void getMyExec(std::deque<std::string> & execs);
void getMyExec(std::deque<std::string> &execs);
/// Will set the active user to the named username.
void setUser(std::string user);
}
}// namespace Util