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

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: Created 5 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: 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..0e515213a7d513aada1be85c7a0ece69dd0fb666 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;
@@ -230,6 +234,38 @@ void PepperTCPServerSocketMessageFilter::OnListenCompleted(
state_ = STATE_LISTENING;
}
+void PepperTCPServerSocketMessageFilter::MaybeOpenFirewallHole(
+ const PP_NetAddress_Private& addr,
+ const ppapi::host::ReplyMessageContext& context, int net_result) {
+#if defined(OS_CHROMEOS)
+ if (net_result != net::OK) {
+ return;
+ }
+ // punch hole.
+ pepper_socket_utils::FirewallHoleOpenCallback callback =
+ base::Bind(&PepperTCPServerSocketMessageFilter::OnFirewallHoleOpened,
+ base::Unretained(this), context, net_result);
+ if (pepper_socket_utils::OpenFirewallHole(addr, callback)) {
+ // Firewall hole is opening, state transition will happen in the callback.
+ return;
+ }
+#endif // defined(OS_CHROMEOS)
+
+ OnListenCompleted(context, net_result);
+}
+
+#if defined(OS_CHROMEOS)
+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_ = hole.Pass();
+ 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