From cb73ef06a552a7b6ecfffb7491216b8c22bce043 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 22 Jun 2020 16:26:58 +0200 Subject: [HICN-630] Modify hicn-proxy file names to respect codestyle for filenames Signed-off-by: Mauro Sardara Change-Id: I49d62aee60f107a4e9722ac3b671d06bdee2b349 --- apps/http-proxy/src/HTTP1.xMessageFastParser.cc | 108 --------------------- apps/http-proxy/src/http_1x_message_fast_parser.cc | 105 ++++++++++++++++++++ apps/http-proxy/src/icn_receiver.cc | 6 +- 3 files changed, 107 insertions(+), 112 deletions(-) delete mode 100644 apps/http-proxy/src/HTTP1.xMessageFastParser.cc create mode 100644 apps/http-proxy/src/http_1x_message_fast_parser.cc (limited to 'apps/http-proxy/src') diff --git a/apps/http-proxy/src/HTTP1.xMessageFastParser.cc b/apps/http-proxy/src/HTTP1.xMessageFastParser.cc deleted file mode 100644 index c22abdc90..000000000 --- a/apps/http-proxy/src/HTTP1.xMessageFastParser.cc +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2019 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: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include -#include - -#include -#include -#include - -#include - -constexpr char HTTPMessageFastParser::http_ok[]; -constexpr char HTTPMessageFastParser::http_cors[]; -constexpr char HTTPMessageFastParser::http_failed[]; - -std::string HTTPMessageFastParser::numbers = "0123456789"; -std::string HTTPMessageFastParser::content_length = "content-length"; -std::string HTTPMessageFastParser::transfer_encoding = "transfer-encoding"; -std::string HTTPMessageFastParser::chunked = "chunked"; -std::string HTTPMessageFastParser::cache_control = "cache-control"; -std::string HTTPMessageFastParser::mpd = "mpd"; -std::string HTTPMessageFastParser::connection = "connection"; -std::string HTTPMessageFastParser::separator = "\r\n\r\n"; - -void HTTPMessageFastParser::getHeaders(const uint8_t *headers, - std::size_t length, bool request, - transport::Metadata *metadata) { - if (request) { - transport::RequestMetadata *_metadata = - (transport::RequestMetadata *)(metadata); - - if (transport::http::HTTPRequest::parseHeaders( - headers, length, _metadata->headers, _metadata->http_version, - _metadata->method, _metadata->path)) { - return; - } - } else { - transport::ResponseMetadata *_metadata = - (transport::ResponseMetadata *)(metadata); - - if (transport::http::HTTPResponse::parseHeaders( - headers, length, _metadata->headers, _metadata->http_version, - _metadata->status_code, _metadata->status_string)) { - return; - } - } - - throw std::runtime_error("Error parsing response headers."); -} - -std::size_t HTTPMessageFastParser::hasBody(const uint8_t *headers, - std::size_t length) { - const char *buffer = reinterpret_cast(headers); - const char *begin = buffer; - const char *end = buffer + length; - - using std::experimental::make_boyer_moore_searcher; - auto it = std::experimental::search( - begin, end, - make_boyer_moore_searcher(content_length.begin(), content_length.end())); - - if (it != end) { - // Read header line - auto it2 = std::find_first_of(it, end, numbers.begin(), numbers.end()); - auto it3 = std::find(it2, end, '\n'); - - return std::stoul(std::string(it2, it3)); - } - - return 0; -} - -bool HTTPMessageFastParser::isMpdRequest(const uint8_t *headers, - std::size_t length) { - const char *buffer = reinterpret_cast(headers); - const char *begin = buffer; - const char *end = buffer + length; - - using std::experimental::make_boyer_moore_searcher; - auto it = std::experimental::search( - begin, end, make_boyer_moore_searcher(mpd.begin(), mpd.end())); - - if (it != end) { - return true; - } - - return false; -} - -uint32_t HTTPMessageFastParser::parseCacheControl(const uint8_t *headers, - std::size_t length) { - return 0; -} diff --git a/apps/http-proxy/src/http_1x_message_fast_parser.cc b/apps/http-proxy/src/http_1x_message_fast_parser.cc new file mode 100644 index 000000000..4b6b78d55 --- /dev/null +++ b/apps/http-proxy/src/http_1x_message_fast_parser.cc @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2019 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: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +#include +#include +#include + +constexpr char HTTPMessageFastParser::http_ok[]; +constexpr char HTTPMessageFastParser::http_cors[]; +constexpr char HTTPMessageFastParser::http_failed[]; + +std::string HTTPMessageFastParser::numbers = "0123456789"; +std::string HTTPMessageFastParser::content_length = "content-length"; +std::string HTTPMessageFastParser::transfer_encoding = "transfer-encoding"; +std::string HTTPMessageFastParser::chunked = "chunked"; +std::string HTTPMessageFastParser::cache_control = "cache-control"; +std::string HTTPMessageFastParser::mpd = "mpd"; +std::string HTTPMessageFastParser::connection = "connection"; +std::string HTTPMessageFastParser::separator = "\r\n\r\n"; + +void HTTPMessageFastParser::getHeaders(const uint8_t *headers, + std::size_t length, bool request, + transport::Metadata *metadata) { + if (request) { + transport::RequestMetadata *_metadata = + (transport::RequestMetadata *)(metadata); + + if (transport::http::HTTPRequest::parseHeaders( + headers, length, _metadata->headers, _metadata->http_version, + _metadata->method, _metadata->path)) { + return; + } + } else { + transport::ResponseMetadata *_metadata = + (transport::ResponseMetadata *)(metadata); + + if (transport::http::HTTPResponse::parseHeaders( + headers, length, _metadata->headers, _metadata->http_version, + _metadata->status_code, _metadata->status_string)) { + return; + } + } + + throw std::runtime_error("Error parsing response headers."); +} + +std::size_t HTTPMessageFastParser::hasBody(const uint8_t *headers, + std::size_t length) { + const char *buffer = reinterpret_cast(headers); + const char *begin = buffer; + const char *end = buffer + length; + + using std::experimental::make_boyer_moore_searcher; + auto it = std::experimental::search( + begin, end, + make_boyer_moore_searcher(content_length.begin(), content_length.end())); + + if (it != end) { + // Read header line + auto it2 = std::find_first_of(it, end, numbers.begin(), numbers.end()); + auto it3 = std::find(it2, end, '\n'); + + return std::stoul(std::string(it2, it3)); + } + + return 0; +} + +bool HTTPMessageFastParser::isMpdRequest(const uint8_t *headers, + std::size_t length) { + const char *buffer = reinterpret_cast(headers); + const char *begin = buffer; + const char *end = buffer + length; + + using std::experimental::make_boyer_moore_searcher; + auto it = std::experimental::search( + begin, end, make_boyer_moore_searcher(mpd.begin(), mpd.end())); + + if (it != end) { + return true; + } + + return false; +} + +uint32_t HTTPMessageFastParser::parseCacheControl(const uint8_t *headers, + std::size_t length) { + return 0; +} diff --git a/apps/http-proxy/src/icn_receiver.cc b/apps/http-proxy/src/icn_receiver.cc index 34b85f9c9..8823907dc 100644 --- a/apps/http-proxy/src/icn_receiver.cc +++ b/apps/http-proxy/src/icn_receiver.cc @@ -13,8 +13,9 @@ * limitations under the License. */ +#include #include - +#include #include #include #include @@ -23,9 +24,6 @@ #include #include -#include -#include - namespace transport { AsyncConsumerProducer::AsyncConsumerProducer( -- cgit 1.2.3-korg