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

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc

Issue 1213203004: Make the Pepper TCP open the firewall on Cros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addresse4d Comments Created 5 years, 5 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: content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc
index 0093c720863e895f2637f6db6e1ae5c581e544cb..5f69877578eb4ff296ca0eca57a351bb91ff7deb 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc
@@ -26,6 +26,10 @@
#include "ppapi/shared_impl/ppb_tcp_socket_shared.h"
#include "ppapi/shared_impl/private/net_address_private_impl.h"
+#if defined(OS_CHROMEOS)
+#include "chromeos/network/firewall_hole.h"
+#endif // defined(OS_CHROMEOS)
+
using ppapi::NetAddressPrivateImpl;
using ppapi::host::NetErrorToPepperError;
@@ -189,8 +193,13 @@ void PepperTCPServerSocketMessageFilter::DoListen(
net_result = socket_->Listen(backlog);
} while (false);
- if (net_result != net::ERR_IO_PENDING)
+ if (net_result != net::ERR_IO_PENDING) {
+#if defined(OS_CHROMEOS)
+ OpenFirewallHole(context, net_result);
+#else
OnListenCompleted(context, net_result);
+#endif
+ }
}
void PepperTCPServerSocketMessageFilter::OnListenCompleted(
@@ -230,6 +239,34 @@ void PepperTCPServerSocketMessageFilter::OnListenCompleted(
state_ = STATE_LISTENING;
}
+#if defined(OS_CHROMEOS)
+void PepperTCPServerSocketMessageFilter::OpenFirewallHole(
+ const ppapi::host::ReplyMessageContext& context,
+ int net_result) {
+ if (net_result != net::OK) {
+ return;
+ }
+ // punch hole.
bbudge 2015/07/22 02:00:48 nit: comment doesn't add much information. The met
avallee 2015/07/24 18:33:00 Done.
+ net::IPEndPoint local_addr;
+ socket_->GetLocalAddress(&local_addr);
+ pepper_socket_utils::FirewallHoleOpenCallback callback =
+ base::Bind(&PepperTCPServerSocketMessageFilter::OnFirewallHoleOpened,
+ base::Unretained(this), context, net_result);
+ pepper_socket_utils::OpenTCPFirewallHole(local_addr, callback);
+}
+
+void PepperTCPServerSocketMessageFilter::OnFirewallHoleOpened(
+ const ppapi::host::ReplyMessageContext& context,
+ int32_t net_result,
+ scoped_ptr<chromeos::FirewallHole> hole) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+ LOG_IF(WARNING, !hole.get()) << "Firewall hole could not be opened.";
+ firewall_hole_.reset(hole.release());
+ OnListenCompleted(context, net_result);
+}
+#endif // defined(OS_CHROMEOS)
+
void PepperTCPServerSocketMessageFilter::OnAcceptCompleted(
const ppapi::host::ReplyMessageContext& context,
int net_result) {

Powered by Google App Engine
This is Rietveld 408576698