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

Unified Diff: content/browser/renderer_host/pepper/pepper_udp_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: Addressed comments. Added hole reset OnMsgStopListening. 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
« no previous file with comments | « content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
index 0d37776841951678e24a0cf1108f2350c5cccfa6..14a78490c3066389a175d45c197dff1c9848a047 100644
--- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
@@ -33,6 +33,10 @@
#include "ppapi/shared_impl/private/net_address_private_impl.h"
#include "ppapi/shared_impl/socket_option_data.h"
+#if defined(OS_CHROMEOS)
+#include "chromeos/network/firewall_hole.h"
+#endif // defined(OS_CHROMEOS)
+
using ppapi::NetAddressPrivateImpl;
using ppapi::host::NetErrorToPepperError;
using ppapi::proxy::UDPSocketFilter;
@@ -490,12 +494,51 @@ void PepperUDPSocketMessageFilter::DoBind(
return;
}
+#if defined(OS_CHROMEOS)
+ OpenFirewallHole(
+ bound_address,
+ base::Bind(&PepperUDPSocketMessageFilter::OnBindComplete, this,
+ base::Passed(&socket), context, net_address));
+#else
+ OnBindComplete(socket.Pass(), context, net_address);
+#endif
+}
+
+void PepperUDPSocketMessageFilter::OnBindComplete(
+ scoped_ptr<net::UDPSocket> socket,
+ const ppapi::host::ReplyMessageContext& context,
+ const PP_NetAddress_Private& net_address) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
socket_.swap(socket);
SendBindReply(context, PP_OK, net_address);
DoRecvFrom();
}
+#if defined(OS_CHROMEOS)
+void PepperUDPSocketMessageFilter::OpenFirewallHole(
+ const net::IPEndPoint& local_address,
+ base::Closure bind_complete) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ pepper_socket_utils::FirewallHoleOpenCallback callback = base::Bind(
+ &PepperUDPSocketMessageFilter::OnFirewallHoleOpened, this, bind_complete);
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+ base::Bind(&pepper_socket_utils::OpenUDPFirewallHole,
+ local_address, callback));
+}
+
+void PepperUDPSocketMessageFilter::OnFirewallHoleOpened(
+ base::Closure bind_complete,
+ scoped_ptr<chromeos::FirewallHole> hole) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+ LOG_IF(WARNING, !hole.get()) << "Firewall hole could not be opened.";
+ firewall_hole_.reset(hole.release());
+
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, bind_complete);
+}
+#endif // defined(OS_CHROMEOS)
+
void PepperUDPSocketMessageFilter::DoRecvFrom() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(!closed_);
« no previous file with comments | « content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698