diff options
| author |   Michele Papalini <micpapal@cisco.com> | 2019-03-28 09:35:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-03-28 09:35:25 +0000 |
| commit | 4d480ed760ebf0d8d33d91a6ede67e022106e8f5 (patch) | |
| tree | 0ffa5f7bb12ce597ec573765966402cf70c04ffc | |
| parent | 8471ba9ff149ad9ead3dd8b635c3b9fa182ed429 (diff) | |
| parent | 2d496e60ffdb694aad33b498550aede53392861b (diff) | |
Merge "[HICN-11] Fix segfault in rtc due to typo in variable name."
| -rw-r--r-- | libtransport/src/hicn/transport/protocols/protocol.h | 1 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/protocols/rtc.cc | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libtransport/src/hicn/transport/protocols/protocol.h b/libtransport/src/hicn/transport/protocols/protocol.h index 6911eada5..88889bb8c 100644 --- a/libtransport/src/hicn/transport/protocols/protocol.h +++ b/libtransport/src/hicn/transport/protocols/protocol.h @@ -62,7 +62,6 @@ class TransportProtocol : public interface::BasePortal::ConsumerCallback, std::shared_ptr<interface::BasePortal> portal_; volatile bool is_running_; TransportStatistics stats_; - std::shared_ptr<std::vector<uint8_t>> content_buffer_; }; } // end namespace protocol diff --git a/libtransport/src/hicn/transport/protocols/rtc.cc b/libtransport/src/hicn/transport/protocols/rtc.cc index e07a4042b..a993d596b 100644 --- a/libtransport/src/hicn/transport/protocols/rtc.cc +++ b/libtransport/src/hicn/transport/protocols/rtc.cc @@ -419,7 +419,6 @@ void RTCTransportProtocol::sendInterest() { return; } - using namespace std::placeholders; portal_->sendInterest(std::move(interest)); sentInterest_++; @@ -573,8 +572,9 @@ void RTCTransportProtocol::returnContentToApplication( // return content to the user auto a = content_object.getPayload(); - uint8_t *start = ((uint8_t *)a->data()) + HICN_TIMESTAMP_SIZE; - unsigned size = (unsigned)(a->length() - HICN_TIMESTAMP_SIZE); + a->trimStart(HICN_TIMESTAMP_SIZE); + uint8_t *start = a->writableData(); + unsigned size = (unsigned)a->length(); // set offset between hICN and RTP packets uint16_t rtp_seq = ntohs(*(((uint16_t *)start) + 1)); @@ -582,7 +582,7 @@ void RTCTransportProtocol::returnContentToApplication( std::shared_ptr<std::vector<uint8_t>> content_buffer; socket_->getSocketOption(APPLICATION_BUFFER, content_buffer); - content_buffer->insert(content_buffer_->end(), start, start + size); + content_buffer->insert(content_buffer->end(), start, start + size); ConsumerContentCallback *on_payload = nullptr; socket_->getSocketOption(CONTENT_RETRIEVED, &on_payload); |