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

Unified Diff: webrtc/base/firewallsocketserver.cc

Issue 2936553003: Adding PortAllocator option to support cases where sockets can't be bound. (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/base/firewallsocketserver.cc
diff --git a/webrtc/base/firewallsocketserver.cc b/webrtc/base/firewallsocketserver.cc
index 30e5c3bfaa8c14a6cc4b9edaff4610763bd96d8a..4f80738f66144f639f0415d0e54757a80f003b24 100644
--- a/webrtc/base/firewallsocketserver.cc
+++ b/webrtc/base/firewallsocketserver.cc
@@ -24,6 +24,14 @@ class FirewallSocket : public AsyncSocketAdapter {
: AsyncSocketAdapter(socket), server_(server), type_(type) {
}
+ int Bind(const SocketAddress& addr) override {
+ if (!server_->CanBindToIp(addr.ipaddr())) {
+ SetError(EINVAL);
+ return SOCKET_ERROR;
+ }
+ return AsyncSocketAdapter::Bind(addr);
+ }
+
int Connect(const SocketAddress& addr) override {
if (type_ == SOCK_STREAM) {
if (!server_->Check(FP_TCP, GetLocalAddress(), addr)) {
@@ -176,6 +184,16 @@ bool FirewallSocketServer::Check(FirewallProtocol p,
return true;
}
+void FirewallSocketServer::SetInvalidBindIps(
+ const std::vector<rtc::IPAddress>& invalid_bind_ips) {
+ invalid_bind_ips_ = invalid_bind_ips;
+}
+
+bool FirewallSocketServer::CanBindToIp(const rtc::IPAddress& ip) {
+ return std::find(invalid_bind_ips_.begin(), invalid_bind_ips_.end(), ip) ==
+ invalid_bind_ips_.end();
+}
+
Socket* FirewallSocketServer::CreateSocket(int type) {
return CreateSocket(AF_INET, type);
}

Powered by Google App Engine
This is Rietveld 408576698