Create QuicSession

webrtc/p2p/quic/quicsession.cc

+/*
+ *  Copyright 2016 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.
+ */
+
+#include <string>
+#include <utility>
+
+#include "webrtc/base/messagehandler.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/p2p/quic/quicsession.h"
+#include "webrtc/base/logging.h"

[Taylor Brandstetter, 2016/02/06 00:22:44]

nit: Sort includes

[mikescarlett, 2016/02/06 02:14:08]

Done.

+
+namespace cricket {
+
+QuicSession::QuicSession(scoped_ptr<net::QuicConnection> connection,
+                         const net::QuicConfig& config)
+    : net::QuicSession(connection.release(), config) {}
+
+QuicSession::~QuicSession() {}
+
+void QuicSession::StartClientHandshake(
+    net::QuicCryptoClientStream* crypto_stream) {
+  SetCryptoStream(crypto_stream);
+  net::QuicSession::Initialize();
+  crypto_stream->CryptoConnect();
+}
+
+void QuicSession::StartServerHandshake(
+    net::QuicCryptoServerStream* crypto_stream) {
+  SetCryptoStream(crypto_stream);
+  net::QuicSession::Initialize();
+}
+
+void QuicSession::SetCryptoStream(net::QuicCryptoStream* crypto_stream) {
+  crypto_stream_.reset(crypto_stream);
+}
+
+bool QuicSession::ExportKeyingMaterial(base::StringPiece label,
+                                       base::StringPiece context,
+                                       size_t result_len,
+                                       string* result) {
+  return GetCryptoStream()->ExportKeyingMaterial(label, context, result_len,

[Taylor Brandstetter, 2016/02/06 00:22:44]

I would just use crypto_stream_ instead of GetCryptoStream(); it's more
readable.

[mikescarlett, 2016/02/06 02:14:08]

I replaced this.

+                                                 result);
+}
+
+void QuicSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) {
+  net::QuicSession::OnCryptoHandshakeEvent(event);
+  if (event == HANDSHAKE_CONFIRMED) {
+    LOG(INFO) << "QuicSession handshake complete";

[Taylor Brandstetter, 2016/02/06 00:22:44]

I'm used to seeing LS_INFO; I think that's what we prefer, though maybe Peter
knows.

[pthatcher1, 2016/02/06 00:40:29]

They are exactly the same:

https://code.google.com/p/chromium/codesearch#chromium/src/third_party/webrtc...

Search of LOG(LS_INFO) gives 127 hits, and LOG(INFO) gives 260.  We should
probably just pick one someday and switch everything to it.

[mikescarlett, 2016/02/06 02:14:09]

I'll keep LOG(INFO) since it appears both are used.

+    DCHECK(IsEncryptionEstablished());

[Taylor Brandstetter, 2016/02/06 00:22:44]

RTC_DCHECK

[mikescarlett, 2016/02/06 02:14:08]

Done.

+    DCHECK(IsCryptoHandshakeConfirmed());
+
+    SignalHandshakeComplete();
+  }
+}
+
+ReliableQuicStream* QuicSession::CreateIncomingDynamicStream(
+    net::QuicStreamId id) {
+  ReliableQuicStream* stream = CreateDataStream(id);
+  if (stream) {
+    SignalIncomingStream(stream);
+  }
+  return stream;
+}
+
+ReliableQuicStream* QuicSession::CreateOutgoingDynamicStream(
+    net::SpdyPriority priority) {
+  ReliableQuicStream* stream = CreateDataStream(GetNextOutgoingStreamId());
+  if (stream) {
+    ActivateStream(stream);
+  }
+  return stream;
+}
+
+ReliableQuicStream* QuicSession::CreateDataStream(net::QuicStreamId id) {
+  net::QuicCryptoStream* crypto_stream = GetCryptoStream();

[Taylor Brandstetter, 2016/02/06 00:22:44]

Same as above, I'd suggest just using crypto_stream_.

[mikescarlett, 2016/02/06 02:14:09]

This is also replaced.

+  if (crypto_stream == nullptr || !crypto_stream->encryption_established()) {
+    // Encryption not active so no stream created
+    return nullptr;
+  }
+  return new ReliableQuicStream(id, this);
+}
+
+void QuicSession::OnConnectionClosed(net::QuicErrorCode error, bool from_peer) {
+  net::QuicSession::OnConnectionClosed(error, from_peer);
+

[Taylor Brandstetter, 2016/02/06 00:22:44]

nit: Whitespace seems unnecessary

[mikescarlett, 2016/02/06 02:14:09]

I removed it.

+  SignalConnectionClosed(error, from_peer);
+}
+
+bool QuicSession::OnReadPacket(const char* data, size_t data_len) {
+  net::QuicEncryptedPacket packet(data, data_len);
+  connection()->ProcessUdpPacket(connection()->self_address(),
+                                 connection()->peer_address(), packet);
+  return true;
+}
+
+}  // namespace cricket