Swiftdiff options
| author | dknn <yoann.blein@free.fr> | 2012-08-04 09:13:14 (GMT) |
|---|---|---|
| committer | dknn <yoann.blein@free.fr> | 2012-09-22 09:01:49 (GMT) |
| commit | 5ed2b62239eda07de84142e63fad31ccc194d379 (patch) | |
| tree | 47d7dd469b7f637ee125371d267eaae17a6978a7 /Swiften/ScreenSharing/RTPSessionImpl.cpp | |
| parent | 292967c02ffc2ff0b53df526af2965a03916290c (diff) | |
| download | swift-contrib-5ed2b62239eda07de84142e63fad31ccc194d379.zip swift-contrib-5ed2b62239eda07de84142e63fad31ccc194d379.tar.bz2 | |
Fix bug with ipv6 + add new feature in disco
Diffstat (limited to 'Swiften/ScreenSharing/RTPSessionImpl.cpp')
| -rw-r--r-- | Swiften/ScreenSharing/RTPSessionImpl.cpp | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/Swiften/ScreenSharing/RTPSessionImpl.cpp b/Swiften/ScreenSharing/RTPSessionImpl.cpp index bbd3d72..922ffa2 100644 --- a/Swiften/ScreenSharing/RTPSessionImpl.cpp +++ b/Swiften/ScreenSharing/RTPSessionImpl.cpp @@ -20,11 +20,20 @@ #include <rtppacket.h> #include <rtpsourcedata.h> #include <rtpsessionparams.h> +#include <rtpipv4address.h> +#include <rtpipv6address.h> + +#include <arpa/inet.h> namespace Swift { Sender::Sender(boost::shared_ptr<UDPSocket> udpSocket) - : udpSocket(udpSocket) { + : udpSocket(udpSocket), jRTPLocalAddress(RTPSessionImpl::nativeAddressToJRTPAddress(udpSocket->getLocalAddress())) { +} + +Sender::~Sender() +{ + delete jRTPLocalAddress; } bool Sender::SendRTP(const void *data, size_t len) { @@ -38,7 +47,7 @@ bool Sender::SendRTCP(const void* data, size_t len) { } bool Sender::ComesFromThisSender (const jrtplib::RTPAddress* address) { - return RTPSessionImpl::nativeAddressToJRTPAddress(udpSocket->getLocalAddress()).IsSameAddress(address); + return jRTPLocalAddress->IsSameAddress(address); } void Sender::send(const void* data, size_t len) { @@ -46,7 +55,7 @@ void Sender::send(const void* data, size_t len) { udpSocket->send(SafeByteArray(uint8Data, uint8Data + len)); } -RTPSessionImpl::RTPSessionImpl(boost::shared_ptr<UDPSocket> udpSocket, const RTPPayloadType &payloadType) +RTPSessionImpl::RTPSessionImpl(boost::shared_ptr<UDPSocket> udpSocket, const RTPPayloadType& payloadType) : udpSocket(udpSocket), payloadType(payloadType), jRTPRemotePeer(nativeAddressToJRTPAddress(udpSocket->getRemoteAddress())), sender(udpSocket) { jrtplib::RTPExternalTransmissionParams transparams(&sender, 0); @@ -64,6 +73,7 @@ RTPSessionImpl::RTPSessionImpl(boost::shared_ptr<UDPSocket> udpSocket, const RTP RTPSessionImpl::~RTPSessionImpl() { + delete jRTPRemotePeer; } void RTPSessionImpl::poll() @@ -74,7 +84,7 @@ void RTPSessionImpl::poll() void RTPSessionImpl::checkIncomingPackets() { // session.BeginDataAccess(); // useless without threading - if (session.GotoFirstSourceWithData() && session.GetCurrentSourceInfo()->GetRTPDataAddress()->IsSameAddress(&jRTPRemotePeer)) { + if (session.GotoFirstSourceWithData() && session.GetCurrentSourceInfo()->GetRTPDataAddress()->IsSameAddress(jRTPRemotePeer)) { do { jrtplib::RTPPacket *pack; while ((pack = session.GetNextPacket()) != NULL) { @@ -94,7 +104,7 @@ void RTPSessionImpl::sendPacket(const SafeByteArray& data, int timestampinc, boo void RTPSessionImpl::injectData(const SafeByteArray& data) { - packetInjecter->InjectRTPorRTCP((void*)(data.data()), data.size(), jRTPRemotePeer); + packetInjecter->InjectRTPorRTCP((void*)(data.data()), data.size(), *jRTPRemotePeer); checkIncomingPackets(); poll(); } @@ -122,18 +132,29 @@ void RTPSessionImpl::handleDataRead(boost::shared_ptr<SafeByteArray> data) injectData(*data); } -jrtplib::RTPIPv4Address RTPSessionImpl::nativeAddressToJRTPAddress(const HostAddressPort& hostAddressPort) +jrtplib::RTPAddress* RTPSessionImpl::nativeAddressToJRTPAddress(const HostAddressPort& hostAddressPort) { - // Split address - std::vector<std::string> subStrings; + jrtplib::RTPAddress* jrtpAddress = 0; std::string ipAddress = hostAddressPort.getAddress().toString(); - boost::algorithm::split(subStrings, ipAddress, boost::is_any_of(".")); - // Cast sub strings array to array of byte - uint8_t ipNumbers[4]; - for (int i = 0; i < std::min(4, (int)subStrings.size()); ++i) - ipNumbers[i] = boost::numeric_cast<uint8_t>(boost::lexical_cast<int>(subStrings[i])); - - return jrtplib::RTPIPv4Address(ipNumbers, boost::numeric_cast<uint16_t>(hostAddressPort.getPort())); + uint16_t port = boost::numeric_cast<uint16_t>(hostAddressPort.getPort()); + + if (hostAddressPort.getAddress().getRawAddress().is_v4()) { + // Split address + std::vector<std::string> subStrings; + boost::algorithm::split(subStrings, ipAddress, boost::is_any_of(".")); + // Cast sub strings array to array of byte + uint8_t ipNumbers[4]; + for (int i = 0; i < std::min(4, (int)subStrings.size()); ++i) + ipNumbers[i] = boost::numeric_cast<uint8_t>(boost::lexical_cast<int>(subStrings[i])); + + jrtpAddress = new jrtplib::RTPIPv4Address(ipNumbers, port); + } + else if (hostAddressPort.getAddress().getRawAddress().is_v6()) { + in6_addr addr; + inet_pton(AF_INET6, ipAddress.c_str(), &addr); + jrtpAddress = new jrtplib::RTPIPv6Address(addr, port); + } + return jrtpAddress; } } |