hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/controller/controller_api.cpp
This commit is contained in:
Thulinma 2020-07-15 19:30:40 +02:00
commit a15b3c20f1
5 changed files with 52 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/config.cpp
View file

@ -40,6 +40,9 @@ static Socket::Server *serv_sock_pointer = 0;
uint32_t Util::Config::printDebugLevel = DEBUG; //
std::string Util::Config::streamName;
std::string Util::listenInterface;
uint32_t Util::listenPort = 0;
Util::Config::Config(){
// global options here
vals["debug"]["long"] = "debug";
@ -370,6 +373,7 @@ int Util::Config::serveThreadedSocket(int (*callback)(Socket::Connection &)){
DEVEL_MSG("Failure to open socket");
return 1;
}
Socket::getSocketName(server_socket.getSocket(), Util::listenInterface, Util::listenPort);
serv_sock_pointer = &server_socket;
activate();
if (server_socket.getSocket()){
@ -397,6 +401,7 @@ int Util::Config::serveForkedSocket(int (*callback)(Socket::Connection &S)){
DEVEL_MSG("Failure to open socket");
return 1;
}
Socket::getSocketName(server_socket.getSocket(), Util::listenInterface, Util::listenPort);
serv_sock_pointer = &server_socket;
activate();
if (server_socket.getSocket()){