| Index: ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_net_address_private.cc
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_net_address_private.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_net_address_private.cc
|
| index bf4989b2a1decebe61a6bf222b5d384d76b5a6b2..c1019c46122fa9ed654a642075df771c1af6e4ec 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_net_address_private.cc
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_net_address_private.cc
|
| @@ -159,15 +159,15 @@ void GetAnyAddress(PP_Bool is_ipv6, PP_NetAddress_Private* addr) {
|
| NaClSrpcErrorString(srpc_result));
|
| }
|
|
|
| -uint16_t GetFamily(const PP_NetAddress_Private* addr) {
|
| +PP_AddressFamily_Private GetFamily(const PP_NetAddress_Private* addr) {
|
| DebugPrintf("PPB_NetAddress_Private::GetFamily\n");
|
|
|
| nacl_abi_size_t addr_bytes =
|
| static_cast<nacl_abi_size_t>(sizeof(PP_NetAddress_Private));
|
| char* const raw_addr =
|
| reinterpret_cast<char*>(const_cast<PP_NetAddress_Private*>(addr));
|
| - int32_t addr_family;
|
|
|
| + int32_t addr_family = PP_ADDRESSFAMILY_UNSPECIFIED;
|
| NaClSrpcError srpc_result =
|
| PpbNetAddressPrivateRpcClient::PPB_NetAddress_Private_GetFamily(
|
| GetMainSrpcChannel(),
|
| @@ -177,7 +177,9 @@ uint16_t GetFamily(const PP_NetAddress_Private* addr) {
|
| DebugPrintf("PPB_NetAddress_Private::GetFamily: %s\n",
|
| NaClSrpcErrorString(srpc_result));
|
|
|
| - return static_cast<uint16_t>(static_cast<uint32_t>(addr_family));
|
| + if (srpc_result == NACL_SRPC_RESULT_OK)
|
| + return static_cast<PP_AddressFamily_Private>(addr_family);
|
| + return PP_ADDRESSFAMILY_UNSPECIFIED;
|
| }
|
|
|
| uint16_t GetPort(const PP_NetAddress_Private* addr) {
|
|
|