nghttp: Update doc for -p option and improve error handling for it

This commit is contained in:
Tatsuhiro Tsujikawa 2014-04-05 19:15:45 +09:00
parent 0a527f16f5
commit c2bb9c01a6
1 changed files with 8 additions and 3 deletions

View File

@ -1830,7 +1830,10 @@ Options:
-d is used, the HTTP upgrade request is performed -d is used, the HTTP upgrade request is performed
with OPTIONS method. with OPTIONS method.
-p, --weight=<WEIGHT> -p, --weight=<WEIGHT>
Sets priority group weight. Default: )" Sets priority group weight. The valid value
range is [)"
<< NGHTTP2_MIN_WEIGHT << ", " << NGHTTP2_MAX_WEIGHT << R"(], inclusive.
Default: )"
<< NGHTTP2_DEFAULT_WEIGHT << R"( << NGHTTP2_DEFAULT_WEIGHT << R"(
-M, --peer-max-concurrent-streams=<N> -M, --peer-max-concurrent-streams=<N>
Use <N> as SETTINGS_MAX_CONCURRENT_STREAMS value Use <N> as SETTINGS_MAX_CONCURRENT_STREAMS value
@ -1904,11 +1907,13 @@ int main(int argc, char **argv)
config.null_out = true; config.null_out = true;
break; break;
case 'p': { case 'p': {
errno = 0;
auto n = strtoul(optarg, nullptr, 10); auto n = strtoul(optarg, nullptr, 10);
if(n <= NGHTTP2_MAX_WEIGHT) { if(errno == 0 && NGHTTP2_MIN_WEIGHT <= n && n <= NGHTTP2_MAX_WEIGHT) {
config.weight = n; config.weight = n;
} else { } else {
std::cerr << "-p: specify the integer in the range [0, " std::cerr << "-p: specify the integer in the range ["
<< NGHTTP2_MIN_WEIGHT << ", "
<< NGHTTP2_MAX_WEIGHT << "], inclusive" << NGHTTP2_MAX_WEIGHT << "], inclusive"
<< std::endl; << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);