summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 19:32:28 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 19:32:28 +0000
commitb442da35fcf0bb0069390e819365bc7c9df37978 (patch)
tree5b66697e84c90964ea25b30fa36a8354f3b6e1f9 /ppapi/cpp
parent63e627dc079238661c337c71e0061f06f49fbb41 (diff)
downloadchromium_src-b442da35fcf0bb0069390e819365bc7c9df37978.zip
chromium_src-b442da35fcf0bb0069390e819365bc7c9df37978.tar.gz
chromium_src-b442da35fcf0bb0069390e819365bc7c9df37978.tar.bz2
Implement PPB_Flash_TCPSocket.InitiateSSL.
BUG=None TEST=None Review URL: http://codereview.chromium.org/7535007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
-rw-r--r--ppapi/cpp/private/flash_tcp_socket.cc10
-rw-r--r--ppapi/cpp/private/flash_tcp_socket.h5
2 files changed, 9 insertions, 6 deletions
diff --git a/ppapi/cpp/private/flash_tcp_socket.cc b/ppapi/cpp/private/flash_tcp_socket.cc
index 82e6414..98e9906 100644
--- a/ppapi/cpp/private/flash_tcp_socket.cc
+++ b/ppapi/cpp/private/flash_tcp_socket.cc
@@ -66,12 +66,14 @@ bool TCPSocket::GetRemoteAddress(PP_Flash_NetAddress* remote_addr) {
return PP_ToBool(result);
}
-int32_t TCPSocket::InitiateSSL(const char* server_name,
- const CompletionCallback& callback) {
+int32_t TCPSocket::SSLHandshake(const char* server_name,
+ uint16_t server_port,
+ const CompletionCallback& callback) {
if (!has_interface<PPB_Flash_TCPSocket>())
return callback.MayForce(PP_ERROR_NOINTERFACE);
- return get_interface<PPB_Flash_TCPSocket>()->InitiateSSL(
- pp_resource(), server_name, callback.pp_completion_callback());
+ return get_interface<PPB_Flash_TCPSocket>()->SSLHandshake(
+ pp_resource(), server_name, server_port,
+ callback.pp_completion_callback());
}
int32_t TCPSocket::Read(char* buffer,
diff --git a/ppapi/cpp/private/flash_tcp_socket.h b/ppapi/cpp/private/flash_tcp_socket.h
index 8998728..b7ead00 100644
--- a/ppapi/cpp/private/flash_tcp_socket.h
+++ b/ppapi/cpp/private/flash_tcp_socket.h
@@ -31,8 +31,9 @@ class TCPSocket : public Resource {
const CompletionCallback& callback);
bool GetLocalAddress(PP_Flash_NetAddress* local_addr);
bool GetRemoteAddress(PP_Flash_NetAddress* remote_addr);
- int32_t InitiateSSL(const char* server_name,
- const CompletionCallback& callback);
+ int32_t SSLHandshake(const char* server_name,
+ uint16_t server_port,
+ const CompletionCallback& callback);
int32_t Read(char* buffer,
int32_t bytes_to_read,
const CompletionCallback& callback);