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

Added HTTP info.js websocket mode

Browse source 
# Conflicts:
#	src/output/output_http_internal.cpp
This commit is contained in:
Thulinma 2018-03-20 15:16:24 +01:00
parent e06b14ce77
commit 1b15fbff2b
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/output/output_http_internal.cpp
View file

@ -264,6 +264,9 @@ namespace Mist {
JSON::Value OutHTTP::getStatusJSON(std::string & reqHost){ JSON::Value OutHTTP::getStatusJSON(std::string & reqHost){
JSON::Value json_resp; JSON::Value json_resp;
if (config->getString("nostreamtext") != ""){
json_resp["on_error"] = config->getString("nostreamtext");
}
uint8_t streamStatus = Util::getStreamStatus(streamName); uint8_t streamStatus = Util::getStreamStatus(streamName);
if (streamStatus != STRMSTAT_READY){ if (streamStatus != STRMSTAT_READY){
switch (streamStatus){ switch (streamStatus){
@ -340,6 +343,7 @@ namespace Mist {
it->removeMember("keys"); it->removeMember("keys");
it->removeMember("keysizes"); it->removeMember("keysizes");
it->removeMember("parts"); it->removeMember("parts");
it->removeMember("ivecs");/*LTS*/
} }
//create a set for storing source information //create a set for storing source information
@ -367,6 +371,15 @@ namespace Mist {
if (outURL.protocol.find(':') != std::string::npos){ if (outURL.protocol.find(':') != std::string::npos){
outURL.protocol.erase(outURL.protocol.find(':')); outURL.protocol.erase(outURL.protocol.find(':'));
} }
/*LTS-START*/
if (prots.getIndice(i).hasMember("pubaddr") && prots.getIndice(i).getMember("pubaddr").asString().size()){
HTTP::URL altURL(prots.getIndice(i).getMember("pubaddr").asString());
outURL.protocol = altURL.protocol;
if (altURL.host.size()){outURL.host = altURL.host;}
outURL.port = altURL.port;
outURL.path = altURL.path;
}
/*LTS-END*/
//and a URL - then list the URL //and a URL - then list the URL
JSON::Value capa_json = capa.asJSON(); JSON::Value capa_json = capa.asJSON();
if (capa.getMember("url_rel") || capa.getMember("methods")){ if (capa.getMember("url_rel") || capa.getMember("methods")){