Split ByteBuffer into writer/reader objects.

webrtc/p2p/base/relayserver.cc

 /*
  *  Copyright 2004 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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 28 matching lines @@
                   << " bytes";
   } else if (result < 0) {
     LOG_ERR(LS_ERROR) << "SendTo";
   }
 }
 
 // Sends the given STUN message on the given socket.
 void SendStun(const StunMessage& msg,
               rtc::AsyncPacketSocket* socket,
               const rtc::SocketAddress& addr) {
-  rtc::ByteBuffer buf;
+  rtc::ByteBufferWriter buf;
   msg.Write(&buf);
   Send(socket, buf.Data(), buf.Length(), addr);
 }
 
 // Constructs a STUN error response and sends it on the given socket.
 void SendStunError(const StunMessage& msg, rtc::AsyncPacketSocket* socket,
                    const rtc::SocketAddress& remote_addr, int error_code,
                    const char* error_desc, const std::string& magic_cookie) {
   RelayMessage err_msg;
   err_msg.SetType(GetStunErrorResponseType(msg.type()));
@@ skipping 182 matching lines @@
             ext_conn->addr_pair().source());
     ASSERT(int_conn != NULL);
     int_conn->Send(bytes, size, ext_conn->addr_pair().source());
     ext_conn->Lock();  // allow outgoing packets
     return;
   }
 
   // The first packet should always be a STUN / TURN packet.  If it isn't, then
   // we should just ignore this packet.
   RelayMessage msg;
-  rtc::ByteBuffer buf(bytes, size);
+  rtc::ByteBufferReader buf(bytes, size);
   if (!msg.Read(&buf)) {
     LOG(LS_WARNING) << "Dropping packet: first packet not STUN";
     return;
   }
 
   // The initial packet should have a username (which identifies the binding).
   const StunByteStringAttribute* username_attr =
       msg.GetByteString(STUN_ATTR_USERNAME);
   if (!username_attr) {
     LOG(LS_WARNING) << "Dropping packet: no username";
@@ skipping 28 matching lines @@
   ASSERT(int_conn != NULL);
   int_conn->Send(bytes, size, ext_conn->addr_pair().source());
 }
 
 bool RelayServer::HandleStun(
     const char* bytes, size_t size, const rtc::SocketAddress& remote_addr,
     rtc::AsyncPacketSocket* socket, std::string* username,
     StunMessage* msg) {
 
   // Parse this into a stun message. Eat the message if this fails.
-  rtc::ByteBuffer buf(bytes, size);
+  rtc::ByteBufferReader buf(bytes, size);
   if (!msg->Read(&buf)) {
     return false;
   }
 
   // The initial packet should have a username (which identifies the binding).
   const StunByteStringAttribute* username_attr =
       msg->GetByteString(STUN_ATTR_USERNAME);
   if (!username_attr) {
     SendStunError(*msg, socket, remote_addr, 432, "Missing Username", "");
     return false;
@@ skipping 429 matching lines @@
     } else {
       server_->thread()->PostDelayed(lifetime_, this, MSG_LIFETIME_TIMER);
     }
 
   } else {
     ASSERT(false);
   }
 }
 
 }  // namespace cricket