Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / p2p / base / turnserver.cc

diff --git a/src/third_party/libjingle/source/talk/p2p/base/turnserver.cc b/src/third_party/libjingle/source/talk/p2p/base/turnserver.cc
index 0bd903a..4d7f39e 100644 (file)
--- a/src/third_party/libjingle/source/talk/p2p/base/turnserver.cc
+++ b/src/third_party/libjingle/source/talk/p2p/base/turnserver.cc
@@ -57,8 +57,6 @@ static const size_t kNonceSize = 40;
 static const size_t TURN_CHANNEL_HEADER_SIZE = 4U;
 
 // TODO(mallinath) - Move these to a common place.
-static const size_t kMaxPacketSize = 64 * 1024;
-
 inline bool IsTurnChannelData(uint16 msg_type) {
   // The first two bits of a channel data message are 0b01.
   return ((msg_type & 0xC000) == 0x4000);
@@ -566,8 +564,8 @@ void TurnServer::SendStun(Connection* conn, StunMessage* msg) {
 
 void TurnServer::Send(Connection* conn,
                       const talk_base::ByteBuffer& buf) {
-  conn->socket()->SendTo(buf.Data(), buf.Length(), conn->src(),
-                         talk_base::DSCP_NO_CHANGE);
+  talk_base::PacketOptions options;
+  conn->socket()->SendTo(buf.Data(), buf.Length(), conn->src(), options);
 }
 
 void TurnServer::OnAllocationDestroyed(Allocation* allocation) {
@@ -940,7 +938,8 @@ void TurnServer::Allocation::SendErrorResponse(const TurnMessage* req, int code,
 
 void TurnServer::Allocation::SendExternal(const void* data, size_t size,
                                   const talk_base::SocketAddress& peer) {
-  external_socket_->SendTo(data, size, peer, talk_base::DSCP_NO_CHANGE);
+  talk_base::PacketOptions options;
+  external_socket_->SendTo(data, size, peer, options);
 }
 
 void TurnServer::Allocation::OnMessage(talk_base::Message* msg) {