Commit 7d9211c6 authored by ianswett's avatar ianswett Committed by Commit bot

Construct QuicSocketAddressImpl in QuicChromiumPacketReadder and pass it by const&.

R=rch@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2874333002
Cr-Commit-Position: refs/heads/master@{#471175}
parent 8b7782e0
......@@ -1586,12 +1586,11 @@ void QuicChromiumClientSession::OnReadError(
ConnectionCloseBehavior::SILENT_CLOSE);
}
bool QuicChromiumClientSession::OnPacket(const QuicReceivedPacket& packet,
const IPEndPoint& local_address,
const IPEndPoint& peer_address) {
ProcessUdpPacket(QuicSocketAddress(QuicSocketAddressImpl(local_address)),
QuicSocketAddress(QuicSocketAddressImpl(peer_address)),
packet);
bool QuicChromiumClientSession::OnPacket(
const QuicReceivedPacket& packet,
const QuicSocketAddress& local_address,
const QuicSocketAddress& peer_address) {
ProcessUdpPacket(local_address, peer_address, packet);
if (!connection()->connected()) {
NotifyFactoryOfSessionClosedLater();
return false;
......
......@@ -341,8 +341,8 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession
// QuicChromiumPacketReader::Visitor methods:
void OnReadError(int result, const DatagramClientSocket* socket) override;
bool OnPacket(const QuicReceivedPacket& packet,
const IPEndPoint& local_address,
const IPEndPoint& peer_address) override;
const QuicSocketAddress& local_address,
const QuicSocketAddress& peer_address) override;
// MultiplexedSession methods:
bool GetRemoteEndpoint(IPEndPoint* endpoint) override;
......
......@@ -86,7 +86,9 @@ void QuicChromiumPacketReader::OnReadComplete(int result) {
IPEndPoint peer_address;
socket_->GetLocalAddress(&local_address);
socket_->GetPeerAddress(&peer_address);
if (!visitor_->OnPacket(packet, local_address, peer_address))
if (!visitor_->OnPacket(
packet, QuicSocketAddress(QuicSocketAddressImpl(local_address)),
QuicSocketAddress(QuicSocketAddressImpl(peer_address))))
return;
StartReading();
......
......@@ -33,8 +33,8 @@ class NET_EXPORT_PRIVATE QuicChromiumPacketReader {
virtual void OnReadError(int result,
const DatagramClientSocket* socket) = 0;
virtual bool OnPacket(const QuicReceivedPacket& packet,
const IPEndPoint& local_address,
const IPEndPoint& peer_address) = 0;
const QuicSocketAddress& local_address,
const QuicSocketAddress& peer_address) = 0;
};
QuicChromiumPacketReader(DatagramClientSocket* socket,
......
......@@ -20,11 +20,11 @@ QuicSocketAddress::QuicSocketAddress(const struct sockaddr& saddr)
QuicSocketAddress::QuicSocketAddress(const QuicSocketAddressImpl& impl)
: impl_(impl) {}
bool operator==(QuicSocketAddress lhs, QuicSocketAddress rhs) {
bool operator==(const QuicSocketAddress& lhs, const QuicSocketAddress& rhs) {
return lhs.impl_ == rhs.impl_;
}
bool operator!=(QuicSocketAddress lhs, QuicSocketAddress rhs) {
bool operator!=(const QuicSocketAddress& lhs, const QuicSocketAddress& rhs) {
return lhs.impl_ != rhs.impl_;
}
......
......@@ -24,10 +24,10 @@ class QUIC_EXPORT_PRIVATE QuicSocketAddress {
QuicSocketAddress(const QuicSocketAddress& other) = default;
QuicSocketAddress& operator=(const QuicSocketAddress& other) = default;
QuicSocketAddress& operator=(QuicSocketAddress&& other) = default;
QUIC_EXPORT_PRIVATE friend bool operator==(QuicSocketAddress lhs,
QuicSocketAddress rhs);
QUIC_EXPORT_PRIVATE friend bool operator!=(QuicSocketAddress lhs,
QuicSocketAddress rhs);
QUIC_EXPORT_PRIVATE friend bool operator==(const QuicSocketAddress& lhs,
const QuicSocketAddress& rhs);
QUIC_EXPORT_PRIVATE friend bool operator!=(const QuicSocketAddress& lhs,
const QuicSocketAddress& rhs);
bool IsInitialized() const;
std::string ToString() const;
......
......@@ -154,11 +154,10 @@ QuicSocketAddress QuicSimpleClient::GetLatestClientAddress() const {
}
bool QuicSimpleClient::OnPacket(const QuicReceivedPacket& packet,
const IPEndPoint& local_address,
const IPEndPoint& peer_address) {
session()->connection()->ProcessUdpPacket(
QuicSocketAddress(QuicSocketAddressImpl(local_address)),
QuicSocketAddress(QuicSocketAddressImpl(peer_address)), packet);
const QuicSocketAddress& local_address,
const QuicSocketAddress& peer_address) {
session()->connection()->ProcessUdpPacket(local_address, peer_address,
packet);
if (!session()->connection()->connected()) {
return false;
}
......
......@@ -50,8 +50,8 @@ class QuicSimpleClient : public QuicClientBase,
// QuicChromiumPacketReader::Visitor
void OnReadError(int result, const DatagramClientSocket* socket) override;
bool OnPacket(const QuicReceivedPacket& packet,
const IPEndPoint& local_address,
const IPEndPoint& peer_address) override;
const QuicSocketAddress& local_address,
const QuicSocketAddress& peer_address) override;
// From QuicClientBase
QuicSocketAddress GetLatestClientAddress() const override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment