Fixing invalid operator< implementation.

webrtc/p2p/base/turnserver.cc

 /*
  *  Copyright 2012 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 526 matching lines @@
       dst_(socket->GetRemoteAddress()),
       proto_(proto),
       socket_(socket) {
 }
 
 bool TurnServerConnection::operator==(const TurnServerConnection& c) const {
   return src_ == c.src_ && dst_ == c.dst_ && proto_ == c.proto_;
 }
 
 bool TurnServerConnection::operator<(const TurnServerConnection& c) const {
-  return src_ < c.src_ || dst_ < c.dst_ || proto_ < c.proto_;
+  if (src_ != c.src_) {

[honghaiz3, 2016/07/27 18:38:13]

Probably this is a good place to use std::tie since it is a new c++ 11 feature
allowed in Chromium. 

[Taylor Brandstetter, 2016/07/28 22:42:08]

Good point! I didn't know about that. Done.

+    return src_ < c.src_;

[honghaiz3, 2016/07/27 18:38:13]

Plus, could we add a test to make sure the operator is valid?

[Taylor Brandstetter, 2016/07/28 22:42:08]

Done. It's hard to cover every possibility of operator< being valid, but I at
least have a test that catches this issue.

+  }
+
+  if (dst_ != c.dst_) {
+    return dst_ < c.dst_;
+  }
+
+  if (proto_ != c.proto_) {
+    return proto_ < c.proto_;
+  }
+
+  return false;
 }
 
 std::string TurnServerConnection::ToString() const {
   const char* const kProtos[] = {
       "unknown", "udp", "tcp", "ssltcp"
   };
   std::ostringstream ost;
   ost << src_.ToString() << "-" << dst_.ToString() << ":"<< kProtos[proto_];
   return ost.str();
 }
@@ skipping 393 matching lines @@
                        MSG_ALLOCATION_TIMEOUT);
 }
 
 void TurnServerAllocation::Channel::OnMessage(rtc::Message* msg) {
   ASSERT(msg->message_id == MSG_ALLOCATION_TIMEOUT);
   SignalDestroyed(this);
   delete this;
 }
 
 }  // namespace cricket