ae3df54f67
This changes the MIDs that are generated if calling createOffer twice without setting a local or remote description. Managing the list of seen mids is now deferred to a helper object. This is a reland of 1c376760d83119166407913b965e2e40e9d0c5f6. > Bug: None > Change-Id: I3440d62129884ae49aefd18e03c3a55ae096d923 > Reviewed-on: https://webrtc-review.googlesource.com/c/116021 > Commit-Queue: Amit Hilbuch <amithi@webrtc.org> > Reviewed-by: Steve Anton <steveanton@webrtc.org> > Reviewed-by: Seth Hampson <shampson@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26130} Bug: None Change-Id: Ic8b07a252869f67a476e3af84b8072b7a130f7fd Reviewed-on: https://webrtc-review.googlesource.com/c/116381 Reviewed-by: Steve Anton <steveanton@webrtc.org> Commit-Queue: Amit Hilbuch <amithi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26151}
67 lines
2.0 KiB
C++
67 lines
2.0 KiB
C++
/*
|
|
* Copyright 2018 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 "pc/unique_id_generator.h"
|
|
|
|
#include <limits>
|
|
#include <vector>
|
|
|
|
#include "rtc_base/helpers.h"
|
|
#include "rtc_base/string_to_number.h"
|
|
#include "rtc_base/stringencode.h"
|
|
|
|
namespace webrtc {
|
|
|
|
UniqueRandomIdGenerator::UniqueRandomIdGenerator() : known_ids_() {}
|
|
UniqueRandomIdGenerator::UniqueRandomIdGenerator(
|
|
rtc::ArrayView<uint32_t> known_ids)
|
|
: known_ids_(known_ids.begin(), known_ids.end()) {}
|
|
|
|
UniqueRandomIdGenerator::~UniqueRandomIdGenerator() = default;
|
|
|
|
uint32_t UniqueRandomIdGenerator::GenerateId() {
|
|
while (true) {
|
|
RTC_CHECK_LT(known_ids_.size(), std::numeric_limits<uint32_t>::max());
|
|
auto pair = known_ids_.insert(rtc::CreateRandomNonZeroId());
|
|
if (pair.second) {
|
|
return *pair.first;
|
|
}
|
|
}
|
|
}
|
|
|
|
void UniqueRandomIdGenerator::AddKnownId(uint32_t value) {
|
|
known_ids_.insert(value);
|
|
}
|
|
|
|
UniqueStringGenerator::UniqueStringGenerator() : unique_number_generator_() {}
|
|
UniqueStringGenerator::UniqueStringGenerator(
|
|
rtc::ArrayView<std::string> known_ids) {
|
|
for (const std::string& str : known_ids) {
|
|
AddKnownId(str);
|
|
}
|
|
}
|
|
|
|
UniqueStringGenerator::~UniqueStringGenerator() = default;
|
|
|
|
std::string UniqueStringGenerator::GenerateString() {
|
|
return rtc::ToString(unique_number_generator_.GenerateNumber());
|
|
}
|
|
|
|
void UniqueStringGenerator::AddKnownId(const std::string& value) {
|
|
absl::optional<uint32_t> int_value = rtc::StringToNumber<uint32_t>(value);
|
|
// The underlying generator works for uint32_t values, so if the provided
|
|
// value is not a uint32_t it will never be generated anyway.
|
|
if (int_value.has_value()) {
|
|
unique_number_generator_.AddKnownId(int_value.value());
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|