Add SafeClamp(), which accepts args of different types

webrtc/p2p/base/pseudotcp.cc

 /*
  *  Copyright 2004 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.
  */
 
 #include "webrtc/p2p/base/pseudotcp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <algorithm>
 #include <memory>
 #include <set>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/base/safe_minmax.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/timeutils.h"
 
 // The following logging is for detailed (packet-level) analysis only.
 #define _DBG_NONE     0
 #define _DBG_NORMAL   1
 #define _DBG_VERBOSE  2
 #define _DEBUGMSG _DBG_NONE
 
@@ skipping 112 matching lines @@
 }
 
 inline uint32_t bytes_to_long(const void* buf) {
   return rtc::NetworkToHost32(*static_cast<const uint32_t*>(buf));
 }
 
 inline uint16_t bytes_to_short(const void* buf) {
   return rtc::NetworkToHost16(*static_cast<const uint16_t*>(buf));
 }
 
-uint32_t bound(uint32_t lower, uint32_t middle, uint32_t upper) {
-  return std::min(std::max(lower, middle), upper);
-}
-
 //////////////////////////////////////////////////////////////////////
 // Debugging Statistics
 //////////////////////////////////////////////////////////////////////
 
 #if 0  // Not used yet
 
 enum Stat {
   S_SENT_PACKET,   // All packet sends
   S_RESENT_PACKET, // All packet sends that are retransmits
   S_RECV_PACKET,   // All packet receives
@@ skipping 546 matching lines @@
           m_rx_srtt = rtt;
           m_rx_rttvar = rtt / 2;
         } else {
           uint32_t unsigned_rtt = static_cast<uint32_t>(rtt);
           uint32_t abs_err = unsigned_rtt > m_rx_srtt
                                  ? unsigned_rtt - m_rx_srtt
                                  : m_rx_srtt - unsigned_rtt;
           m_rx_rttvar = (3 * m_rx_rttvar + abs_err) / 4;
           m_rx_srtt = (7 * m_rx_srtt + rtt) / 8;
         }
-        m_rx_rto =
-            bound(MIN_RTO, m_rx_srtt + std::max<uint32_t>(1, 4 * m_rx_rttvar),
-                  MAX_RTO);
+        m_rx_rto = rtc::SafeClamp(m_rx_srtt + rtc::SafeMax(1, 4 * m_rx_rttvar),
+                                  MIN_RTO, MAX_RTO);
 #if _DEBUGMSG >= _DBG_VERBOSE
         LOG(LS_INFO) << "rtt: " << rtt
                      << "  srtt: " << m_rx_srtt
                      << "  rto: " << m_rx_rto;
 #endif // _DEBUGMSG
       } else {
         RTC_NOTREACHED();
       }
     }
 
@@ skipping 536 matching lines @@
   m_rbuf_len = new_size;
   m_rwnd_scale = scale_factor;
   m_ssthresh = new_size;
 
   size_t available_space = 0;
   m_rbuf.GetWriteRemaining(&available_space);
   m_rcv_wnd = static_cast<uint32_t>(available_space);
 }
 
 }  // namespace cricket