From d22d2b4785e2f4eafc8dda2ae032931f89c7e45f Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 5 Jun 2017 16:48:29 +0200 Subject: - Added new interface between applications and library: - Application retrieve resources using the common HTTP url format. - Translation between network names and application names performed by the library - Added basic error handling - Added utils for http connections - Added support for differetn build types (DEBUG, RELEASE, RELEASE with debug symbols, RELEASE with min size executable) - Added support for iOS Change-Id: I8ba2a5d8bd70a4f7721e1bbc2efe3fb81ed2c98c Signed-off-by: Mauro Sardara --- apps/http/CMakeLists.txt | 31 ++++++++++++++ apps/http/icnet_http_dash_client.cc | 84 +++++++++++++++++++++++++++++++++++++ apps/http/icnet_http_echo_server.cc | 53 +++++++++++++++++++++++ apps/http/icnet_iget.cc | 71 +++++++++++++++++++++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 apps/http/CMakeLists.txt create mode 100644 apps/http/icnet_http_dash_client.cc create mode 100644 apps/http/icnet_http_echo_server.cc create mode 100644 apps/http/icnet_iget.cc (limited to 'apps/http') diff --git a/apps/http/CMakeLists.txt b/apps/http/CMakeLists.txt new file mode 100644 index 00000000..931fe840 --- /dev/null +++ b/apps/http/CMakeLists.txt @@ -0,0 +1,31 @@ +# Copyright (c) 2017 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. + +cmake_minimum_required(VERSION 3.2) + +set(HTTP_CLIENT_SOURCE_FILES icnet_http_dash_client.cc) +set(HTTP_SERVER_SOURCE_FILES icnet_http_echo_server.cc) +set(IGET_SOURCE_FILES icnet_iget.cc) + +add_executable(http-dash-client ${HTTP_CLIENT_SOURCE_FILES}) +add_executable(http-echo-server ${HTTP_SERVER_SOURCE_FILES}) +add_executable(iget ${IGET_SOURCE_FILES}) + + +target_link_libraries(http-dash-client icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) +target_link_libraries(http-echo-server icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) +target_link_libraries(iget icnet ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) + +install(TARGETS http-dash-client DESTINATION bin COMPONENT library) +install(TARGETS iget DESTINATION bin COMPONENT library) +install(TARGETS http-echo-server DESTINATION bin COMPONENT library) \ No newline at end of file diff --git a/apps/http/icnet_http_dash_client.cc b/apps/http/icnet_http_dash_client.cc new file mode 100644 index 00000000..f34b8503 --- /dev/null +++ b/apps/http/icnet_http_dash_client.cc @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2017 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 "icnet_http_client_connection.h" +#include "icnet_utils_daemonizator.h" + +namespace icnet { + +namespace http { + +void usage(int argc, char **argv) { + std::cout << "Usage:" << std::endl; + std::cout << argv[0] << " [-D] " << "[URL]" << std::endl; + exit(EXIT_FAILURE); +} + +int main(int argc, char **argv) { + + std::string name("http://webserver/sintel/18000"); + uint32_t n_segment = 300; + bool daemon = false; + + int opt; + while ((opt = getopt(argc, argv, "Dh")) != -1) { + switch (opt) { + case 'D': + daemon = true; + break; + case 'n': + n_segment = (uint32_t) atoi(optarg); + break; + case 'h': + default: + usage(argc, argv); + } + } + + if (argv[optind] == 0) { + std::cerr << "Using default name " << name << std::endl; + } else { + name = argv[optind]; + } + + if (daemon) { + utils::Daemonizator::daemonize(); + } + + HTTPClientConnection connection; + HTTPResponse response; + + std::stringstream ss; + for (uint32_t i = 1; i < n_segment; i++) { + ss << name; + ss << "/seg_" << i << ".m4s"; + auto str = ss.str(); + connection.get(str); + response = connection.response(); + std::cout << "SIZE: " << response.size() << std::endl; + std::cout << (char *) response.data() << std::endl; + ss.str(""); + } + + return EXIT_SUCCESS; +} + +} + +} + +int main(int argc, char **argv) { + return icnet::http::main(argc, argv); +} \ No newline at end of file diff --git a/apps/http/icnet_http_echo_server.cc b/apps/http/icnet_http_echo_server.cc new file mode 100644 index 00000000..17bdb693 --- /dev/null +++ b/apps/http/icnet_http_echo_server.cc @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2017 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 "icnet_http_server_acceptor.h" + +namespace icnet { + +namespace http { + +void onPayload(std::shared_ptr &publisher, const uint8_t *buffer, std::size_t size) { + + char *string = (char *) buffer; + std::cout << "Received this content:" << std::endl; + std::cout << string << std::endl; + + std::stringstream response; + response << "HTTP/1.0 200 OK\r\n" << "Content-Length: " << size << "\r\n\r\n" << string; + std::string response_string = response.str(); + + std::thread t([publisher, response_string]() { + publisher->publishContent((uint8_t *) response_string.data(), response_string.size(), 0, true); + publisher->serveClients(); + }); + + t.detach(); +} + +int main(int argc, char **argv) { + HTTPServerAcceptor connection(std::string("http://webserver"), onPayload); + connection.listen(false); + + return EXIT_SUCCESS; +} + +} + +} + +int main(int argc, char **argv) { + return icnet::http::main(argc, argv); +} \ No newline at end of file diff --git a/apps/http/icnet_iget.cc b/apps/http/icnet_iget.cc new file mode 100644 index 00000000..d322cc35 --- /dev/null +++ b/apps/http/icnet_iget.cc @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2017 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 "icnet_http_client_connection.h" + +typedef std::chrono::time_point Time; +typedef std::chrono::milliseconds TimeDuration; + +Time t1 = std::chrono::system_clock::now(); + +#define DEFAULT_BETA 0.99 +#define DEFAULT_GAMMA 0.07 + +namespace icnet { + +namespace http { + +void processResponse(std::string &name, HTTPResponse &&response) { + + std::string filename = name.substr(1 + name.find_last_of("/")); + std::cout << "Saving to: " << filename << " " << response.size() / 1024 << "kB" << std::endl; + Time t3 = std::chrono::system_clock::now();; + std::ofstream file(filename.c_str(), std::ofstream::binary); + file.write((char *) response.data(), response.size()); + file.close(); + Time t2 = std::chrono::system_clock::now();; + TimeDuration dt = std::chrono::duration_cast(t2 - t1); + TimeDuration dt3 = std::chrono::duration_cast(t3 - t1); + long msec = dt.count(); + long msec3 = dt3.count(); + std::cout << "Elapsed Time: " << msec / 1000.0 << " seconds -- " << response.size() * 8 / msec / 1000.0 + << "[Mbps] -- " << response.size() * 8 / msec3 / 1000.0 << "[Mbps]" << std::endl; + +} + +int main(int argc, char **argv) { + + std::string name("http://webserver/sintel/mpd"); + + if (argv[optind] == 0) { + std::cerr << "Using default name http://webserver/sintel/mpd" << std::endl; + } else { + name = argv[optind]; + } + + HTTPClientConnection connection; + connection.get(name); + processResponse(name, connection.response()); + + return EXIT_SUCCESS; +} + +} // end namespace http + +} // end namespace hicnet + +int main(int argc, char **argv) { + return icnet::http::main(argc, argv); +} \ No newline at end of file -- cgit 1.2.3-korg