diff options
| author |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-03-26 12:02:23 +0100 |
|---|---|---|
| committer | Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-03-31 11:35:33 +0200 |
| commit | 3718e549ee31ac764b327bbf3d6e51dd7e224b46 (patch) | |
| tree | 5bfc2147e348a5fd4b0291ad458dacf3feececc0 /libtransport/src | |
| parent | 4b36dc3d5dd3ec206aa24d49557c61ae5886be2b (diff) | |
[HICN-581] update hicn stack to support windows, again
Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com>
Change-Id: Ic5cfeae600fde8140a076807fa1e411da1933a02
Diffstat (limited to 'libtransport/src')
| -rw-r--r-- | libtransport/src/core/prefix.cc | 3 | ||||
| -rw-r--r-- | libtransport/src/core/tcp_socket_connector.cc | 2 | ||||
| -rw-r--r-- | libtransport/src/core/udp_socket_connector.cc | 2 | ||||
| -rw-r--r-- | libtransport/src/http/response.cc | 14 |
4 files changed, 10 insertions, 11 deletions
diff --git a/libtransport/src/core/prefix.cc b/libtransport/src/core/prefix.cc index 59898ab70..30f780461 100644 --- a/libtransport/src/core/prefix.cc +++ b/libtransport/src/core/prefix.cc @@ -226,7 +226,7 @@ Name Prefix::getRandomName() const { ip_prefix_.len; size_t size = (size_t)ceil((float)addr_len / 8.0); - uint8_t buffer[size]; + uint8_t *buffer = (uint8_t *) malloc(sizeof(uint8_t) * size); RAND_bytes(buffer, size); @@ -237,6 +237,7 @@ Name Prefix::getRandomName() const { name_ip_buffer[i] = buffer[j]; j++; } + free(buffer); return Name(ip_prefix_.family, (uint8_t *)&name_ip); } diff --git a/libtransport/src/core/tcp_socket_connector.cc b/libtransport/src/core/tcp_socket_connector.cc index 58df8fb08..20b3d6ce6 100644 --- a/libtransport/src/core/tcp_socket_connector.cc +++ b/libtransport/src/core/tcp_socket_connector.cc @@ -15,7 +15,7 @@ #include <core/tcp_socket_connector.h> #ifdef _WIN32 -#include <portability/win_portability.h> +#include <hicn/transport/portability/win_portability.h> #endif #include <hicn/transport/errors/errors.h> diff --git a/libtransport/src/core/udp_socket_connector.cc b/libtransport/src/core/udp_socket_connector.cc index ec59c2e64..f5ddd6270 100644 --- a/libtransport/src/core/udp_socket_connector.cc +++ b/libtransport/src/core/udp_socket_connector.cc @@ -14,7 +14,7 @@ */ #ifdef _WIN32 -#include <portability/win_portability.h> +#include <hicn/transport/portability/win_portability.h> #endif #include <hicn/transport/errors/errors.h> diff --git a/libtransport/src/http/response.cc b/libtransport/src/http/response.cc index ba0acd1ac..409992835 100644 --- a/libtransport/src/http/response.cc +++ b/libtransport/src/http/response.cc @@ -16,8 +16,8 @@ #include <hicn/transport/errors/errors.h> #include <hicn/transport/http/response.h> -#include <experimental/algorithm> -#include <experimental/functional> +#include <algorithm> +#include <functional> #include <cstring> @@ -62,11 +62,9 @@ std::size_t HTTPResponse::parseHeaders(const uint8_t *buffer, std::size_t size, const char *crlf2 = "\r\n\r\n"; const char *begin = (const char *)buffer; const char *end = begin + size; - auto it = - std::experimental::search(begin, end, - std::experimental::make_boyer_moore_searcher( - crlf2, crlf2 + strlen(crlf2))); - + const char *begincrlf2 = (const char *)crlf2; + const char *endcrlf2 = begincrlf2 + strlen(crlf2); + auto it = std::search(begin, end, begincrlf2, endcrlf2); if (it != end) { std::stringstream ss; ss.str(std::string(begin, it)); @@ -135,4 +133,4 @@ const std::string &HTTPResponse::getStatusString() const { } // namespace http -} // namespace transport
\ No newline at end of file +} // namespace transport |