mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2025-04-05 23:03:38 +03:00
Code Issues Projects Releases Wiki Activity

clang-format

Browse source
This commit is contained in:
klzgrad 2019-01-14 16:57:09 -05:00
parent 444e9e821c
commit 2418557749
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/net/tools/naive/naive_proxy_bin.cc
View file

@ -188,20 +188,23 @@ void GetCommandLine(const base::CommandLine& proc, CommandLine* cmdline) {
cmdline->listen = proc.GetSwitchValueASCII("listen");
cmdline->proxy = proc.GetSwitchValueASCII("proxy");
cmdline->padding = proc.HasSwitch("padding");
cmdline->host_resolver_rules = proc.GetSwitchValueASCII("host-resolver-rules");
cmdline->host_resolver_rules =
proc.GetSwitchValueASCII("host-resolver-rules");
cmdline->no_log = !proc.HasSwitch("log");
cmdline->log = proc.GetSwitchValuePath("log");
cmdline->log_net_log = proc.GetSwitchValuePath("log-net-log");
cmdline->ssl_key_log_file = proc.GetSwitchValuePath("ssl-key-log-file");
}
void GetCommandLineFromConfig(const base::FilePath& config_path, CommandLine* cmdline) {
void GetCommandLineFromConfig(const base::FilePath& config_path,
CommandLine* cmdline) {
JSONFileValueDeserializer reader(config_path);
int error_code;
std::string error_message;
auto value = reader.Deserialize(&error_code, &error_message);
if (value == nullptr) {
std::cerr << "Error reading " << config_path << ": (" << error_code << ") " << error_message << std::endl;
std::cerr << "Error reading " << config_path << ": (" << error_code << ") "
<< error_message << std::endl;
exit(EXIT_FAILURE);
}
if (!value->is_dict()) {
@ -219,24 +222,29 @@ void GetCommandLineFromConfig(const base::FilePath& config_path, CommandLine* cm
cmdline->padding = value->FindKey("padding")->GetBool();
}
if (value->FindKeyOfType("host-resolver-rules", base::Value::Type::STRING)) {
cmdline->host_resolver_rules = value->FindKey("host-resolver-rules")->GetString();
cmdline->host_resolver_rules =
value->FindKey("host-resolver-rules")->GetString();
}
cmdline->no_log = true;
if (value->FindKeyOfType("log", base::Value::Type::STRING)) {
cmdline->no_log = false;
cmdline->log = base::FilePath::FromUTF8Unsafe(value->FindKey("log")->GetString());
cmdline->log =
base::FilePath::FromUTF8Unsafe(value->FindKey("log")->GetString());
}
if (value->FindKeyOfType("log-net-log", base::Value::Type::STRING)) {
cmdline->log_net_log = base::FilePath::FromUTF8Unsafe(value->FindKey("log-net-log")->GetString());
cmdline->log_net_log = base::FilePath::FromUTF8Unsafe(
value->FindKey("log-net-log")->GetString());
}
if (value->FindKeyOfType("ssl-key-log-file", base::Value::Type::STRING)) {
cmdline->ssl_key_log_file = base::FilePath::FromUTF8Unsafe(value->FindKey("ssl-key-log-file")->GetString());
cmdline->ssl_key_log_file = base::FilePath::FromUTF8Unsafe(
value->FindKey("ssl-key-log-file")->GetString());
}
}
std::string GetProxyFromURL(const GURL& url) {
auto shp = url::SchemeHostPort(url);
if (url::DefaultPortForScheme(shp.scheme().c_str(), shp.scheme().size()) == url::PORT_UNSPECIFIED) {
if (url::DefaultPortForScheme(shp.scheme().c_str(), shp.scheme().size()) ==
url::PORT_UNSPECIFIED) {
return shp.Serialize() + ":" + base::IntToString(shp.port());
} else {
return shp.Serialize();
@ -304,7 +312,8 @@ bool ParseCommandLine(const CommandLine& cmdline, Params* params) {
if (url.HostIsIPAddress()) {
GURL::Replacements set_host;
set_host.SetHostStr(kDefaultHostName);
params->proxy_url = GetProxyFromURL(url_no_auth.ReplaceComponents(set_host));
params->proxy_url =
GetProxyFromURL(url_no_auth.ReplaceComponents(set_host));
LOG(INFO) << "Using '" << kDefaultHostName << "' as the hostname for "
<< url.host();
params->host_resolver_rules =
@ -454,7 +463,8 @@ int main(int argc, char* argv[]) {
LOG(ERROR) << "Failed to listen: " << result;
return EXIT_FAILURE;
}
LOG(INFO) << "Listening on " << params.listen_addr << ":" << params.listen_port;
LOG(INFO) << "Listening on " << params.listen_addr << ":"
<< params.listen_port;
net::NaiveProxy naive_proxy(std::move(listen_socket), params.protocol,
params.use_padding, session, kTrafficAnnotation);