From 564dfea33b993c3ff6572894ef35f91ba37d23ed Mon Sep 17 00:00:00 2001 From: michele papalini Date: Mon, 15 Apr 2019 15:22:26 +0200 Subject: [HICN-171] remove RTCP from the RTC socket Change-Id: I1e088c782ba727131ddd71ffe1fb1d8edd2cdec2 Signed-off-by: michele papalini --- .../src/hicn/transport/interfaces/CMakeLists.txt | 4 +-- .../transport/interfaces/rtc_socket_consumer.cc | 38 ---------------------- .../transport/interfaces/rtc_socket_consumer.h | 37 --------------------- 3 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc delete mode 100644 libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h (limited to 'libtransport/src/hicn/transport/interfaces') diff --git a/libtransport/src/hicn/transport/interfaces/CMakeLists.txt b/libtransport/src/hicn/transport/interfaces/CMakeLists.txt index 2ff4fda56..a5cca78a6 100644 --- a/libtransport/src/hicn/transport/interfaces/CMakeLists.txt +++ b/libtransport/src/hicn/transport/interfaces/CMakeLists.txt @@ -17,7 +17,6 @@ list(APPEND HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/socket.h ${CMAKE_CURRENT_SOURCE_DIR}/socket_consumer.h ${CMAKE_CURRENT_SOURCE_DIR}/socket_producer.h - ${CMAKE_CURRENT_SOURCE_DIR}/rtc_socket_consumer.h ${CMAKE_CURRENT_SOURCE_DIR}/rtc_socket_producer.h ${CMAKE_CURRENT_SOURCE_DIR}/publication_options.h ${CMAKE_CURRENT_SOURCE_DIR}/socket_options_default_values.h @@ -26,11 +25,10 @@ list(APPEND HEADER_FILES ) list(APPEND SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rtc_socket_consumer.cc ${CMAKE_CURRENT_SOURCE_DIR}/rtc_socket_producer.cc ${CMAKE_CURRENT_SOURCE_DIR}/socket_producer.cc ${CMAKE_CURRENT_SOURCE_DIR}/socket_consumer.cc ) set(SOURCE_FILES ${SOURCE_FILES} PARENT_SCOPE) -set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE) \ No newline at end of file +set(HEADER_FILES ${HEADER_FILES} PARENT_SCOPE) diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc deleted file mode 100644 index a24e3883c..000000000 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.cc +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2017-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 - -namespace transport { - -namespace interface { - -RTCConsumerSocket::RTCConsumerSocket(int protocol, asio::io_service &io_service) - : ConsumerSocket(protocol, io_service) {} - -RTCConsumerSocket::RTCConsumerSocket(int protocol) : ConsumerSocket(protocol) {} - -RTCConsumerSocket::~RTCConsumerSocket() {} - -void RTCConsumerSocket::handleRTCPPacket(uint8_t *packet, size_t len) { - RTCTransportProtocol *transport = dynamic_cast( - ConsumerSocket::transport_protocol_.get()); - if (transport) transport->onRTCPPacket(packet, len); -} - -} // namespace interface - -} // end namespace transport diff --git a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h b/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h deleted file mode 100644 index cfde3128d..000000000 --- a/libtransport/src/hicn/transport/interfaces/rtc_socket_consumer.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2017-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 - -namespace transport { - -namespace interface { - -class RTCConsumerSocket : public ConsumerSocket { - public: - explicit RTCConsumerSocket(int protocol, asio::io_service &io_service); - - explicit RTCConsumerSocket(int protocol); - - ~RTCConsumerSocket(); - - void handleRTCPPacket(uint8_t *packet, size_t len); -}; - -} // namespace interface - -} // end namespace transport -- cgit 1.2.3-korg