From 83cf128dc041cf2c54ae14845520953d033cdf0c Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 28 Feb 2018 00:00:17 +0100 Subject: [PATCH] qrtplib: removed rtpbyteaddress --- qrtplib/CMakeLists.txt | 2 - qrtplib/rtcpcompoundpacketbuilder.h | 2 - qrtplib/rtpaddress.h | 2 - qrtplib/rtpbyteaddress.cpp | 79 ------------------- qrtplib/rtpbyteaddress.h | 115 ---------------------------- 5 files changed, 200 deletions(-) delete mode 100644 qrtplib/rtpbyteaddress.cpp delete mode 100644 qrtplib/rtpbyteaddress.h diff --git a/qrtplib/CMakeLists.txt b/qrtplib/CMakeLists.txt index 482bb077e..594272c2d 100644 --- a/qrtplib/CMakeLists.txt +++ b/qrtplib/CMakeLists.txt @@ -44,7 +44,6 @@ set (qrtplib_HEADERS rtptypes.h rtpudpv4transmitter.h rtpudpv4transmitternobind.h - rtpbyteaddress.h rtpexternaltransmitter.h rtpsocketutil.h rtpabortdescriptors.h @@ -84,7 +83,6 @@ set(qrtplib_SOURCES rtptimeutilities.cpp rtpudpv4transmitter.cpp rtpudpv4transmitternobind.cpp - rtpbyteaddress.cpp rtpexternaltransmitter.cpp rtpabortdescriptors.cpp rtptcpaddress.cpp diff --git a/qrtplib/rtcpcompoundpacketbuilder.h b/qrtplib/rtcpcompoundpacketbuilder.h index 7eceadb6f..7430d653e 100644 --- a/qrtplib/rtcpcompoundpacketbuilder.h +++ b/qrtplib/rtcpcompoundpacketbuilder.h @@ -49,8 +49,6 @@ namespace qrtplib { -class RTPMemoryManager; - /** This class can be used to construct an RTCP compound packet. * The RTCPCompoundPacketBuilder class can be used to construct an RTCP compound packet. It inherits the member * functions of RTCPCompoundPacket which can be used to access the information in the compound packet once it has diff --git a/qrtplib/rtpaddress.h b/qrtplib/rtpaddress.h index 9ea607aa9..e9d9d9f9d 100644 --- a/qrtplib/rtpaddress.h +++ b/qrtplib/rtpaddress.h @@ -44,8 +44,6 @@ namespace qrtplib { -class RTPMemoryManager; - /** This class is an abstract class which is used to specify destinations, multicast groups etc. */ class RTPAddress { diff --git a/qrtplib/rtpbyteaddress.cpp b/qrtplib/rtpbyteaddress.cpp deleted file mode 100644 index 12819017a..000000000 --- a/qrtplib/rtpbyteaddress.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - - This file is a part of JRTPLIB - Copyright (c) 1999-2017 Jori Liesenborgs - - Contact: jori.liesenborgs@gmail.com - - This library was developed at the Expertise Centre for Digital Media - (http://www.edm.uhasselt.be), a research center of the Hasselt University - (http://www.uhasselt.be). The library is based upon work done for - my thesis at the School for Knowledge Technology (Belgium/The Netherlands). - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. - - */ - -#include "rtpbyteaddress.h" - -namespace qrtplib -{ - -bool RTPByteAddress::IsSameAddress(const RTPAddress *addr) const -{ - if (addr == 0) - return false; - if (addr->GetAddressType() != ByteAddress) - return false; - - const RTPByteAddress *addr2 = (const RTPByteAddress *) addr; - - if (addr2->addresslength != addresslength) - return false; - if (addresslength == 0 || (memcmp(hostaddress, addr2->hostaddress, addresslength) == 0)) - { - if (port == addr2->port) - return true; - } - return false; -} - -bool RTPByteAddress::IsFromSameHost(const RTPAddress *addr) const -{ - if (addr == 0) - return false; - if (addr->GetAddressType() != ByteAddress) - return false; - - const RTPByteAddress *addr2 = (const RTPByteAddress *) addr; - - if (addr2->addresslength != addresslength) - return false; - if (addresslength == 0 || (memcmp(hostaddress, addr2->hostaddress, addresslength) == 0)) - return true; - return false; -} - -RTPAddress *RTPByteAddress::CreateCopy() const -{ - RTPByteAddress *a = new RTPByteAddress(hostaddress, addresslength, port); - return a; -} - -} // end namespace diff --git a/qrtplib/rtpbyteaddress.h b/qrtplib/rtpbyteaddress.h deleted file mode 100644 index 4e40f4356..000000000 --- a/qrtplib/rtpbyteaddress.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - - This file is a part of JRTPLIB - Copyright (c) 1999-2017 Jori Liesenborgs - - Contact: jori.liesenborgs@gmail.com - - This library was developed at the Expertise Centre for Digital Media - (http://www.edm.uhasselt.be), a research center of the Hasselt University - (http://www.uhasselt.be). The library is based upon work done for - my thesis at the School for Knowledge Technology (Belgium/The Netherlands). - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. - - */ - -/** - * \file rtpbyteaddress.h - */ - -#ifndef RTPBYTEADDRESS_H - -#define RTPBYTEADDRESS_H - -#include "rtpconfig.h" -#include "rtpaddress.h" -#include "rtptypes.h" -#include - -#define RTPBYTEADDRESS_MAXLENGTH 128 - -namespace qrtplib -{ - -/** A very general kind of address consisting of a port number and a number of bytes describing the host address. - * A very general kind of address, consisting of a port number and a number of bytes describing the host address. - */ -class RTPByteAddress: public RTPAddress -{ -public: - /** Creates an instance of the class using \c addrlen bytes of \c hostaddress as host identification, - * and using \c port as the port number. */ - RTPByteAddress(const uint8_t hostaddress[RTPBYTEADDRESS_MAXLENGTH], size_t addrlen, uint16_t port = 0) : - RTPAddress(ByteAddress) - { - if (addrlen > RTPBYTEADDRESS_MAXLENGTH) - addrlen = RTPBYTEADDRESS_MAXLENGTH; - memcpy(RTPByteAddress::hostaddress, hostaddress, addrlen); - RTPByteAddress::addresslength = addrlen; - RTPByteAddress::port = port; - } - - /** Sets the host address to the first \c addrlen bytes of \c hostaddress. */ - void SetHostAddress(const uint8_t hostaddress[RTPBYTEADDRESS_MAXLENGTH], size_t addrlen) - { - if (addrlen > RTPBYTEADDRESS_MAXLENGTH) - addrlen = RTPBYTEADDRESS_MAXLENGTH; - memcpy(RTPByteAddress::hostaddress, hostaddress, addrlen); - RTPByteAddress::addresslength = addrlen; - } - - /** Sets the port number to \c port. */ - void SetPort(uint16_t port) - { - RTPByteAddress::port = port; - } - - /** Returns a pointer to the stored host address. */ - const uint8_t *GetHostAddress() const - { - return hostaddress; - } - - /** Returns the length in bytes of the stored host address. */ - size_t GetHostAddressLength() const - { - return addresslength; - } - - /** Returns the port number stored in this instance. */ - uint16_t GetPort() const - { - return port; - } - - RTPAddress *CreateCopy() const; - bool IsSameAddress(const RTPAddress *addr) const; - bool IsFromSameHost(const RTPAddress *addr) const; - -private: - uint8_t hostaddress[RTPBYTEADDRESS_MAXLENGTH]; - size_t addresslength; - uint16_t port; -}; - -} // end namespace - -#endif // RTPBYTEADDRESS_H -