Skip to content

Commit

Permalink
Merge pull request nghttp2#1775 from nghttp2/src-eliminate-strtoul
Browse files Browse the repository at this point in the history 
Replace the use of strtoul and strtol with parse_uint
  • Loading branch information
@tatsuhiro-t
tatsuhiro-t authored Aug 9, 2022
2 parents 092014d + a4d12f2 commit 179ecf7
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 86 deletions.
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ if(ENABLE_HPACK_TOOLS)
set(deflatehd_SOURCES
deflatehd.cc
comp_helper.c
util.cc
timegm.c
)
add_executable(inflatehd ${inflatehd_SOURCES})
add_executable(deflatehd ${deflatehd_SOURCES})
Expand Down
5 changes: 4 additions & 1 deletion src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,10 @@ if ENABLE_HPACK_TOOLS

bin_PROGRAMS += inflatehd deflatehd

HPACK_TOOLS_COMMON_SRCS = comp_helper.c comp_helper.h
HPACK_TOOLS_COMMON_SRCS = \
comp_helper.c comp_helper.h \
util.cc util.h \
timegm.c timegm.h

inflatehd_SOURCES = inflatehd.cc $(HPACK_TOOLS_COMMON_SRCS)

Expand Down
21 changes: 11 additions & 10 deletions src/deflatehd.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

#include "template.h"
#include "comp_helper.h"
#include "util.h"

namespace nghttp2 {

Expand Down Expand Up @@ -381,8 +382,6 @@ constexpr static struct option long_options[] = {
{nullptr, 0, nullptr, 0}};

int main(int argc, char **argv) {
char *end;

config.table_size = 4_k;
config.deflate_table_size = 4_k;
config.http1text = 0;
Expand All @@ -401,24 +400,26 @@ int main(int argc, char **argv) {
// --http1text
config.http1text = 1;
break;
case 's':
case 's': {
// --table-size
errno = 0;
config.table_size = strtoul(optarg, &end, 10);
if (errno == ERANGE || *end != '\0') {
auto n = util::parse_uint(optarg);
if (n == -1) {
fprintf(stderr, "-s: Bad option value\n");
exit(EXIT_FAILURE);
}
config.table_size = n;
break;
case 'S':
}
case 'S': {
// --deflate-table-size
errno = 0;
config.deflate_table_size = strtoul(optarg, &end, 10);
if (errno == ERANGE || *end != '\0') {
auto n = util::parse_uint(optarg);
if (n == -1) {
fprintf(stderr, "-S: Bad option value\n");
exit(EXIT_FAILURE);
}
config.deflate_table_size = n;
break;
}
case 'd':
// --dump-header-table
config.dump_header_table = 1;
Expand Down
69 changes: 48 additions & 21 deletions src/h2load.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2370,44 +2370,65 @@ int main(int argc, char **argv) {
break;
}
switch (c) {
case 'n':
config.nreqs = strtoul(optarg, nullptr, 10);
case 'n': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-n: bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.nreqs = n;
nreqs_set_manually = true;
break;
case 'c':
config.nclients = strtoul(optarg, nullptr, 10);
}
case 'c': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-c: bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.nclients = n;
break;
}
case 'd':
datafile = optarg;
break;
case 't':
case 't': {
#ifdef NOTHREADS
std::cerr << "-t: WARNING: Threading disabled at build time, "
<< "no threads created." << std::endl;
#else
config.nthreads = strtoul(optarg, nullptr, 10);
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-t: bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.nthreads = n;
#endif // NOTHREADS
break;
case 'm':
config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
}
case 'm': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-m: bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.max_concurrent_streams = n;
break;
}
case 'w':
case 'W': {
errno = 0;
char *endptr = nullptr;
auto n = strtoul(optarg, &endptr, 10);
if (errno == 0 && *endptr == '\0' && n < 31) {
if (c == 'w') {
config.window_bits = n;
} else {
config.connection_window_bits = n;
}
} else {
auto n = util::parse_uint(optarg);
if (n == -1 || n > 30) {
std::cerr << "-" << static_cast<char>(c)
<< ": specify the integer in the range [0, 30], inclusive"
<< std::endl;
exit(EXIT_FAILURE);
}
if (c == 'w') {
config.window_bits = n;
} else {
config.connection_window_bits = n;
}
break;
}
case 'f': {
Expand Down Expand Up @@ -2470,14 +2491,20 @@ int main(int argc, char **argv) {
}
break;
}
case 'r':
config.rate = strtoul(optarg, nullptr, 10);
if (config.rate == 0) {
case 'r': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-r: bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
if (n == 0) {
std::cerr << "-r: the rate at which connections are made "
<< "must be positive." << std::endl;
exit(EXIT_FAILURE);
}
config.rate = n;
break;
}
case 'T':
config.conn_active_timeout = util::parse_duration_with_unit(optarg);
if (!std::isfinite(config.conn_active_timeout)) {
Expand Down
66 changes: 43 additions & 23 deletions src/nghttp.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2832,33 +2832,43 @@ int main(int argc, char **argv) {
break;
}
switch (c) {
case 'M':
case 'M': {
// peer-max-concurrent-streams option
config.peer_max_concurrent_streams = strtoul(optarg, nullptr, 10);
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-M: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.peer_max_concurrent_streams = n;
break;
}
case 'O':
config.remote_name = true;
break;
case 'h':
print_help(std::cout);
exit(EXIT_SUCCESS);
case 'b':
config.padding = strtol(optarg, nullptr, 10);
case 'b': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-b: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.padding = n;
break;
}
case 'n':
config.null_out = true;
break;
case 'p': {
errno = 0;
auto n = strtoul(optarg, nullptr, 10);
if (errno == 0 && NGHTTP2_MIN_WEIGHT <= n && n <= NGHTTP2_MAX_WEIGHT) {
config.weight.push_back(n);
} else {
auto n = util::parse_uint(optarg);
if (n == -1 || NGHTTP2_MIN_WEIGHT > n || n > NGHTTP2_MAX_WEIGHT) {
std::cerr << "-p: specify the integer in the range ["
<< NGHTTP2_MIN_WEIGHT << ", " << NGHTTP2_MAX_WEIGHT
<< "], inclusive" << std::endl;
exit(EXIT_FAILURE);
}
config.weight.push_back(n);
break;
}
case 'r':
Expand All @@ -2884,21 +2894,18 @@ int main(int argc, char **argv) {
break;
case 'w':
case 'W': {
errno = 0;
char *endptr = nullptr;
unsigned long int n = strtoul(optarg, &endptr, 10);
if (errno == 0 && *endptr == '\0' && n < 31) {
if (c == 'w') {
config.window_bits = n;
} else {
config.connection_window_bits = n;
}
} else {
auto n = util::parse_uint(optarg);
if (n == -1 || n > 30) {
std::cerr << "-" << static_cast<char>(c)
<< ": specify the integer in the range [0, 30], inclusive"
<< std::endl;
exit(EXIT_FAILURE);
}
if (c == 'w') {
config.window_bits = n;
} else {
config.connection_window_bits = n;
}
break;
}
case 'H': {
Expand Down Expand Up @@ -2939,9 +2946,15 @@ int main(int argc, char **argv) {
case 'd':
config.datafile = optarg;
break;
case 'm':
config.multiply = strtoul(optarg, nullptr, 10);
case 'm': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-m: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.multiply = n;
break;
}
case 'c': {
auto n = util::parse_uint_with_unit(optarg);
if (n == -1) {
Expand Down Expand Up @@ -3025,10 +3038,17 @@ int main(int argc, char **argv) {
// no-push option
config.no_push = true;
break;
case 12:
case 12: {
// max-concurrent-streams option
config.max_concurrent_streams = strtoul(optarg, nullptr, 10);
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "--max-concurrent-streams: Bad option value: " << optarg
<< std::endl;
exit(EXIT_FAILURE);
}
config.max_concurrent_streams = n;
break;
}
case 13:
// expect-continue option
config.expect_continue = true;
Expand Down
33 changes: 22 additions & 11 deletions src/nghttpd.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,15 @@ int main(int argc, char **argv) {
case 'V':
config.verify_client = true;
break;
case 'b':
config.padding = strtol(optarg, nullptr, 10);
case 'b': {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-b: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.padding = n;
break;
}
case 'd':
config.htdocs = optarg;
break;
Expand All @@ -274,13 +280,12 @@ int main(int argc, char **argv) {
std::cerr << "-n: WARNING: Threading disabled at build time, "
<< "no threads created." << std::endl;
#else
char *end;
errno = 0;
config.num_worker = strtoul(optarg, &end, 10);
if (errno == ERANGE || *end != '\0' || config.num_worker == 0) {
auto n = util::parse_uint(optarg);
if (n == -1) {
std::cerr << "-n: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE);
}
config.num_worker = n;
#endif // NOTHREADS
break;
}
Expand Down Expand Up @@ -311,10 +316,8 @@ int main(int argc, char **argv) {
break;
case 'w':
case 'W': {
char *endptr;
errno = 0;
auto n = strtoul(optarg, &endptr, 10);
if (errno != 0 || *endptr != '\0' || n >= 31) {
auto n = util::parse_uint(optarg);
if (n == -1 || n > 30) {
std::cerr << "-" << static_cast<char>(c)
<< ": specify the integer in the range [0, 30], inclusive"
<< std::endl;
Expand Down Expand Up @@ -432,7 +435,15 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}

config.port = strtol(argv[optind++], nullptr, 10);
{
auto portStr = argv[optind++];
auto n = util::parse_uint(portStr);
if (n == -1 || n > std::numeric_limits<uint16_t>::max()) {
std::cerr << "<PORT>: Bad value: " << portStr << std::endl;
exit(EXIT_FAILURE);
}
config.port = n;
}

if (!config.no_tls) {
config.private_key_file = argv[optind++];
Expand Down
20 changes: 0 additions & 20 deletions src/shrpx_config.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,26 +423,6 @@ int parse_uint_with_unit(T *dest, const StringRef &opt,
}
} // namespace

// Parses |optarg| as signed integer. This requires |optarg| to be
// NULL-terminated string.
template <typename T>
int parse_int(T *dest, const StringRef &opt, const char *optarg) {
char *end = nullptr;

errno = 0;

auto val = strtol(optarg, &end, 10);

if (!optarg[0] || errno != 0 || *end) {
LOG(ERROR) << opt << ": bad value. Specify an integer.";
return -1;
}

*dest = val;

return 0;
}

namespace {
int parse_altsvc(AltSvc &altsvc, const StringRef &opt,
const StringRef &optarg) {
Expand Down

0 comments on commit 179ecf7

Please sign in to comment.