Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc |
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc |
index 34a949b750d9181e6f154e2032cf1fef8db721cb..e5db3f94592ff8a49586844e125d684d71457780 100644 |
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc |
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc |
@@ -18,6 +18,7 @@ |
#include "content/public/common/content_switches.h" |
#include "content/public/common/renderer_preferences.h" |
#include "content/public/renderer/content_renderer_client.h" |
+#include "content/public/renderer/webrtc_ip_handling_policy.h" |
#include "content/renderer/media/media_stream.h" |
#include "content/renderer/media/media_stream_audio_processor.h" |
#include "content/renderer/media/media_stream_audio_processor_options.h" |
@@ -62,6 +63,25 @@ |
#include "media/base/android/media_codec_bridge.h" |
#endif |
+namespace { |
+ |
+enum WebRTCIPHandlingPolicy { |
+ DEFAULT, |
+ DEFAULT_PUBLIC_INTERFACE_ONLY, |
+ DISABLE_NON_PROXIED_UDP, |
+}; |
+ |
+WebRTCIPHandlingPolicy GetWebRTCIPHandlingPolicy( |
+ const std::string& preference) { |
+ if (preference == content::kWebRTCIPHandlingDefaultPublicInterfaceOnly) |
nasko
2015/10/26 15:49:49
This anonymous namespace should go inside content.
guoweis_left_chromium
2015/10/27 20:31:59
Done.
|
+ return DEFAULT_PUBLIC_INTERFACE_ONLY; |
+ if (preference == content::kWebRTCIPHandlingDisableNonProxiedUdp) |
+ return DISABLE_NON_PROXIED_UDP; |
+ return DEFAULT; |
+} |
+ |
+} // namespace |
+ |
namespace content { |
// Map of corresponding media constraints and platform effects. |
@@ -455,14 +475,25 @@ PeerConnectionDependencyFactory::CreatePeerConnection( |
// |request_multiple_routes|. Whether local IP addresses could be |
// collected depends on if mic/camera permission is granted for this |
// origin. |
- port_config.enable_multiple_routes = |
- renderer_view_impl->renderer_preferences() |
- .enable_webrtc_multiple_routes; |
- port_config.enable_nonproxied_udp = |
- renderer_view_impl->renderer_preferences() |
- .enable_webrtc_nonproxied_udp; |
- VLOG(3) << "WebRTC routing preferences: multiple_routes: " |
- << port_config.enable_multiple_routes |
+ std::string mode = renderer_view_impl->renderer_preferences() |
+ .webrtc_ip_handling_policy; |
+ switch (GetWebRTCIPHandlingPolicy(mode)) { |
+ case DEFAULT_PUBLIC_INTERFACE_ONLY: |
+ port_config.enable_multiple_routes = false; |
+ port_config.enable_nonproxied_udp = true; |
+ break; |
+ case DISABLE_NON_PROXIED_UDP: |
+ port_config.enable_multiple_routes = false; |
+ port_config.enable_nonproxied_udp = false; |
+ default: |
nasko
2015/10/26 15:49:49
Why not have a case for DEFAULT return value and h
guoweis_left_chromium
2015/10/27 20:32:00
Done.
|
+ port_config.enable_multiple_routes = true; |
+ port_config.enable_nonproxied_udp = true; |
+ break; |
+ } |
+ |
+ VLOG(3) << "WebRTC routing preferences: " |
+ << "policy: " << mode |
+ << ", multiple_routes: " << port_config.enable_multiple_routes |
<< ", nonproxied_udp: " << port_config.enable_nonproxied_udp; |
} |
} |