diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-03-23 21:00:43 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-03-23 21:06:32 +0100 |
| commit | f9790f48a9f8c91e0c2142d7030b7e0f27c104f0 (patch) | |
| tree | 658417484024abee41e5f3bbd7da27c2abcc51cc /apps | |
| parent | 1ad06afe9f952642a26f4d28239cf05eb3283eb7 (diff) | |
[HICN-6] ATS fixes
Change-Id: I1e9a214ead9d4d9bacd98d797371783ad39909f7
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/http-proxy/main.cc | 5 | ||||
| -rw-r--r-- | apps/http-proxy/src/ATSConnector.cc | 2 | ||||
| -rw-r--r-- | apps/http-proxy/src/IcnReceiver.cc | 2 | ||||
| -rw-r--r-- | apps/http-server/http-client/http_client.h | 6 |
4 files changed, 6 insertions, 9 deletions
diff --git a/apps/http-proxy/main.cc b/apps/http-proxy/main.cc index 179da452b..0dedbd8a7 100644 --- a/apps/http-proxy/main.cc +++ b/apps/http-proxy/main.cc @@ -46,7 +46,7 @@ int main(int argc, char** argv) { break; case 'h': default: - usage(argv[0]); + return usage(argv[0]); break; } } @@ -57,6 +57,9 @@ int main(int argc, char** argv) { prefix = argv[optind]; } + std::cout << "Connecting to " << ip_address << " port " << port + << " Cache size " << cache_size << " Prefix " << prefix + << std::endl; transport::AsyncConsumerProducer proxy(prefix, ip_address, port, cache_size); proxy.run(); diff --git a/apps/http-proxy/src/ATSConnector.cc b/apps/http-proxy/src/ATSConnector.cc index 81f7a776a..2a2f73c3e 100644 --- a/apps/http-proxy/src/ATSConnector.cc +++ b/apps/http-proxy/src/ATSConnector.cc @@ -161,7 +161,7 @@ void ATSConnector::tryReconnection() { is_reconnection_ = true; io_service_.post([this]() { if (socket_.is_open()) { - socket_.shutdown(asio::ip::tcp::socket::shutdown_type::shutdown_both); + // socket_.shutdown(asio::ip::tcp::socket::shutdown_type::shutdown_both); socket_.close(); } startConnectionTimer(); diff --git a/apps/http-proxy/src/IcnReceiver.cc b/apps/http-proxy/src/IcnReceiver.cc index ee8ef0823..76e2bd10b 100644 --- a/apps/http-proxy/src/IcnReceiver.cc +++ b/apps/http-proxy/src/IcnReceiver.cc @@ -130,7 +130,7 @@ void AsyncConsumerProducer::manageIncomingInterest( HTTPMessageFastParser::isMpdRequest(payload->data(), payload->length()); chunk_number_map_.emplace(name, 0); - response_name_queue_.emplace(std::move(name), is_mpd ? 500 : 10000); + response_name_queue_.emplace(std::move(name), is_mpd ? 1000 : 10000); connector_.send(payload, [packet = std::move(packet)]() {}); } diff --git a/apps/http-server/http-client/http_client.h b/apps/http-server/http-client/http_client.h index 087a061ab..f36c2fa35 100644 --- a/apps/http-server/http-client/http_client.h +++ b/apps/http-server/http-client/http_client.h @@ -17,13 +17,7 @@ #include <string> -#if defined(HICNET) #include <hicn/transport/http/facade.h> -#elif defined(ICNET) -#include <icnet/icnet_http_facade.h> -#else -#error "No ICN tranport library to which link against." -#endif class HTTPClient { public: |