walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttp: Use -M as short option for --peer-max-concurrent-streams

This commit is contained in:
Tatsuhiro Tsujikawa 2013-09-16 16:44:13 +09:00
parent b14a97a273
commit e2ff41c44c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nghttp.cc
View File

@ -1433,7 +1433,7 @@ int run(char **uris, int n)
void print_usage(std::ostream& out) void print_usage(std::ostream& out)
{ {
out << "Usage: nghttp [-Oafnsuv] [-t <SECONDS>] [-w <WINDOW_BITS>] [--cert=<CERT>]\n" out << "Usage: nghttp [-Oafnsuv] [-t <SECONDS>] [-w <WINDOW_BITS>] [--cert=<CERT>]\n"
<< " [--key=<KEY>] [-d <FILE>] [-m <N>] [-p <PRIORITY>]\n" << " [--key=<KEY>] [-d <FILE>] [-m <N>] [-p <PRIORITY>] [-M <N>]\n"
<< " <URI>..." << " <URI>..."
<< std::endl; << std::endl;
} }
@ -1480,7 +1480,7 @@ void print_help(std::ostream& out)
<< " -p, --pri=<PRIORITY>\n" << " -p, --pri=<PRIORITY>\n"
<< " Sets stream priority. Default: " << " Sets stream priority. Default: "
<< NGHTTP2_PRI_DEFAULT << "\n" << NGHTTP2_PRI_DEFAULT << "\n"
<< " --peer-max-concurrent-streams=<N>\n" << " -M, --peer-max-concurrent-streams=<N>\n"
<< " Use <N> as SETTINGS_MAX_CONCURRENT_STREAMS\n" << " Use <N> as SETTINGS_MAX_CONCURRENT_STREAMS\n"
<< " value of remote endpoint as if it is\n" << " value of remote endpoint as if it is\n"
<< " received in SETTINGS frame. The default\n" << " received in SETTINGS frame. The default\n"
@ -1509,16 +1509,20 @@ int main(int argc, char **argv)
{"no-flow-control", no_argument, nullptr, 'f'}, {"no-flow-control", no_argument, nullptr, 'f'},
{"upgrade", no_argument, nullptr, 'u'}, {"upgrade", no_argument, nullptr, 'u'},
{"pri", required_argument, nullptr, 'p'}, {"pri", required_argument, nullptr, 'p'},
{"peer-max-concurrent-streams", required_argument, &flag, 3}, {"peer-max-concurrent-streams", required_argument, nullptr, 'M'},
{nullptr, 0, nullptr, 0 } {nullptr, 0, nullptr, 0 }
}; };
int option_index = 0; int option_index = 0;
int c = getopt_long(argc, argv, "Oad:fm:np:hH:vst:uw:", long_options, int c = getopt_long(argc, argv, "M:Oad:fm:np:hH:vst:uw:", long_options,
&option_index); &option_index);
if(c == -1) { if(c == -1) {
break; break;
} }
switch(c) { switch(c) {
case 'M':
// peer-max-concurrent-streams option
config.peer_max_concurrent_streams = strtoul(optarg, nullptr, 10);
break;
case 'O': case 'O':
config.remote_name = true; config.remote_name = true;
break; break;
@ -1617,10 +1621,6 @@ int main(int argc, char **argv)
// key option // key option
config.keyfile = optarg; config.keyfile = optarg;
break; break;
case 3:
// peer-max-concurrent-streams option
config.peer_max_concurrent_streams = strtoul(optarg, nullptr, 10);
break;
} }
break; break;
default: default: