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

Added ability to override internal UDP API bound host/port

Browse source
This commit is contained in:
Thulinma 2018-10-05 14:11:23 +02:00
parent 28db254d7b
commit b35d56cd8f
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -98,6 +98,12 @@ endif()
if (DEFINED KILLONEXIT ) if (DEFINED KILLONEXIT )
add_definitions(-DKILLONEXIT=true) add_definitions(-DKILLONEXIT=true)
endif() endif()
if (DEFINED UDP_API_HOST )
add_definitions(-DUDP_API_HOST=${UDP_API_HOST})
endif()
if (DEFINED UDP_API_PORT )
add_definitions(-DUDP_API_PORT=${UDP_API_PORT})
endif()
######################################## ########################################
# Build Variables - Thread Names # # Build Variables - Thread Names #

9
lib/defines.h
View file

@ -157,3 +157,12 @@ static inline void show_stackframe(){}
#define SIMUL_TRACKS 20 #define SIMUL_TRACKS 20
#ifndef UDP_API_HOST
#define UDP_API_HOST "localhost"
#endif
#ifndef UDP_API_PORT
#define UDP_API_PORT 4242
#endif

2
src/controller/controller_api.cpp
View file

@ -383,7 +383,7 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
void Controller::handleUDPAPI(void * np){ void Controller::handleUDPAPI(void * np){
Socket::UDPConnection uSock(true); Socket::UDPConnection uSock(true);
if (!uSock.bind(4242, "localhost")){ if (!uSock.bind(UDP_API_PORT, UDP_API_HOST)){
FAIL_MSG("Could not open local API UDP socket - not all functionality will be available"); FAIL_MSG("Could not open local API UDP socket - not all functionality will be available");
return; return;
} }

2
src/output/output.cpp
View file

@ -1602,7 +1602,7 @@ namespace Mist{
if (newUA && ((now - myConn.connTime()) >= uaDelay || !myConn) && UA.size()){ if (newUA && ((now - myConn.connTime()) >= uaDelay || !myConn) && UA.size()){
std::string APIcall = "{\"tag_sessid\":{\"" + tmpEx.getSessId() + "\":" + JSON::string_escape("UA:"+UA) + "}}"; std::string APIcall = "{\"tag_sessid\":{\"" + tmpEx.getSessId() + "\":" + JSON::string_escape("UA:"+UA) + "}}";
Socket::UDPConnection uSock; Socket::UDPConnection uSock;
uSock.SetDestination("localhost", 4242); uSock.SetDestination(UDP_API_HOST, UDP_API_PORT);
uSock.SendNow(APIcall); uSock.SendNow(APIcall);
newUA = false; newUA = false;
} }