Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
index cbe04ba28e029cedbf8b21aef67880c7a8e68c38..8dea66a379fecbcbde31c2a17f413c51c6bc3e90 100644 |
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c |
@@ -49,6 +49,7 @@ |
#include "ppapi/c/ppb_var_dictionary.h" |
#include "ppapi/c/ppb_video_decoder.h" |
#include "ppapi/c/ppb_video_encoder.h" |
+#include "ppapi/c/ppb_vpn_provider.h" |
#include "ppapi/c/ppb_websocket.h" |
#include "ppapi/c/ppp_messaging.h" |
#include "ppapi/c/private/ppb_camera_device_private.h" |
@@ -149,6 +150,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_1_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoEncoder_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoEncoder_0_2; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VpnProvider_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WebSocket_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Messaging_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3; |
@@ -2456,6 +2458,65 @@ static void Pnacl_M44_PPB_VideoEncoder_Close(PP_Resource video_encoder) { |
/* Not generating wrapper methods for PPB_View_1_2 */ |
+/* Begin wrapper methods for PPB_VpnProvider_0_1 */ |
+ |
+static PP_Resource Pnacl_M44_PPB_VpnProvider_Create(PP_Instance instance) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->Create(instance); |
+} |
+ |
+static PP_Bool Pnacl_M44_PPB_VpnProvider_IsVpnProvider(PP_Resource resource) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->IsVpnProvider(resource); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_CreateConfig(PP_Resource vpn_provider, struct PP_Var* name, struct PP_Var* id, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->CreateConfig(vpn_provider, *name, id, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_DestroyConfig(PP_Resource vpn_provider, struct PP_Var* id, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->DestroyConfig(vpn_provider, *id, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_SetParameters(PP_Resource vpn_provider, struct PP_Var* address, struct PP_Var* broadcast_address, int32_t mtu, struct PP_Var* exclusion_list, struct PP_Var* inclusion_list, struct PP_Var* domain_search, struct PP_Var* dns_servers, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->SetParameters(vpn_provider, *address, *broadcast_address, mtu, *exclusion_list, *inclusion_list, *domain_search, *dns_servers, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_SendPacket(PP_Resource vpn_provider, struct PP_Var* packet) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->SendPacket(vpn_provider, *packet); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_NotifyConnectionStateChanged(PP_Resource vpn_provider, PP_VpnProvider_VpnConnectionState status, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->NotifyConnectionStateChanged(vpn_provider, status, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_GetPacket(PP_Resource vpn_provider, struct PP_Var* packet, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->GetPacket(vpn_provider, packet, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_GetPlatformMessage(PP_Resource vpn_provider, struct PP_Var* message, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->GetPlatformMessage(vpn_provider, message, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_GetConfigMessage(PP_Resource vpn_provider, struct PP_Var* message, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->GetConfigMessage(vpn_provider, message, *callback); |
+} |
+ |
+static int32_t Pnacl_M44_PPB_VpnProvider_GetUIMessage(PP_Resource vpn_provider, struct PP_Var* message, struct PP_CompletionCallback* callback) { |
+ const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface; |
+ return iface->GetUIMessage(vpn_provider, message, *callback); |
+} |
+ |
+/* End wrapper methods for PPB_VpnProvider_0_1 */ |
+ |
/* Begin wrapper methods for PPB_WebSocket_1_0 */ |
static PP_Resource Pnacl_M18_PPB_WebSocket_Create(PP_Instance instance) { |
@@ -5228,6 +5289,20 @@ static const struct PPB_VideoEncoder_0_2 Pnacl_Wrappers_PPB_VideoEncoder_0_2 = { |
/* Not generating wrapper interface for PPB_View_1_2 */ |
+static const struct PPB_VpnProvider_0_1 Pnacl_Wrappers_PPB_VpnProvider_0_1 = { |
+ .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M44_PPB_VpnProvider_Create, |
+ .IsVpnProvider = (PP_Bool (*)(PP_Resource resource))&Pnacl_M44_PPB_VpnProvider_IsVpnProvider, |
+ .CreateConfig = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var name, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_CreateConfig, |
+ .DestroyConfig = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var id, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_DestroyConfig, |
+ .SetParameters = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var address, struct PP_Var broadcast_address, int32_t mtu, struct PP_Var exclusion_list, struct PP_Var inclusion_list, struct PP_Var domain_search, struct PP_Var dns_servers, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_SetParameters, |
+ .SendPacket = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var packet))&Pnacl_M44_PPB_VpnProvider_SendPacket, |
+ .NotifyConnectionStateChanged = (int32_t (*)(PP_Resource vpn_provider, PP_VpnProvider_VpnConnectionState status, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_NotifyConnectionStateChanged, |
+ .GetPacket = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var* packet, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_GetPacket, |
+ .GetPlatformMessage = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var* message, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_GetPlatformMessage, |
+ .GetConfigMessage = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var* message, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_GetConfigMessage, |
+ .GetUIMessage = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var* message, struct PP_CompletionCallback callback))&Pnacl_M44_PPB_VpnProvider_GetUIMessage |
+}; |
+ |
static const struct PPB_WebSocket_1_0 Pnacl_Wrappers_PPB_WebSocket_1_0 = { |
.Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M18_PPB_WebSocket_Create, |
.IsWebSocket = (PP_Bool (*)(PP_Resource resource))&Pnacl_M18_PPB_WebSocket_IsWebSocket, |
@@ -6175,6 +6250,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoEncoder_0_2 = { |
.real_iface = NULL |
}; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VpnProvider_0_1 = { |
+ .iface_macro = PPB_VPNPROVIDER_INTERFACE_0_1, |
+ .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_VpnProvider_0_1, |
+ .real_iface = NULL |
+}; |
+ |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WebSocket_1_0 = { |
.iface_macro = PPB_WEBSOCKET_INTERFACE_1_0, |
.wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_WebSocket_1_0, |
@@ -6562,6 +6643,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { |
&Pnacl_WrapperInfo_PPB_VideoDecoder_1_1, |
&Pnacl_WrapperInfo_PPB_VideoEncoder_0_1, |
&Pnacl_WrapperInfo_PPB_VideoEncoder_0_2, |
+ &Pnacl_WrapperInfo_PPB_VpnProvider_0_1, |
&Pnacl_WrapperInfo_PPB_WebSocket_1_0, |
&Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3, |
&Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_4, |