diff --git a/ini_reader.h b/ini_reader.h index 334cd50..c0f02c4 100644 --- a/ini_reader.h +++ b/ini_reader.h @@ -5,8 +5,6 @@ #include #include -#define MAX_LINE_LENGTH 4096 - typedef std::map> ini_data_struct; typedef std::multimap string_multimap; @@ -144,7 +142,7 @@ public: while(getline(strStrm, strLine)) //get one line of content { lineSize = strLine.size(); - if(!lineSize || lineSize > MAX_LINE_LENGTH || strLine[0] == ';' || strLine[0] == '#') //empty lines, lines longer than MAX_LINE_LENGTH and comments are ignored + if(!lineSize || strLine[0] == ';' || strLine[0] == '#') //empty lines and comments are ignored continue; if(strLine[lineSize - 1] == '\r') //remove line break { diff --git a/main.cpp b/main.cpp index 87498c5..bfd7eef 100644 --- a/main.cpp +++ b/main.cpp @@ -46,11 +46,17 @@ std::string refreshRulesets() ruleset_content rc; for(std::string &x : rulesets) { + /* vArray = split(x, ","); if(vArray.size() != 2) continue; rule_group = trim(vArray[0]); rule_url = trim(vArray[1]); + */ + if(x.find(",") == x.npos) + continue; + rule_group = trim(x.substr(0, x.find(","))); + rule_url = trim(x.substr(x.find(",") + 1)); if(rule_url.find("[]") == 0) { std::cerr<<"Adding rule '"<> pluginopts_host; } } + else if(yamlnode["Proxy"][i]["obfs"].IsDefined()) + { + plugin = "simple-obfs"; + yamlnode["Proxy"][i]["obfs"] >> pluginopts_mode; + if(yamlnode["Proxy"][i]["plugin-opts"]["obfs-host"].IsDefined()) + yamlnode["Proxy"][i]["obfs-host"] >> pluginopts_host; + } else plugin = ""; diff --git a/webserver.h b/webserver.h index eebd4d8..07b70da 100644 --- a/webserver.h +++ b/webserver.h @@ -13,7 +13,7 @@ struct listener_args int max_workers; }; -void append_response(std::string type, std::string request, std::string content_type, response_callback response); +void append_response(std::string method, std::string uri, std::string content_type, response_callback response); int start_web_server(void *argv); int start_web_server_multi(void *argv); diff --git a/webserver_libevent.cpp b/webserver_libevent.cpp index 9c4844a..dade5b7 100644 --- a/webserver_libevent.cpp +++ b/webserver_libevent.cpp @@ -212,11 +212,11 @@ int start_web_server_multi(void *argv) return 0; } -void append_response(std::string type, std::string request, std::string content_type, response_callback response) +void append_response(std::string method, std::string uri, std::string content_type, response_callback response) { responseRoute rr; - rr.method = type; - rr.path = request; + rr.method = method; + rr.path = uri; rr.content_type = content_type; rr.rc = response; responses.emplace_back(rr);