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

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_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_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
index aa63ab16308c0460405505cc639b591e355ec426..84a0f349fb9a087039fcf2869a849e9db2d343c9 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -36,6 +36,10 @@
#include "ppapi/proxy/tcp_socket_resource_base.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;
using ppapi::proxy::TCPSocketResourceBase;
@@ -470,6 +474,10 @@ int32_t PepperTCPSocketMessageFilter::OnMsgClose(
return PP_OK;
state_.DoTransition(TCPSocketState::CLOSE, true);
+#if defined(OS_CHROMEOS)
+ // Close the firewall hole, it is no longer needed.
+ firewall_hole_.reset(nullptr);
+#endif //defined(OS_CHROMEOS)
// Make sure we get no further callbacks from |socket_| or |ssl_socket_|.
if (socket_) {
socket_->Close();
@@ -713,8 +721,7 @@ void PepperTCPSocketMessageFilter::DoListen(
}
int32_t pp_result = NetErrorToPepperError(socket_->Listen(backlog));
- SendListenReply(context, pp_result);
- state_.DoTransition(TCPSocketState::LISTEN, pp_result == PP_OK);
+ MaybeOpenFirewallHole(context, pp_result);
}
void PepperTCPSocketMessageFilter::OnResolveCompleted(
@@ -926,6 +933,37 @@ void PepperTCPSocketMessageFilter::OnWriteCompleted(
write_buffer_base_ = NULL;
}
+void PepperTCPSocketMessageFilter::MaybeOpenFirewallHole(
+ const ppapi::host::ReplyMessageContext& context, int32_t pp_result){
+#if defined(OS_CHROMEOS)
+ if (pp_result == PP_OK) {
+ // punch hole.
+ pepper_socket_utils::FirewallHoleOpenCallback callback =
+ base::Bind(&PepperTCPSocketMessageFilter::OnFirewallHoleOpened,
+ base::Unretained(this), context, pp_result);
+ if (pepper_socket_utils::OpenFirewallHole(bind_input_addr_, callback)) {
+ // Firewall hole is opening, state transition will happen in the callback.
+ return;
+ }
+ }
+#endif
+ SendListenReply(context, pp_result);
+ state_.DoTransition(TCPSocketState::LISTEN, pp_result == PP_OK);
+}
+
+#if defined(OS_CHROMEOS)
+void PepperTCPSocketMessageFilter::OnFirewallHoleOpened(
+ const ppapi::host::ReplyMessageContext& context, int32_t 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();
+ SendListenReply(context, result);
+ state_.DoTransition(TCPSocketState::LISTEN, result == PP_OK);
+}
+#endif // defined(OS_CHROMEOS)
+
void PepperTCPSocketMessageFilter::OnAcceptCompleted(
const ppapi::host::ReplyMessageContext& context,
int net_result) {

Powered by Google App Engine
This is Rietveld 408576698