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

Side by Side Diff: net/tools/quic/quic_client.cc

Issue 1750303003: Remove unnecessary ReadPacket method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@115244730
Patch Set: revert to Patch Set 1 Created 4 years, 9 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 | « net/tools/quic/quic_client.h ('k') | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tools/quic/quic_client.h" 5 #include "net/tools/quic/quic_client.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <netinet/in.h> 8 #include <netinet/in.h>
9 #include <string.h> 9 #include <string.h>
10 #include <sys/epoll.h> 10 #include <sys/epoll.h>
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 QuicPacketWriter* QuicClient::CreateQuicPacketWriter() { 491 QuicPacketWriter* QuicClient::CreateQuicPacketWriter() {
492 return new QuicDefaultPacketWriter(GetLatestFD()); 492 return new QuicDefaultPacketWriter(GetLatestFD());
493 } 493 }
494 494
495 QuicPacketReader* QuicClient::CreateQuicPacketReader() { 495 QuicPacketReader* QuicClient::CreateQuicPacketReader() {
496 // TODO(rtenneti): Add support for QuicPacketReader. 496 // TODO(rtenneti): Add support for QuicPacketReader.
497 // return new QuicPacketReader(); 497 // return new QuicPacketReader();
498 return nullptr; 498 return nullptr;
499 } 499 }
500 500
501 int QuicClient::ReadPacket(char* buffer,
502 int buffer_len,
503 IPEndPoint* server_address,
504 IPAddress* client_ip) {
505 return QuicSocketUtils::ReadPacket(
506 GetLatestFD(), buffer, buffer_len,
507 overflow_supported_ ? &packets_dropped_ : nullptr, client_ip,
508 server_address);
509 }
510
511 bool QuicClient::ReadAndProcessPacket() { 501 bool QuicClient::ReadAndProcessPacket() {
512 // Allocate some extra space so we can send an error if the server goes over 502 // Allocate some extra space so we can send an error if the server goes over
513 // the limit. 503 // the limit.
514 char buf[2 * kMaxPacketSize]; 504 char buf[2 * kMaxPacketSize];
515 505
516 IPEndPoint server_address; 506 IPEndPoint server_address;
517 IPAddress client_ip; 507 IPAddress client_ip;
518 508
519 int bytes_read = ReadPacket(buf, arraysize(buf), &server_address, &client_ip); 509 int bytes_read = QuicSocketUtils::ReadPacket(
510 GetLatestFD(), buf, arraysize(buf),
511 overflow_supported_ ? &packets_dropped_ : nullptr, &client_ip,
512 &server_address);
520 513
521 if (bytes_read < 0) { 514 if (bytes_read < 0) {
522 return false; 515 return false;
523 } 516 }
524 517
525 QuicEncryptedPacket packet(buf, bytes_read, false); 518 QuicEncryptedPacket packet(buf, bytes_read, false);
526 519
527 IPEndPoint client_address(client_ip, 520 IPEndPoint client_address(client_ip,
528 QuicClient::GetLatestClientAddress().port()); 521 QuicClient::GetLatestClientAddress().port());
529 522
(...skipping 25 matching lines...) Expand all
555 return fd_address_map_.back().first; 548 return fd_address_map_.back().first;
556 } 549 }
557 550
558 void QuicClient::ProcessPacket(const IPEndPoint& self_address, 551 void QuicClient::ProcessPacket(const IPEndPoint& self_address,
559 const IPEndPoint& peer_address, 552 const IPEndPoint& peer_address,
560 const QuicEncryptedPacket& packet) { 553 const QuicEncryptedPacket& packet) {
561 session()->connection()->ProcessUdpPacket(self_address, peer_address, packet); 554 session()->connection()->ProcessUdpPacket(self_address, peer_address, packet);
562 } 555 }
563 556
564 } // namespace net 557 } // namespace net
OLDNEW
« no previous file with comments | « net/tools/quic/quic_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698