Support GCM ciphers even if ENABLE_EXTERNAL_AUTH is defined.

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.
  */
 
 #ifndef WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_
 #define WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_
 
 #include <string>
 
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/copyonwritebuffer.h"
+#include "webrtc/media/base/rtputils.h"

[joachim, 2017/02/28 00:11:45]

This dependency is invalid ("media" depends on "p2p", so we can't depend the
other way around).

What is the best practice to implement this? Should I create a different CL to
move "rtputils*" to "/base" first?

[joachim, 2017/02/28 13:09:32]

That should have been "p2p/base", not "/base".

[Taylor Brandstetter, 2017/02/28 22:53:40]

I don't quite understand why this dependency is needed; could you explain? Why
does the fake transport need to handle external auth?

 #include "webrtc/p2p/base/icetransportinternal.h"
 
 namespace cricket {
 
 class FakeIceTransport : public IceTransportInternal {
  public:
   explicit FakeIceTransport(const std::string& name, int component)
       : name_(name), component_(component) {}
   ~FakeIceTransport() override {
     if (dest_ && dest_->dest_ == this) {
@@ skipping 137 matching lines @@
                  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),
+          rtc::Bind(&FakeIceTransport::SendPacketInternal, this, packet,
+              options),
           async_delay_ms_);
     } else {
-      SendPacketInternal(packet);
+      SendPacketInternal(packet, options);
     }
     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 10 matching lines @@
   }
 
   void set_receiving(bool receiving) {
     if (receiving_ == receiving) {
       return;
     }
     receiving_ = receiving;
     SignalReceivingState(this);
   }
 
-  void SendPacketInternal(const rtc::CopyOnWriteBuffer& packet) {
+  void SendPacketInternal(const rtc::CopyOnWriteBuffer& packet,
+      const rtc::PacketOptions& options) {
     if (dest_) {
-      dest_->SignalReadPacket(dest_, packet.data<char>(), packet.size(),
+      rtc::CopyOnWriteBuffer data(packet);
+      cricket::ApplyPacketOptions(
+          reinterpret_cast<uint8_t*>(data.data<char>()), data.size(),
+          options.packet_time_params, 0);
+      dest_->SignalReadPacket(dest_, data.data<char>(), data.size(),
                               rtc::CreatePacketTime(0), 0);
     }
   }
 
   rtc::AsyncInvoker invoker_;
   std::string name_;
   int component_;
   FakeIceTransport* dest_ = nullptr;
   bool async_ = false;
   int async_delay_ms_ = 0;
   Candidates remote_candidates_;
   IceConfig ice_config_;
   IceRole role_ = ICEROLE_UNKNOWN;
   uint64_t tiebreaker_ = 0;
   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;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_FAKEICETRANSPORT_H_