Merge branch 'development' into LTS_development
# Conflicts: # src/input/input.cpp
This commit is contained in:
Thulinma
commit
cac503f774
7 changed files with 218 additions and 133 deletions
|
|
@ -3,51 +3,39 @@
|
|||
namespace Encodings{
|
||||
|
||||
/// Needed for base64_encode function
|
||||
const std::string Base64::chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
const std::string Base64::chars =
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
|
||||
/// Helper for base64_decode function
|
||||
inline bool Base64::is_base64(unsigned char c){
|
||||
return (isalnum(c) || (c == '+') || (c == '/'));
|
||||
}
|
||||
|
||||
/// Used to base64 encode data. Input is the plaintext as std::string, output is the encoded data as std::string.
|
||||
/// \param input Plaintext data to encode.
|
||||
/// \returns Base64 encoded data.
|
||||
/// Used to base64 encode data. Input is the plaintext as std::string, output is the encoded data
|
||||
/// as std::string. \param input Plaintext data to encode. \returns Base64 encoded data.
|
||||
std::string Base64::encode(std::string const input){
|
||||
std::string ret;
|
||||
unsigned int in_len = input.size();
|
||||
char quad[4], triple[3];
|
||||
unsigned int i, x, n = 3;
|
||||
for (x = 0; x < in_len; x = x + 3){
|
||||
if ((in_len - x) / 3 == 0) {
|
||||
n = (in_len - x) % 3;
|
||||
}
|
||||
for (i = 0; i < 3; i++) {
|
||||
triple[i] = '0';
|
||||
}
|
||||
for (i = 0; i < n; i++) {
|
||||
triple[i] = input[x + i];
|
||||
}
|
||||
if ((in_len - x) / 3 == 0){n = (in_len - x) % 3;}
|
||||
for (i = 0; i < 3; i++){triple[i] = '0';}
|
||||
for (i = 0; i < n; i++){triple[i] = input[x + i];}
|
||||
quad[0] = chars[(triple[0] & 0xFC) >> 2]; // FC = 11111100
|
||||
quad[1] = chars[((triple[0] & 0x03) << 4) | ((triple[1] & 0xF0) >> 4)]; // 03 = 11
|
||||
quad[2] = chars[((triple[1] & 0x0F) << 2) | ((triple[2] & 0xC0) >> 6)]; // 0F = 1111, C0=11110
|
||||
quad[3] = chars[triple[2] & 0x3F]; // 3F = 111111
|
||||
if (n < 3) {
|
||||
quad[3] = '=';
|
||||
}
|
||||
if (n < 2) {
|
||||
quad[2] = '=';
|
||||
}
|
||||
for (i = 0; i < 4; i++) {
|
||||
ret += quad[i];
|
||||
}
|
||||
if (n < 3){quad[3] = '=';}
|
||||
if (n < 2){quad[2] = '=';}
|
||||
for (i = 0; i < 4; i++){ret += quad[i];}
|
||||
}
|
||||
return ret;
|
||||
}// base64_encode
|
||||
|
||||
/// Used to base64 decode data. Input is the encoded data as std::string, output is the plaintext data as std::string.
|
||||
/// \param encoded_string Base64 encoded data to decode.
|
||||
/// \returns Plaintext decoded data.
|
||||
/// Used to base64 decode data. Input is the encoded data as std::string, output is the plaintext
|
||||
/// data as std::string. \param encoded_string Base64 encoded data to decode. \returns Plaintext
|
||||
/// decoded data.
|
||||
std::string Base64::decode(std::string const &encoded_string){
|
||||
int in_len = encoded_string.size();
|
||||
int i = 0;
|
||||
|
|
@ -59,35 +47,25 @@ namespace Encodings {
|
|||
char_array_4[i++] = encoded_string[in_];
|
||||
in_++;
|
||||
if (i == 4){
|
||||
for (i = 0; i < 4; i++) {
|
||||
char_array_4[i] = chars.find(char_array_4[i]);
|
||||
}
|
||||
for (i = 0; i < 4; i++){char_array_4[i] = chars.find(char_array_4[i]);}
|
||||
char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
|
||||
char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
|
||||
char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
|
||||
for (i = 0; (i < 3); i++) {
|
||||
ret += char_array_3[i];
|
||||
}
|
||||
for (i = 0; (i < 3); i++){ret += char_array_3[i];}
|
||||
i = 0;
|
||||
}
|
||||
}
|
||||
if (i){
|
||||
for (j = i; j < 4; j++) {
|
||||
char_array_4[j] = 0;
|
||||
}
|
||||
for (j = 0; j < 4; j++) {
|
||||
char_array_4[j] = chars.find(char_array_4[j]);
|
||||
}
|
||||
for (j = i; j < 4; j++){char_array_4[j] = 0;}
|
||||
for (j = 0; j < 4; j++){char_array_4[j] = chars.find(char_array_4[j]);}
|
||||
char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
|
||||
char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
|
||||
char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
|
||||
for (j = 0; (j < i - 1); j++)
|
||||
ret += char_array_3[j];
|
||||
for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/// Encodes a single character as two hex digits in string form.
|
||||
std::string Hex::chr(char dec){
|
||||
char dig1 = (dec & 0xF0) >> 4;
|
||||
|
|
@ -117,14 +95,20 @@ namespace Encodings {
|
|||
std::string escaped = "";
|
||||
int max = c.length();
|
||||
for (int i = 0; i < max; i++){
|
||||
if (('0' <= c[i] && c[i] <= '9') || ('a' <= c[i] && c[i] <= 'z') || ('A' <= c[i] && c[i] <= 'Z')
|
||||
|| (c[i] == '~' || c[i] == '!' || c[i] == '*' || c[i] == '(' || c[i] == ')' || c[i] == '\'')) {
|
||||
if (('0' <= c[i] && c[i] <= '9') || ('a' <= c[i] && c[i] <= 'z') ||
|
||||
('A' <= c[i] && c[i] <= 'Z') ||
|
||||
(c[i] == '~' || c[i] == '!' || c[i] == '*' || c[i] == '(' || c[i] == ')' || c[i] == '/' ||
|
||||
c[i] == '\'')){
|
||||
escaped.append(&c[i], 1);
|
||||
}else{
|
||||
if (c[i] == ' '){
|
||||
escaped.append("+");
|
||||
}else{
|
||||
escaped.append("%");
|
||||
escaped.append(Hex::chr(c[i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
return escaped;
|
||||
}
|
||||
|
||||
|
|
@ -135,13 +119,9 @@ namespace Encodings {
|
|||
if (in[i] == '%'){
|
||||
char tmp = 0;
|
||||
++i;
|
||||
if (i < in.length()) {
|
||||
tmp = Hex::ord(in[i]) << 4;
|
||||
}
|
||||
if (i < in.length()){tmp = Hex::ord(in[i]) << 4;}
|
||||
++i;
|
||||
if (i < in.length()) {
|
||||
tmp += Hex::ord(in[i]);
|
||||
}
|
||||
if (i < in.length()){tmp += Hex::ord(in[i]);}
|
||||
out += tmp;
|
||||
}else{
|
||||
if (in[i] == '+'){
|
||||
|
|
@ -154,5 +134,5 @@ namespace Encodings {
|
|||
return out;
|
||||
}
|
||||
|
||||
}//Encodings namespace
|
||||
}// namespace Encodings
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,11 @@
|
|||
#include "encode.h"
|
||||
#include "timing.h"
|
||||
#include "defines.h"
|
||||
#include "auth.h"
|
||||
|
||||
/// Helper function to check if the given c-string is numeric or not
|
||||
static bool is_numeric(const char * str){
|
||||
while (str != 0){
|
||||
while (str[0] != 0){
|
||||
if (str[0] < 48 || str[0] > 57){return false;}
|
||||
++str;
|
||||
}
|
||||
|
|
@ -17,6 +18,7 @@ static bool is_numeric(const char * str){
|
|||
|
||||
///Constructor that does the actual parsing
|
||||
HTTP::URL::URL(const std::string & url){
|
||||
IPv6Addr = false;
|
||||
//first detect protocol at the start, if any
|
||||
size_t proto_sep = url.find("://");
|
||||
if (proto_sep != std::string::npos){
|
||||
|
|
@ -24,6 +26,9 @@ HTTP::URL::URL(const std::string & url){
|
|||
proto_sep += 3;
|
||||
}else{
|
||||
proto_sep = 0;
|
||||
if (url.substr(0, 2) == "//"){
|
||||
proto_sep = 2;
|
||||
}
|
||||
}
|
||||
//proto_sep now points to the start of the host, guaranteed
|
||||
//continue by finding the path, if any
|
||||
|
|
@ -36,7 +41,7 @@ HTTP::URL::URL(const std::string & url){
|
|||
}
|
||||
size_t hmark = path.find('#');
|
||||
if (hmark != std::string::npos){
|
||||
frag = path.substr(hmark+1);
|
||||
frag = Encodings::URL::decode(path.substr(hmark+1));
|
||||
path.erase(hmark);
|
||||
}
|
||||
size_t qmark = path.find('?');
|
||||
|
|
@ -45,15 +50,28 @@ HTTP::URL::URL(const std::string & url){
|
|||
path.erase(qmark);
|
||||
}
|
||||
if (path.size()){
|
||||
if (path[0] == '/'){
|
||||
path.erase(0, 1);
|
||||
}
|
||||
size_t dots = path.find("/./");
|
||||
while (dots != std::string::npos){
|
||||
DONTEVEN_MSG("%s (/./ -> /)", path.c_str());
|
||||
path.erase(dots, 2);
|
||||
dots = path.find("/./");
|
||||
}
|
||||
dots = path.find("//");
|
||||
while (dots != std::string::npos){
|
||||
DONTEVEN_MSG("%s (// -> /)", path.c_str());
|
||||
path.erase(dots, 1);
|
||||
dots = path.find("//");
|
||||
}
|
||||
if (path[0] == '/'){
|
||||
path.erase(0, 1);
|
||||
}
|
||||
dots = path.find("/../");
|
||||
while (dots != std::string::npos){
|
||||
size_t prevslash = path.rfind('/', dots-1);
|
||||
if (prevslash == std::string::npos){
|
||||
if (prevslash == std::string::npos || dots == 0){
|
||||
path.erase(0, dots+4);
|
||||
}else{
|
||||
path.erase(prevslash+1, dots-prevslash+3);
|
||||
|
|
@ -66,39 +84,59 @@ HTTP::URL::URL(const std::string & url){
|
|||
if (path.substr(0, 3) == "../"){
|
||||
path.erase(0, 3);
|
||||
}
|
||||
path = Encodings::URL::decode(path);
|
||||
}
|
||||
}
|
||||
//user, pass, host and port are now definitely between proto_sep and first_slash
|
||||
std::string uphp = url.substr(proto_sep, first_slash-proto_sep);//user+pass+host+port
|
||||
//Check if we have a user/pass before the host
|
||||
size_t at_sign = uphp.find('@');
|
||||
if (at_sign != std::string::npos){
|
||||
std::string creds = uphp.substr(0, at_sign);
|
||||
uphp.erase(0, at_sign+1);
|
||||
size_t colon = creds.find(':');
|
||||
if (colon != std::string::npos){
|
||||
user = Encodings::URL::decode(creds.substr(0, colon));
|
||||
pass = Encodings::URL::decode(creds.substr(colon+1));
|
||||
}else{
|
||||
user = Encodings::URL::decode(creds);
|
||||
}
|
||||
}
|
||||
//host and port are now definitely between proto_sep and first_slash
|
||||
//we check for [ at the start because we may have an IPv6 address as host
|
||||
if (url[proto_sep] == '['){
|
||||
if (uphp[0] == '['){
|
||||
//IPv6 address - find matching brace
|
||||
size_t closing_brace = url.find(']', proto_sep);
|
||||
//check if it exists at all
|
||||
if (closing_brace == std::string::npos || closing_brace > first_slash){
|
||||
//assume host ends at first slash if there is no closing brace before it
|
||||
closing_brace = first_slash;
|
||||
}
|
||||
host = url.substr(proto_sep+1, closing_brace-(proto_sep+1));
|
||||
IPv6Addr = true;
|
||||
size_t closing_brace = uphp.find(']');
|
||||
host = uphp.substr(1, closing_brace-1);
|
||||
//continue by finding port, if any
|
||||
size_t colon = url.rfind(':', first_slash);
|
||||
if (colon == std::string::npos || colon <= closing_brace){
|
||||
//no port. Assume 80
|
||||
port = "80";
|
||||
size_t colon = uphp.find(':', closing_brace);
|
||||
if (colon == std::string::npos){
|
||||
//no port. Assume default
|
||||
port = "";
|
||||
}else{
|
||||
//we have a port number, read it
|
||||
port = url.substr(colon+1, first_slash-(colon+1));
|
||||
port = uphp.substr(colon+1);
|
||||
if (!is_numeric(port.c_str())){
|
||||
host += ":" + port;
|
||||
port = "";
|
||||
}
|
||||
}
|
||||
}else{
|
||||
//"normal" host - first find port, if any
|
||||
size_t colon = url.rfind(':', first_slash);
|
||||
if (colon == std::string::npos || colon < proto_sep){
|
||||
size_t colon = uphp.rfind(':');
|
||||
if (colon == std::string::npos){
|
||||
//no port. Assume default
|
||||
port = "";
|
||||
host = url.substr(proto_sep, first_slash-proto_sep);
|
||||
host = uphp;
|
||||
}else{
|
||||
//we have a port number, read it
|
||||
port = url.substr(colon+1, first_slash-(colon+1));
|
||||
host = url.substr(proto_sep, colon-proto_sep);
|
||||
port = uphp.substr(colon+1);
|
||||
host = uphp.substr(0, colon);
|
||||
if (!is_numeric(port.c_str())){
|
||||
IPv6Addr = true;
|
||||
host += ":" + port;
|
||||
port = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
//if the host is numeric, assume it is a port, instead
|
||||
|
|
@ -117,25 +155,35 @@ uint32_t HTTP::URL::getPort() const{
|
|||
|
||||
///Returns the default port for the protocol in numeric format
|
||||
uint32_t HTTP::URL::getDefaultPort() const{
|
||||
if (protocol == "http"){return 80;}
|
||||
if (protocol == "https"){return 443;}
|
||||
if (protocol == "rtmp"){return 1935;}
|
||||
if (protocol == "dtsc"){return 4200;}
|
||||
return 80;
|
||||
if (protocol == "rtsp"){return 554;}
|
||||
return 0;
|
||||
}
|
||||
|
||||
///Returns the full URL in string format
|
||||
std::string HTTP::URL::getUrl() const{
|
||||
std::string ret;
|
||||
if (protocol.size()){
|
||||
ret = protocol + "://" + host;
|
||||
ret = protocol + "://";
|
||||
}else{
|
||||
ret = "//" + host;
|
||||
ret = "//";
|
||||
}
|
||||
if (user.size() || pass.size()){
|
||||
ret += Encodings::URL::encode(user) + ":" + Encodings::URL::encode(pass) + "@";
|
||||
}
|
||||
if (IPv6Addr){
|
||||
ret += "[" + host + "]";
|
||||
}else{
|
||||
ret += host;
|
||||
}
|
||||
if (port.size() && getPort() != getDefaultPort()){ret += ":" + port;}
|
||||
ret += "/";
|
||||
if (path.size()){ret += path;}
|
||||
if (path.size()){ret += Encodings::URL::encode(path);}
|
||||
if (args.size()){ret += "?" + args;}
|
||||
if (frag.size()){ret += "#" + frag;}
|
||||
if (frag.size()){ret += "#" + Encodings::URL::encode(frag);}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -143,13 +191,21 @@ std::string HTTP::URL::getUrl() const{
|
|||
std::string HTTP::URL::getBareUrl() const{
|
||||
std::string ret;
|
||||
if (protocol.size()){
|
||||
ret = protocol + "://" + host;
|
||||
ret = protocol + "://";
|
||||
}else{
|
||||
ret = "//" + host;
|
||||
ret = "//";
|
||||
}
|
||||
if (user.size() || pass.size()){
|
||||
ret += Encodings::URL::encode(user) + ":" + Encodings::URL::encode(pass) + "@";
|
||||
}
|
||||
if (IPv6Addr){
|
||||
ret += "[" + host + "]";
|
||||
}else{
|
||||
ret += host;
|
||||
}
|
||||
if (port.size() && getPort() != getDefaultPort()){ret += ":" + port;}
|
||||
ret += "/";
|
||||
if (path.size()){ret += path;}
|
||||
if (path.size()){ret += Encodings::URL::encode(path);}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -215,6 +271,41 @@ void HTTP::Parser::CleanPreserveHeaders() {
|
|||
vars.clear();
|
||||
}
|
||||
|
||||
/// Local-only helper function for use in auth()
|
||||
/// Returns the string contents of the given val from list
|
||||
static std::string findValIn(const std::string & list, const std::string & val){
|
||||
size_t pos = list.find(val+"=\"");
|
||||
if (pos == std::string::npos){return "";}
|
||||
pos += val.size() + 2;
|
||||
if (pos >= list.size()){return "";}
|
||||
size_t ePos = list.find('"', pos);
|
||||
if (ePos == std::string::npos){return "";}
|
||||
return list.substr(pos, ePos - pos);
|
||||
}
|
||||
|
||||
/// Attempts to send an authentication header with the given name and password. Uses authReq as WWW-Authenticate header.
|
||||
void HTTP::Parser::auth(const std::string & user, const std::string & pass, const std::string & authReq){
|
||||
size_t space = authReq.find(' ');
|
||||
if (space == std::string::npos || !user.size() || !pass.size()){
|
||||
FAIL_MSG("No authentication possible");
|
||||
return;
|
||||
}
|
||||
std::string meth = authReq.substr(0, space);
|
||||
if (meth == "Basic"){
|
||||
SetHeader("Authorization", "Basic "+Encodings::Base64::encode(user+":"+pass));
|
||||
return;
|
||||
}
|
||||
if (meth == "Digest"){
|
||||
std::string realm=findValIn(authReq, "realm"), nonce=findValIn(authReq, "nonce");
|
||||
std::string A1 = Secure::md5(user+":"+realm+":"+pass);
|
||||
std::string A2 = Secure::md5(method+":"+url);
|
||||
std::string response = Secure::md5(A1+":"+nonce+":"+A2);
|
||||
SetHeader("Authorization", "Digest username=\""+user+"\", realm=\""+realm+"\", nonce=\""+nonce+"\", uri=\""+url+"\", response=\""+response+"\"");
|
||||
return;
|
||||
}
|
||||
FAIL_MSG("No authentication possible, unimplemented method '%s'", meth.c_str());
|
||||
}
|
||||
|
||||
/// Sets the neccesary headers to allow Cross Origin Resource Sharing with all domains.
|
||||
void HTTP::Parser::setCORSHeaders(){
|
||||
SetHeader("Access-Control-Allow-Origin", "*");
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ namespace HTTP {
|
|||
void Proxy(Socket::Connection & from, Socket::Connection & to);
|
||||
void Clean();
|
||||
void CleanPreserveHeaders();
|
||||
void auth(const std::string & user, const std::string & pass, const std::string & authReq);
|
||||
std::string body;
|
||||
std::string method;
|
||||
std::string url;
|
||||
|
|
@ -83,7 +84,10 @@ namespace HTTP {
|
|||
std::string path;///<Path after the first slash (not inclusive) but before any question mark
|
||||
std::string args;///<Everything after the question mark in the path, if it was present
|
||||
std::string frag;///<Everything after the # in the path, if it was present
|
||||
std::string user;///<Username, if it was present
|
||||
std::string pass;///<Password, if it was present
|
||||
URL link(const std::string &l) const;
|
||||
bool IPv6Addr;
|
||||
};
|
||||
|
||||
}//HTTP namespace
|
||||
|
|
|
|||
|
|
@ -1175,9 +1175,12 @@ void Socket::UDPConnection::SetDestination(std::string destIp, uint32_t port){
|
|||
destAddr = malloc(destAddr_size);
|
||||
if (!destAddr){return;}
|
||||
memcpy(destAddr, rp->ai_addr, rp->ai_addrlen);
|
||||
if (family != rp->ai_family){
|
||||
INFO_MSG("Socket is wrong type (%s), re-opening as %s", addrFam(family), addrFam(rp->ai_family));
|
||||
close();
|
||||
family = rp->ai_family;
|
||||
sock = socket(family, SOCK_DGRAM, 0);
|
||||
}
|
||||
HIGH_MSG("Set UDP destination: %s:%d (%s)", destIp.c_str(), port, addrFam(family));
|
||||
freeaddrinfo(result);
|
||||
return;
|
||||
|
|
@ -1300,6 +1303,7 @@ uint16_t Socket::UDPConnection::bind(int port, std::string iface, const std::str
|
|||
}
|
||||
|
||||
std::string err_str;
|
||||
uint16_t portNo = 0;
|
||||
for (rp = addr_result; rp != NULL; rp = rp->ai_next){
|
||||
sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
|
||||
if (sock == -1){continue;}
|
||||
|
|
@ -1332,7 +1336,17 @@ uint16_t Socket::UDPConnection::bind(int port, std::string iface, const std::str
|
|||
}
|
||||
}
|
||||
if (::bind(sock, rp->ai_addr, rp->ai_addrlen) == 0){
|
||||
INFO_MSG("UDP bind success on %s:%s (%s)", human_addr, human_port, addrFam(rp->ai_family));
|
||||
//get port number
|
||||
struct sockaddr_storage fin_addr;
|
||||
socklen_t alen = sizeof(fin_addr);
|
||||
if (getsockname(sock, (struct sockaddr*)&fin_addr, &alen) == 0){
|
||||
if (family == AF_INET6){
|
||||
portNo = ntohs(((struct sockaddr_in6*)&fin_addr)->sin6_port);
|
||||
}else{
|
||||
portNo = ntohs(((struct sockaddr_in*)&fin_addr)->sin_port);
|
||||
}
|
||||
}
|
||||
INFO_MSG("UDP bind success on %s:%u (%s)", human_addr, portNo, addrFam(rp->ai_family));
|
||||
break;
|
||||
}
|
||||
if (err_str.size()){err_str += ", ";}
|
||||
|
|
@ -1428,18 +1442,7 @@ uint16_t Socket::UDPConnection::bind(int port, std::string iface, const std::str
|
|||
}
|
||||
freeaddrinfo(resmulti); // free resolved multicast addr
|
||||
}
|
||||
//get port number
|
||||
struct sockaddr_storage fin_addr;
|
||||
socklen_t alen = sizeof(fin_addr);
|
||||
if (getsockname(sock, (struct sockaddr*)&fin_addr, &alen) == 0){
|
||||
if (family == AF_INET6){
|
||||
return ntohs(((struct sockaddr_in6*)&fin_addr)->sin6_port);
|
||||
}else{
|
||||
return ntohs(((struct sockaddr_in*)&fin_addr)->sin_port);
|
||||
}
|
||||
}else{
|
||||
return 0;
|
||||
}
|
||||
return portNo;
|
||||
}
|
||||
|
||||
/// Attempt to receive a UDP packet.
|
||||
|
|
|
|||
|
|
@ -97,8 +97,10 @@ namespace Controller {
|
|||
p[it.key()] = p[it.key()].asString();
|
||||
if (p[it.key()].asStringRef().size() > 0){
|
||||
argarr[argnum++] = (char*)((*it)["option"].asStringRef().c_str());
|
||||
if (it->isMember("type")){
|
||||
argarr[argnum++] = (char*)(p[it.key()].asStringRef().c_str());
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if (it.key() == "debug"){
|
||||
static std::string debugLvlStr;
|
||||
|
|
|
|||
|
|
@ -536,16 +536,7 @@ namespace Mist {
|
|||
it->second.lastms = 0;
|
||||
}
|
||||
|
||||
getNext();
|
||||
while (thisPacket && config->is_active && nProxy.userClient.isAlive()){
|
||||
nProxy.bufferLivePacket(thisPacket, myMeta);
|
||||
getNext();
|
||||
nProxy.userClient.keepAlive();
|
||||
}
|
||||
std::string reason = "Unknown";
|
||||
if (!thisPacket){reason = "Invalid packet";}
|
||||
if (!config->is_active){reason = "received deactivate signal";}
|
||||
if (!nProxy.userClient.isAlive()){reason = "buffer shutdown";}
|
||||
std::string reason = streamMainLoop();
|
||||
|
||||
closeStreamSource();
|
||||
|
||||
|
|
@ -558,6 +549,19 @@ namespace Mist {
|
|||
return;
|
||||
}
|
||||
|
||||
std::string Input::streamMainLoop(){
|
||||
getNext();
|
||||
while (thisPacket && config->is_active && nProxy.userClient.isAlive()){
|
||||
nProxy.bufferLivePacket(thisPacket, myMeta);
|
||||
getNext();
|
||||
nProxy.userClient.keepAlive();
|
||||
}
|
||||
if (!thisPacket){return "Invalid packet";}
|
||||
if (!config->is_active){return "received deactivate signal";}
|
||||
if (!nProxy.userClient.isAlive()){return "buffer shutdown";}
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
void Input::finish() {
|
||||
for (std::map<unsigned int, std::map<unsigned int, unsigned int> >::iterator it = pageCounter.begin(); it != pageCounter.end(); it++) {
|
||||
for (std::map<unsigned int, unsigned int>::iterator it2 = it->second.begin(); it2 != it->second.end(); it2++) {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ namespace Mist {
|
|||
virtual void convert();
|
||||
virtual void serve();
|
||||
virtual void stream();
|
||||
virtual std::string streamMainLoop();
|
||||
bool isAlwaysOn();
|
||||
|
||||
virtual void parseHeader();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue