diff options
Diffstat (limited to 'apps/hiperf/src')
-rw-r--r-- | apps/hiperf/src/common.h | 10 | ||||
-rw-r--r-- | apps/hiperf/src/main.cc | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/apps/hiperf/src/common.h b/apps/hiperf/src/common.h index 5143afe31..29cc05c71 100644 --- a/apps/hiperf/src/common.h +++ b/apps/hiperf/src/common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Cisco and/or its affiliates. + * Copyright (c) 2021-2022 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -178,11 +178,13 @@ class PayloadSize { bool ah = false) { switch (prefix.getAddressFamily()) { case AF_INET: - return ah ? HF_INET_TCP_AH : HF_INET_TCP; + return ah ? HICN_PACKET_FORMAT_IPV4_TCP_AH + : HICN_PACKET_FORMAT_IPV4_TCP; case AF_INET6: - return ah ? HF_INET6_TCP_AH : HF_INET6_TCP; + return ah ? HICN_PACKET_FORMAT_IPV6_TCP_AH + : HICN_PACKET_FORMAT_IPV6_TCP; default: - return HF_UNSPEC; + return HICN_PACKET_FORMAT_NONE; } } diff --git a/apps/hiperf/src/main.cc b/apps/hiperf/src/main.cc index 85cadd677..74724209b 100644 --- a/apps/hiperf/src/main.cc +++ b/apps/hiperf/src/main.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Cisco and/or its affiliates. + * Copyright (c) 2021-2022 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -33,7 +33,7 @@ void usage() { std::cerr << "-f\t<filename>\t\t\t" << "Log file" << std::endl; std::cerr << "-z\t<io_module>\t\t\t" - << "IO module to use. Default: hicnlightng_module" << std::endl; + << "IO module to use. Default: hicnlight_module" << std::endl; std::cerr << "-F\t<conf_file>\t\t\t" << "Path to optional configuration file for libtransport" << std::endl; @@ -214,7 +214,7 @@ int main(int argc, char *argv[]) { char *log_file = nullptr; transport::interface::global_config::IoModuleConfiguration config; std::string conf_file; - config.name = "hicnlightng_module"; + config.name = "hicnlight_module"; // Consumer ClientConfiguration client_configuration; @@ -290,8 +290,8 @@ int main(int argc, char *argv[]) { break; } case 'w': { - client_configuration.packet_format_ = Packet::Format::HF_INET6_UDP; - server_configuration.packet_format_ = Packet::Format::HF_INET6_UDP; + client_configuration.packet_format_ = HICN_PACKET_FORMAT_IPV6_UDP; + server_configuration.packet_format_ = HICN_PACKET_FORMAT_IPV6_UDP; break; } case 'k': { |