commit 7b9278ccf37a720fdeffea8b55104797229514fe
author dschinazi <dschinazi@google.com> Mon May 20 07:36:21 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 20 08:42:05 2019 -0700
tree 22158c04140356a1ab9a6f3a91e7595050a65880
parent 034c98c00b23150a20d39e9ce90e71586102bc6c

Rename connection_id to server_connection_id

This is a step on the way to enabling client connection IDs. It will make the code less ambiguous once we introduce client_connection_id.

gfe-relnote: n/a, renaming code only
PiperOrigin-RevId: 249045070
Change-Id: Ia7ba75511f96c896bc6f0f4978dae2cd13e707fb

quic/core/quic_connection.h

diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index 8c8ed2b..b274266 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -341,7 +341,7 @@
   // |initial_peer_address| using |writer| to write packets. |owns_writer|
   // specifies whether the connection takes ownership of |writer|. |helper| must
   // outlive this connection.
-  QuicConnection(QuicConnectionId connection_id,
+  QuicConnection(QuicConnectionId server_connection_id,
                  QuicSocketAddress initial_peer_address,
                  QuicConnectionHelperInterface* helper,
                  QuicAlarmFactory* alarm_factory,
@@ -582,7 +582,7 @@
   const QuicSocketAddress& effective_peer_address() const {
     return effective_peer_address_;
   }
-  QuicConnectionId connection_id() const { return connection_id_; }
+  QuicConnectionId connection_id() const { return server_connection_id_; }
   const QuicClock* clock() const { return clock_; }
   QuicRandom* random_generator() const { return random_generator_; }
   QuicByteCount max_packet_length() const;
@@ -1168,7 +1168,7 @@
   const QuicClock* clock_;
   QuicRandom* random_generator_;
 
-  QuicConnectionId connection_id_;
+  QuicConnectionId server_connection_id_;
   // Address on the last successfully processed packet received from the
   // direct peer.
   QuicSocketAddress self_address_;