Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: net/quic/p2p/quic_p2p_session.cc

Issue 1964143005: Revert of Clean up IPAddress::ToString related TODO. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/p2p/quic_p2p_session.h" 5 #include "net/quic/p2p/quic_p2p_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 #include "net/base/ip_address.h" 11 #include "net/base/ip_address.h"
12 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
13 #include "net/quic/p2p/quic_p2p_crypto_stream.h" 13 #include "net/quic/p2p/quic_p2p_crypto_stream.h"
14 #include "net/quic/p2p/quic_p2p_stream.h" 14 #include "net/quic/p2p/quic_p2p_stream.h"
15 #include "net/quic/quic_connection.h" 15 #include "net/quic/quic_connection.h"
16 #include "net/socket/socket.h" 16 #include "net/socket/socket.h"
17 17
18 namespace net { 18 namespace net {
19 19
20 QuicP2PSession::QuicP2PSession(const QuicConfig& config, 20 QuicP2PSession::QuicP2PSession(const QuicConfig& config,
21 const QuicP2PCryptoConfig& crypto_config, 21 const QuicP2PCryptoConfig& crypto_config,
22 std::unique_ptr<QuicConnection> connection, 22 std::unique_ptr<QuicConnection> connection,
23 std::unique_ptr<Socket> socket) 23 std::unique_ptr<Socket> socket)
24 : QuicSession(connection.release(), config), 24 : QuicSession(connection.release(), config),
25 socket_(std::move(socket)), 25 socket_(std::move(socket)),
26 crypto_stream_(new QuicP2PCryptoStream(this, crypto_config)), 26 crypto_stream_(new QuicP2PCryptoStream(this, crypto_config)),
27 read_buffer_(new IOBuffer(static_cast<size_t>(kMaxPacketSize))) { 27 read_buffer_(new IOBuffer(static_cast<size_t>(kMaxPacketSize))) {
28 DCHECK(config.negotiated()); 28 DCHECK(config.negotiated());
29
30 // Non-null IP address needs to be passed here because QuicConnection uses
31 // ToString() to format addresses for logging and ToString() is not allowed
32 // for empty addresses.
33 // TODO(sergeyu): Fix QuicConnection and remove SetSelfAddress() call below.
34 this->connection()->SetSelfAddress(IPEndPoint(IPAddress::IPv4AllZeros(), 0));
29 } 35 }
30 36
31 QuicP2PSession::~QuicP2PSession() {} 37 QuicP2PSession::~QuicP2PSession() {}
32 38
33 void QuicP2PSession::Initialize() { 39 void QuicP2PSession::Initialize() {
34 QuicSession::Initialize(); 40 QuicSession::Initialize();
35 crypto_stream_->Connect(); 41 crypto_stream_->Connect();
36 DoReadLoop(OK); 42 DoReadLoop(OK);
37 } 43 }
38 44
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return result; 125 return result;
120 } 126 }
121 127
122 QuicReceivedPacket packet(read_buffer_->data(), result, clock_.Now()); 128 QuicReceivedPacket packet(read_buffer_->data(), result, clock_.Now());
123 connection()->ProcessUdpPacket(connection()->self_address(), 129 connection()->ProcessUdpPacket(connection()->self_address(),
124 connection()->peer_address(), packet); 130 connection()->peer_address(), packet);
125 return OK; 131 return OK;
126 } 132 }
127 133
128 } // namespace net 134 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698