diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 19:32:28 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 19:32:28 +0000 |
| commit | b442da35fcf0bb0069390e819365bc7c9df37978 (patch) | |
| tree | 5b66697e84c90964ea25b30fa36a8354f3b6e1f9 /ppapi/thunk | |
| parent | 63e627dc079238661c337c71e0061f06f49fbb41 (diff) | |
| download | chromium_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/thunk')
| -rw-r--r-- | ppapi/thunk/ppb_flash_tcp_socket_api.h | 5 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_tcp_socket_thunk.cc | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ppapi/thunk/ppb_flash_tcp_socket_api.h b/ppapi/thunk/ppb_flash_tcp_socket_api.h index d18eb6e..3ded5c1 100644 --- a/ppapi/thunk/ppb_flash_tcp_socket_api.h +++ b/ppapi/thunk/ppb_flash_tcp_socket_api.h @@ -21,8 +21,9 @@ class PPB_Flash_TCPSocket_API { PP_CompletionCallback callback) = 0; virtual PP_Bool GetLocalAddress(PP_Flash_NetAddress* local_addr) = 0; virtual PP_Bool GetRemoteAddress(PP_Flash_NetAddress* remote_addr) = 0; - virtual int32_t InitiateSSL(const char* server_name, - PP_CompletionCallback callback) = 0; + virtual int32_t SSLHandshake(const char* server_name, + uint16_t server_port, + PP_CompletionCallback callback) = 0; virtual int32_t Read(char* buffer, int32_t bytes_to_read, PP_CompletionCallback callback) = 0; diff --git a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc b/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc index 6154d60..a1ce67e 100644 --- a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc +++ b/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc @@ -65,13 +65,15 @@ PP_Bool GetRemoteAddress(PP_Resource tcp_socket, return enter.object()->GetRemoteAddress(remote_addr); } -int32_t InitiateSSL(PP_Resource tcp_socket, - const char* server_name, - PP_CompletionCallback callback) { +int32_t SSLHandshake(PP_Resource tcp_socket, + const char* server_name, + uint16_t server_port, + PP_CompletionCallback callback) { EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); if (enter.failed()) return MayForceCallback(callback, PP_ERROR_BADRESOURCE); - int32_t result = enter.object()->InitiateSSL(server_name, callback); + int32_t result = enter.object()->SSLHandshake(server_name, server_port, + callback); return MayForceCallback(callback, result); } @@ -110,7 +112,7 @@ const PPB_Flash_TCPSocket g_ppb_flash_tcp_socket_thunk = { &ConnectWithNetAddress, &GetLocalAddress, &GetRemoteAddress, - &InitiateSSL, + &SSLHandshake, &Read, &Write, &Disconnect |