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/CMakeLists.txt | 2 +- .../includes/hicn/http-proxy/CMakeLists.txt | 2 +- .../hicn/http-proxy/HTTP1.xMessageFastParser.h | 67 ------------- .../hicn/http-proxy/http_1x_message_fast_parser.h | 67 +++++++++++++ .../includes/hicn/http-proxy/http_session.h | 2 +- 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 +- 8 files changed, 177 insertions(+), 182 deletions(-) delete mode 100644 apps/http-proxy/includes/hicn/http-proxy/HTTP1.xMessageFastParser.h create mode 100644 apps/http-proxy/includes/hicn/http-proxy/http_1x_message_fast_parser.h delete mode 100644 apps/http-proxy/src/HTTP1.xMessageFastParser.cc create mode 100644 apps/http-proxy/src/http_1x_message_fast_parser.cc diff --git a/apps/http-proxy/CMakeLists.txt b/apps/http-proxy/CMakeLists.txt index d3155a0d4..d2d02d0dc 100644 --- a/apps/http-proxy/CMakeLists.txt +++ b/apps/http-proxy/CMakeLists.txt @@ -27,7 +27,7 @@ endif () set(LIB_SOURCE_FILES src/http_session.cc src/http_proxy.cc - src/HTTP1.xMessageFastParser.cc + src/http_1x_message_fast_parser.cc src/icn_receiver.cc src/forwarder_interface.cc ) diff --git a/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt b/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt index 5bc7d45fc..75cbbd64b 100644 --- a/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt +++ b/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/forwarder_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/http_proxy.h ${CMAKE_CURRENT_SOURCE_DIR}/http_session.h - ${CMAKE_CURRENT_SOURCE_DIR}/HTTP1.xMessageFastParser.h + ${CMAKE_CURRENT_SOURCE_DIR}/http_1x_message_fast_parser.h ${CMAKE_CURRENT_SOURCE_DIR}/icn_receiver.h ${CMAKE_CURRENT_SOURCE_DIR}/utils.h ) diff --git a/apps/http-proxy/includes/hicn/http-proxy/HTTP1.xMessageFastParser.h b/apps/http-proxy/includes/hicn/http-proxy/HTTP1.xMessageFastParser.h deleted file mode 100644 index 7c035c83b..000000000 --- a/apps/http-proxy/includes/hicn/http-proxy/HTTP1.xMessageFastParser.h +++ /dev/null @@ -1,67 +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. - */ - -#pragma once - -#include - -#include -#include - -using transport::http::HTTPHeaders; - -namespace transport { -struct Metadata; -} - -class HTTPMessageFastParser { - public: - static constexpr char http_ok[] = - "HTTP/1.1 200 OK\r\n" - "Access-Control-Allow-Origin: *\r\n" - "Connection: close\r\n" - "Content-Length: 0\r\n\r\n"; - - static constexpr char http_cors[] = - "HTTP/1.1 200 OK\r\n" - "Date: %s\r\n" - "Connection: close\r\n" - "Content-Length: 0\r\n" - "Access-Control-Allow-Origin: *\r\n" - "Access-Control-Allow-Methods: GET\r\n" - "Access-Control-Allow-Headers: hicn\r\n" - "Access-Control-Max-Age: 1800\r\n\r\n"; - - static constexpr char http_failed[] = - "HTTP/1.1 500 Internal Server Error\r\n" - "Date: %s\r\n" - "Content-Length: 0\r\nConnection: " - "close\r\n\r\n"; - - static void getHeaders(const uint8_t* headers, std::size_t length, - bool request, transport::Metadata* metadata); - static std::size_t hasBody(const uint8_t* headers, std::size_t length); - static bool isMpdRequest(const uint8_t* headers, std::size_t length); - static uint32_t parseCacheControl(const uint8_t* headers, std::size_t length); - - static std::string numbers; - static std::string content_length; - static std::string transfer_encoding; - static std::string chunked; - static std::string cache_control; - static std::string connection; - static std::string mpd; - static std::string separator; -}; diff --git a/apps/http-proxy/includes/hicn/http-proxy/http_1x_message_fast_parser.h b/apps/http-proxy/includes/hicn/http-proxy/http_1x_message_fast_parser.h new file mode 100644 index 000000000..7c035c83b --- /dev/null +++ b/apps/http-proxy/includes/hicn/http-proxy/http_1x_message_fast_parser.h @@ -0,0 +1,67 @@ +/* + * 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. + */ + +#pragma once + +#include + +#include +#include + +using transport::http::HTTPHeaders; + +namespace transport { +struct Metadata; +} + +class HTTPMessageFastParser { + public: + static constexpr char http_ok[] = + "HTTP/1.1 200 OK\r\n" + "Access-Control-Allow-Origin: *\r\n" + "Connection: close\r\n" + "Content-Length: 0\r\n\r\n"; + + static constexpr char http_cors[] = + "HTTP/1.1 200 OK\r\n" + "Date: %s\r\n" + "Connection: close\r\n" + "Content-Length: 0\r\n" + "Access-Control-Allow-Origin: *\r\n" + "Access-Control-Allow-Methods: GET\r\n" + "Access-Control-Allow-Headers: hicn\r\n" + "Access-Control-Max-Age: 1800\r\n\r\n"; + + static constexpr char http_failed[] = + "HTTP/1.1 500 Internal Server Error\r\n" + "Date: %s\r\n" + "Content-Length: 0\r\nConnection: " + "close\r\n\r\n"; + + static void getHeaders(const uint8_t* headers, std::size_t length, + bool request, transport::Metadata* metadata); + static std::size_t hasBody(const uint8_t* headers, std::size_t length); + static bool isMpdRequest(const uint8_t* headers, std::size_t length); + static uint32_t parseCacheControl(const uint8_t* headers, std::size_t length); + + static std::string numbers; + static std::string content_length; + static std::string transfer_encoding; + static std::string chunked; + static std::string cache_control; + static std::string connection; + static std::string mpd; + static std::string separator; +}; diff --git a/apps/http-proxy/includes/hicn/http-proxy/http_session.h b/apps/http-proxy/includes/hicn/http-proxy/http_session.h index 05fdf62fa..f4a3dbdee 100644 --- a/apps/http-proxy/includes/hicn/http-proxy/http_session.h +++ b/apps/http-proxy/includes/hicn/http-proxy/http_session.h @@ -17,7 +17,7 @@ #include -#include "HTTP1.xMessageFastParser.h" +#include "http_1x_message_fast_parser.h" #define ASIO_STANDALONE #include 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