Handle case where UDP packet contains multiple DTLS records.

webrtc/p2p/base/fakeicetransport.h

 /*
  *  Copyright 2017 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 143 matching lines @@
   rtc::Optional<int> GetRttEstimate() override {
     return rtc::Optional<int>();
   }
 
   void SetMetricsObserver(webrtc::MetricsObserverInterface* observer) override {
   }
 
   // Fake PacketTransportInternal implementation.
   bool writable() const override { return writable_; }
   bool receiving() const override { return receiving_; }
+  // If combine is enabled, two incoming packets will be combined into one

[Taylor Brandstetter, 2017/07/06 22:06:11]

This comment is a little misleading, since all the packets here are outgoing.

[joachim, 2017/07/07 16:13:00]

Changed.

+  // outgoing packet.
+  void set_combine(bool combine) { combine_ = combine; }

[Taylor Brandstetter, 2017/07/06 22:06:11]

nit: Making this name more descriptive, like "combine_outgoing_packets",
wouldn't hurt.

[joachim, 2017/07/07 16:13:00]

Done.

   int SendPacket(const char* data,
                  size_t len,
                  const rtc::PacketOptions& options,
                  int flags) override {
     if (!dest_) {
       return -1;
     }
-    rtc::CopyOnWriteBuffer packet(data, len);
-    if (async_) {
-      invoker_.AsyncInvokeDelayed<void>(
-          RTC_FROM_HERE, rtc::Thread::Current(),
-          rtc::Bind(&FakeIceTransport::SendPacketInternal, this, packet),
-          async_delay_ms_);
-    } else {
-      SendPacketInternal(packet);
+
+    send_packet_.AppendData(data, len);
+    if (!combine_ || send_packet_.size() > len) {
+      rtc::CopyOnWriteBuffer packet(std::move(send_packet_));
+      if (async_) {
+        invoker_.AsyncInvokeDelayed<void>(
+            RTC_FROM_HERE, rtc::Thread::Current(),
+            rtc::Bind(&FakeIceTransport::SendPacketInternal, this, packet),
+            async_delay_ms_);
+      } else {
+        SendPacketInternal(packet);
+      }
     }
     rtc::SentPacket sent_packet(options.packet_id, rtc::TimeMillis());
     SignalSentPacket(this, sent_packet);
     return static_cast<int>(len);
   }
   int SetOption(rtc::Socket::Option opt, int value) override { return true; }
   bool GetOption(rtc::Socket::Option opt, int* value) override { return true; }
   int GetError() override { return 0; }
 
  private:
@@ skipping 37 matching lines @@
   std::string ice_ufrag_;
   std::string ice_pwd_;
   std::string remote_ice_ufrag_;
   std::string remote_ice_pwd_;
   IceMode remote_ice_mode_ = ICEMODE_FULL;
   size_t connection_count_ = 0;
   IceGatheringState gathering_state_ = kIceGatheringNew;
   bool had_connection_ = false;
   bool writable_ = false;
   bool receiving_ = false;
+  bool combine_ = false;
+  rtc::CopyOnWriteBuffer send_packet_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_