| Index: webrtc/test/channel_transport/udp_transport_impl.cc
|
| diff --git a/webrtc/test/channel_transport/udp_transport_impl.cc b/webrtc/test/channel_transport/udp_transport_impl.cc
|
| index e16c742c0037698324f173fb59d2e650f4eb2666..d0aa67c5f112002a1087ef473e7880d351c46191 100644
|
| --- a/webrtc/test/channel_transport/udp_transport_impl.cc
|
| +++ b/webrtc/test/channel_transport/udp_transport_impl.cc
|
| @@ -1856,7 +1856,7 @@ int32_t UdpTransportImpl::SendRTPPacketTo(const int8_t* data,
|
| return -1;
|
| }
|
|
|
| -int32_t UdpTransportImpl::SendRTCPPacketTo(const int8_t* data,
|
| +int32_t UdpTransportImpl::SendRtcpTo(const int8_t* data,
|
| size_t length,
|
| const SocketAddress& to)
|
| {
|
| @@ -1902,7 +1902,7 @@ int32_t UdpTransportImpl::SendRTPPacketTo(const int8_t* data,
|
| return -1;
|
| }
|
|
|
| -int32_t UdpTransportImpl::SendRTCPPacketTo(const int8_t* data,
|
| +int32_t UdpTransportImpl::SendRtcpTo(const int8_t* data,
|
| size_t length,
|
| const uint16_t rtcpPort)
|
| {
|
| @@ -1931,18 +1931,18 @@ int32_t UdpTransportImpl::SendRTCPPacketTo(const int8_t* data,
|
| return -1;
|
| }
|
|
|
| -int UdpTransportImpl::SendPacket(const void* data, size_t length) {
|
| +bool UdpTransportImpl::SendRtp(const uint8_t* data, size_t length) {
|
| WEBRTC_TRACE(kTraceStream, kTraceTransport, _id, "%s", __FUNCTION__);
|
|
|
| CriticalSectionScoped cs(_crit);
|
|
|
| if(_destIP[0] == 0)
|
| {
|
| - return -1;
|
| + return false;
|
| }
|
| if(_destPort == 0)
|
| {
|
| - return -1;
|
| + return false;
|
| }
|
|
|
| // Create socket if it hasn't been set up already.
|
| @@ -1980,32 +1980,32 @@ int UdpTransportImpl::SendPacket(const void* data, size_t length) {
|
| "SendPacket() failed to bind RTP socket");
|
| _lastError = retVal;
|
| CloseReceiveSockets();
|
| - return -1;
|
| + return false;
|
| }
|
| }
|
|
|
| if(_ptrSendRtpSocket)
|
| {
|
| return _ptrSendRtpSocket->SendTo((const int8_t*)data, length,
|
| - _remoteRTPAddr);
|
| + _remoteRTPAddr) >= 0;
|
|
|
| } else if(_ptrRtpSocket)
|
| {
|
| return _ptrRtpSocket->SendTo((const int8_t*)data, length,
|
| - _remoteRTPAddr);
|
| + _remoteRTPAddr) >= 0;
|
| }
|
| - return -1;
|
| + return false;
|
| }
|
|
|
| -int UdpTransportImpl::SendRTCPPacket(const void* data, size_t length) {
|
| +bool UdpTransportImpl::SendRtcp(const uint8_t* data, size_t length) {
|
| CriticalSectionScoped cs(_crit);
|
| if(_destIP[0] == 0)
|
| {
|
| - return -1;
|
| + return false;
|
| }
|
| if(_destPortRTCP == 0)
|
| {
|
| - return -1;
|
| + return false;
|
| }
|
|
|
| // Create socket if it hasn't been set up already.
|
| @@ -2041,22 +2041,22 @@ int UdpTransportImpl::SendRTCPPacket(const void* data, size_t length) {
|
| {
|
| _lastError = retVal;
|
| WEBRTC_TRACE(kTraceError, kTraceTransport, _id,
|
| - "SendRTCPPacket() failed to bind RTCP socket");
|
| + "SendRtcp() failed to bind RTCP socket");
|
| CloseReceiveSockets();
|
| - return -1;
|
| + return false;
|
| }
|
| }
|
|
|
| if(_ptrSendRtcpSocket)
|
| {
|
| return _ptrSendRtcpSocket->SendTo((const int8_t*)data, length,
|
| - _remoteRTCPAddr);
|
| + _remoteRTCPAddr) >= 0;
|
| } else if(_ptrRtcpSocket)
|
| {
|
| return _ptrRtcpSocket->SendTo((const int8_t*)data, length,
|
| - _remoteRTCPAddr);
|
| + _remoteRTCPAddr) >= 0;
|
| }
|
| - return -1;
|
| + return false;
|
| }
|
|
|
| int32_t UdpTransportImpl::SetSendIP(const char* ipaddr)
|
|
|