Support for multiple public addresses, as well as proxy-overridden public addresses

This commit is contained in:
Thulinma 2020-01-23 16:51:15 +01:00
parent 131eb58c6a
commit cd19cca36b
4 changed files with 60 additions and 23 deletions

View file

@ -282,6 +282,14 @@ namespace Mist {
if ((*it)["type"].asStringRef() == "uint" || (*it)["type"].asStringRef() == "int" || (*it)["type"].asStringRef() == "debug"){
p[it.key()] = JSON::Value(p[it.key()].asInt()).asString();
}
if ((*it)["type"].asStringRef() == "inputlist" && p[it.key()].isArray()){
jsonForEach(p[it.key()], iVal){
(*iVal) = iVal->asString();
argarr[argnum++] = (char*)((*it)["option"].c_str());
argarr[argnum++] = (char*)((*iVal).c_str());
}
continue;
}
}
if (p[it.key()].asStringRef().size() > 0){
argarr[argnum++] = (char*)((*it)["option"].c_str());
@ -312,7 +320,8 @@ namespace Mist {
if (connector == "HTTP" || connector == "HTTP.exe"){
//restore from values in the environment, regardless of configged settings
if (getenv("MIST_HTTP_pubaddr")){
p["pubaddr"] = getenv("MIST_HTTP_pubaddr");
std::string pubAddrs = getenv("MIST_HTTP_pubaddr");
p["pubaddr"] = JSON::fromString(pubAddrs);
}
}else{
//find connector in config