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

Side by Side Diff: webrtc/p2p/base/port.cc

Issue 2086793002: Set the generation on peer reflexive candidates when created. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updating unit test. Created 4 years, 6 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 | « webrtc/p2p/base/p2ptransportchannel_unittest.cc ('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 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 new_local_candidate.set_component(local_candidate().component()); 1478 new_local_candidate.set_component(local_candidate().component());
1479 new_local_candidate.set_type(PRFLX_PORT_TYPE); 1479 new_local_candidate.set_type(PRFLX_PORT_TYPE);
1480 new_local_candidate.set_protocol(local_candidate().protocol()); 1480 new_local_candidate.set_protocol(local_candidate().protocol());
1481 new_local_candidate.set_address(addr->GetAddress()); 1481 new_local_candidate.set_address(addr->GetAddress());
1482 new_local_candidate.set_priority(priority); 1482 new_local_candidate.set_priority(priority);
1483 new_local_candidate.set_username(local_candidate().username()); 1483 new_local_candidate.set_username(local_candidate().username());
1484 new_local_candidate.set_password(local_candidate().password()); 1484 new_local_candidate.set_password(local_candidate().password());
1485 new_local_candidate.set_network_name(local_candidate().network_name()); 1485 new_local_candidate.set_network_name(local_candidate().network_name());
1486 new_local_candidate.set_network_type(local_candidate().network_type()); 1486 new_local_candidate.set_network_type(local_candidate().network_type());
1487 new_local_candidate.set_related_address(local_candidate().address()); 1487 new_local_candidate.set_related_address(local_candidate().address());
1488 new_local_candidate.set_generation(local_candidate().generation());
1488 new_local_candidate.set_foundation(ComputeFoundation( 1489 new_local_candidate.set_foundation(ComputeFoundation(
1489 PRFLX_PORT_TYPE, local_candidate().protocol(), 1490 PRFLX_PORT_TYPE, local_candidate().protocol(),
1490 local_candidate().relay_protocol(), local_candidate().address())); 1491 local_candidate().relay_protocol(), local_candidate().address()));
1491 new_local_candidate.set_network_id(local_candidate().network_id()); 1492 new_local_candidate.set_network_id(local_candidate().network_id());
1492 new_local_candidate.set_network_cost(local_candidate().network_cost()); 1493 new_local_candidate.set_network_cost(local_candidate().network_cost());
1493 1494
1494 // Change the local candidate of this Connection to the new prflx candidate. 1495 // Change the local candidate of this Connection to the new prflx candidate.
1495 local_candidate_index_ = port_->AddPrflxCandidate(new_local_candidate); 1496 local_candidate_index_ = port_->AddPrflxCandidate(new_local_candidate);
1496 1497
1497 // SignalStateChange to force a re-sort in P2PTransportChannel as this 1498 // SignalStateChange to force a re-sort in P2PTransportChannel as this
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 ASSERT(sent < 0); 1531 ASSERT(sent < 0);
1531 error_ = port_->GetError(); 1532 error_ = port_->GetError();
1532 stats_.sent_discarded_packets++; 1533 stats_.sent_discarded_packets++;
1533 } else { 1534 } else {
1534 send_rate_tracker_.AddSamples(sent); 1535 send_rate_tracker_.AddSamples(sent);
1535 } 1536 }
1536 return sent; 1537 return sent;
1537 } 1538 }
1538 1539
1539 } // namespace cricket 1540 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/p2ptransportchannel_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698