diff --git a/src/modules/udp_transport/source/udp_socket2_manager_windows.cc b/src/modules/udp_transport/source/udp_socket2_manager_windows.cc index 0356331bdd..8a08057c77 100644 --- a/src/modules/udp_transport/source/udp_socket2_manager_windows.cc +++ b/src/modules/udp_transport/source/udp_socket2_manager_windows.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -591,7 +591,7 @@ WebRtc_Word32 UdpSocket2WorkerWindows::Init() { if(!_init) { - const WebRtc_Word8* threadName = "UdpSocket2ManagerWindows_thread"; + const char* threadName = "UdpSocket2ManagerWindows_thread"; _pThread = ThreadWrapper::CreateThread(Run, this, kRealtimePriority, threadName); if(_pThread == NULL) diff --git a/src/modules/udp_transport/source/udp_socket2_windows.cc b/src/modules/udp_transport/source/udp_socket2_windows.cc index 32e3598d08..d7a3736302 100644 --- a/src/modules/udp_transport/source/udp_socket2_windows.cc +++ b/src/modules/udp_transport/source/udp_socket2_windows.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -163,7 +163,7 @@ UdpSocket2Windows::UdpSocket2Windows(const WebRtc_Word32 id, // This is done by setting SO_SNDBUF to 0. WebRtc_Word32 nZero = 0; WebRtc_Word32 nRet = setsockopt(_socket, SOL_SOCKET, SO_SNDBUF, - (WebRtc_Word8*)&nZero, sizeof(nZero)); + (char*)&nZero, sizeof(nZero)); if( nRet == SOCKET_ERROR ) { WEBRTC_TRACE( @@ -269,7 +269,8 @@ bool UdpSocket2Windows::SetSockopt(WebRtc_Word32 level, WebRtc_Word32 optname, { return false; } - if(0 != setsockopt(_socket, level, optname, optval, optlen )) + if(0 != setsockopt(_socket, level, optname, + reinterpret_cast(optval), optlen )) { WEBRTC_TRACE(kTraceError, kTraceTransport, _id, "UdpSocket2Windows::SetSockopt(), WSAerror:%d", @@ -548,7 +549,10 @@ void UdpSocket2Windows::IOCompleted(PerIoContext* pIOContext, _ptrCbRWLock->AcquireLockShared(); if(_wantsIncoming && _incomingCb) { - _incomingCb(_obj,pIOContext->wsabuf.buf, ioSize, + _incomingCb(_obj, + reinterpret_cast( + pIOContext->wsabuf.buf), + ioSize, &pIOContext->from); } _ptrCbRWLock->ReleaseLockShared(); @@ -697,7 +701,8 @@ void UdpSocket2Windows::CloseBlocking() if(AquireSocket()) { setsockopt(_socket, SOL_SOCKET, SO_LINGER, - (WebRtc_Word8 *)&lingerStruct, sizeof(lingerStruct)); + reinterpret_cast(&lingerStruct), + sizeof(lingerStruct)); ReleaseSocket(); } @@ -823,7 +828,7 @@ bool UdpSocket2Windows::SetQos(WebRtc_Word32 serviceType, } Qos.ProviderSpecific.len = QosDestaddr.ObjectHdr.ObjectLength; - Qos.ProviderSpecific.buf = (WebRtc_Word8*)&QosDestaddr; + Qos.ProviderSpecific.buf = (char*)&QosDestaddr; } if(AquireSocket()) @@ -1015,7 +1020,7 @@ WebRtc_Word32 UdpSocket2Windows::SetTrafficControl( ((WebRtc_Word8 *)oneinterface + oneinterface->Length)) { - WebRtc_Word8 interfaceName[500]; + char interfaceName[500]; WideCharToMultiByte(CP_ACP, 0, oneinterface->pInterfaceName, -1, interfaceName, sizeof(interfaceName), 0, 0 ); diff --git a/src/modules/udp_transport/source/udp_socket_manager_windows.cc b/src/modules/udp_transport/source/udp_socket_manager_windows.cc index d817d74a78..66862f8e80 100644 --- a/src/modules/udp_transport/source/udp_socket_manager_windows.cc +++ b/src/modules/udp_transport/source/udp_socket_manager_windows.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -18,7 +18,7 @@ UdpSocketManagerWindows::UdpSocketManagerWindows() : UdpSocketManager(), _id(-1) { - const WebRtc_Word8* threadName = "UdpSocketManagerWindows_Thread"; + const char* threadName = "UdpSocketManagerWindows_Thread"; _critSectList = CriticalSectionWrapper::CreateCriticalSection(); _thread = ThreadWrapper::CreateThread(UdpSocketManagerWindows::Run, this, kRealtimePriority, threadName); diff --git a/src/modules/udp_transport/source/udp_socket_posix.cc b/src/modules/udp_transport/source/udp_socket_posix.cc index 9d3564d59d..69dc0996aa 100644 --- a/src/modules/udp_transport/source/udp_socket_posix.cc +++ b/src/modules/udp_transport/source/udp_socket_posix.cc @@ -178,7 +178,9 @@ bool UdpSocketPosix::ValidHandle() void UdpSocketPosix::HasIncoming() { - char buf[2048]; + // replace 2048 with a mcro define and figure out + // where 2048 comes from + WebRtc_Word8 buf[2048]; int retval; SocketAddress from; #if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC) @@ -211,7 +213,7 @@ void UdpSocketPosix::HasIncoming() default: if(_wantsIncoming && _incomingCb) { - _incomingCb(_obj,buf, retval, &from); + _incomingCb(_obj, buf, retval, &from); } break; } diff --git a/src/modules/udp_transport/source/udp_socket_windows.cc b/src/modules/udp_transport/source/udp_socket_windows.cc index 05381e1d09..33d0d202a4 100644 --- a/src/modules/udp_transport/source/udp_socket_windows.cc +++ b/src/modules/udp_transport/source/udp_socket_windows.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -76,7 +76,7 @@ public: } SocketAddress _remoteAddr; - WebRtc_Word8 _buffer[MAX_PACKET_SIZE]; + char _buffer[MAX_PACKET_SIZE]; WebRtc_Word32 _length; }; @@ -214,7 +214,8 @@ bool UdpSocketWindows::SetSockopt(WebRtc_Word32 level, WebRtc_Word32 optname, const WebRtc_Word8* optval, WebRtc_Word32 optlen) { - if(0 == setsockopt(_socket, level, optname, optval, optlen)) + if(0 == setsockopt(_socket, level, optname, + reinterpret_cast(optval), optlen)) { return true; } @@ -256,7 +257,7 @@ WebRtc_Word32 UdpSocketWindows::SendTo(const WebRtc_Word8* buf, } WebRtc_Word32 retVal; - retVal = sendto(_socket, buf, len, 0, + retVal = sendto(_socket, reinterpret_cast(buf), len, 0, reinterpret_cast(&to), sizeof(SocketAddress)); @@ -276,10 +277,11 @@ WebRtc_Word32 UdpSocketWindows::SendTo(const WebRtc_Word8* buf, void UdpSocketWindows::HasIncoming() { - WebRtc_Word8 buf[MAX_PACKET_SIZE]; + char buf[MAX_PACKET_SIZE]; SocketAddress from; int fromlen = sizeof(from); - WebRtc_Word32 retval = recvfrom(_socket,buf, sizeof(buf), 0, + WebRtc_Word32 retval = recvfrom(_socket, buf, + sizeof(buf), 0, reinterpret_cast(&from), &fromlen); @@ -293,7 +295,8 @@ void UdpSocketWindows::HasIncoming() break; default: if(_wantsIncoming && _incomingCb) - _incomingCb(_obj,buf, retval, &from); + _incomingCb(_obj, reinterpret_cast(buf), + retval, &from); break; } } @@ -362,7 +365,7 @@ void UdpSocketWindows::SetWritable() break; } if(sendto( - _socket,packet->_buffer, + _socket, packet->_buffer, packet->_length, 0, reinterpret_cast( @@ -445,7 +448,7 @@ bool UdpSocketWindows::SetQos(WebRtc_Word32 serviceType, QosDestaddr->SocketAddress = (SOCKADDR*)&stRemName; QosDestaddr->SocketAddressLength = sizeof(SocketAddress); Qos.ProviderSpecific.len = QosDestaddr->ObjectHdr.ObjectLength; - Qos.ProviderSpecific.buf = (WebRtc_Word8*)p; + Qos.ProviderSpecific.buf = (char*)p; // Socket must be bound for this call to be successfull. If socket is not // bound WSAGetLastError() will return 10022. @@ -604,7 +607,7 @@ WebRtc_Word32 UdpSocketWindows::SetTOSByte(WebRtc_Word32 serviceType, ((WebRtc_Word8*)oneinterface + oneinterface->Length)) { - WebRtc_Word8 interfaceName[500]; + char interfaceName[500]; WideCharToMultiByte(CP_ACP, 0, oneinterface->pInterfaceName, -1, interfaceName, sizeof(interfaceName), 0, 0); diff --git a/src/modules/udp_transport/source/udp_transport_impl.cc b/src/modules/udp_transport/source/udp_transport_impl.cc index 9ce2d926c0..b8eb1420b7 100644 --- a/src/modules/udp_transport/source/udp_transport_impl.cc +++ b/src/modules/udp_transport/source/udp_transport_impl.cc @@ -2763,7 +2763,7 @@ WebRtc_Word32 UdpTransport::IPAddress(const SocketAddress& address, if(address._sockaddr_storage.sin_family == AF_INET) { // Parse IP assuming format "a.b.c.d:port". - WebRtc_Word8* ipEnd = strchr(ip,':'); + char* ipEnd = strchr(ip,':'); if(ipEnd != NULL) { *ipEnd = '\0'; @@ -2778,7 +2778,7 @@ WebRtc_Word32 UdpTransport::IPAddress(const SocketAddress& address, else { // Parse IP assuming format "[address]:port". - WebRtc_Word8* ipEnd = strchr(ip,']'); + char* ipEnd = strchr(ip,']'); if(ipEnd != NULL) { // Calculate length