summaryrefslogtreecommitdiffstats
path: root/libtransport/src
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-06-24 19:29:50 +0200
committerMauro Sardara <msardara@cisco.com>2019-06-24 19:29:50 +0200
commitc240213705c4aabfc7e292a860baed992f937d43 (patch)
treea3f8de792c547d1828b394f64407b594a2f26081 /libtransport/src
parent7548d3fadc2da9a62b023381f45aa48fa4129ccd (diff)
[HICN-227] Destroy trasnsport protocol object before any other object in consumer socket.
Change-Id: I6545701b9a91b3ae1b06435e9133652ad9466653 Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src')
-rw-r--r--libtransport/src/hicn/transport/interfaces/socket_consumer.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.h b/libtransport/src/hicn/transport/interfaces/socket_consumer.h
index 41646c940..8f7a9718c 100644
--- a/libtransport/src/hicn/transport/interfaces/socket_consumer.h
+++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.h
@@ -801,16 +801,11 @@ class ConsumerSocket : public BaseSocket {
return SOCKET_OPTION_GET;
}
- protected:
- std::unique_ptr<TransportProtocol> transport_protocol_;
-
private:
- // context inner state variables
asio::io_service internal_io_service_;
asio::io_service &io_service_;
std::shared_ptr<Portal> portal_;
-
utils::EventThread async_downloader_;
Name network_name_;
@@ -848,10 +843,8 @@ class ConsumerSocket : public BaseSocket {
ConsumerInterestCallback on_interest_output_;
ConsumerInterestCallback on_interest_timeout_;
ConsumerInterestCallback on_interest_satisfied_;
-
ConsumerContentObjectCallback on_content_object_input_;
ConsumerContentObjectVerificationCallback on_content_object_verification_;
-
ConsumerContentObjectCallback on_content_object_;
ConsumerManifestCallback on_manifest_;
ConsumerTimerCallback stats_summary_;
@@ -859,11 +852,13 @@ class ConsumerSocket : public BaseSocket {
ReadCallback *read_callback_;
// Virtual download for traffic generator
-
bool virtual_download_;
bool rtt_stats_;
uint32_t timer_interval_milliseconds_;
+
+ // Transport protocol
+ std::unique_ptr<TransportProtocol> transport_protocol_;
};
} // namespace interface