Index: ppapi/c/private/ppb_network_list_private.h |
diff --git a/ppapi/c/private/ppb_network_list_private.h b/ppapi/c/private/ppb_network_list_private.h |
index c01a346abac799abcb331bed9c673bcf99297c85..94dc53fc8bdfee2437cdeda1601895177770ff62 100644 |
--- a/ppapi/c/private/ppb_network_list_private.h |
+++ b/ppapi/c/private/ppb_network_list_private.h |
@@ -4,23 +4,21 @@ |
*/ |
/* From private/ppb_network_list_private.idl, |
- * modified Fri Feb 17 11:34:34 2012. |
+ * modified Tue Feb 21 17:05:59 2012. |
*/ |
#ifndef PPAPI_C_PRIVATE_PPB_NETWORK_LIST_PRIVATE_H_ |
#define PPAPI_C_PRIVATE_PPB_NETWORK_LIST_PRIVATE_H_ |
#include "ppapi/c/pp_bool.h" |
-#include "ppapi/c/pp_completion_callback.h" |
-#include "ppapi/c/pp_instance.h" |
#include "ppapi/c/pp_macros.h" |
#include "ppapi/c/pp_resource.h" |
#include "ppapi/c/pp_stdint.h" |
#include "ppapi/c/pp_var.h" |
#include "ppapi/c/private/ppb_net_address_private.h" |
-#define PPB_NETWORKLIST_PRIVATE_INTERFACE_0_1 "PPB_NetworkList_Private;0.1" |
-#define PPB_NETWORKLIST_PRIVATE_INTERFACE PPB_NETWORKLIST_PRIVATE_INTERFACE_0_1 |
+#define PPB_NETWORKLIST_PRIVATE_INTERFACE_0_2 "PPB_NetworkList_Private;0.2" |
+#define PPB_NETWORKLIST_PRIVATE_INTERFACE PPB_NETWORKLIST_PRIVATE_INTERFACE_0_2 |
/** |
* @file |
@@ -29,20 +27,6 @@ |
/** |
- * @addtogroup Typedefs |
- * @{ |
- */ |
-/** |
- * <code>PPB_NetworkListChanged_Callback</code> is a callback function |
- * type that is used to receive notifications about changes in the |
- * NetworkList. |
- */ |
-typedef void (*PPB_NetworkListChanged_Callback)(void* user_data); |
-/** |
- * @} |
- */ |
- |
-/** |
* @addtogroup Enums |
* @{ |
*/ |
@@ -88,20 +72,13 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetworkListState, 4); |
* @{ |
*/ |
/** |
- * The <code>PPB_NetworkList_Private</code> provides list of network |
- * interfaces and associated IP addressed. |
+ * The <code>PPB_NetworkList_Private</code> is used to represent a |
+ * list of network interfaces and their configuration. The content of |
+ * the list is immutable. Current networks configuration can be |
+ * received using the <code>PPB_NetworkMonitor_Private</code> |
+ * interface. |
*/ |
-struct PPB_NetworkList_Private_0_1 { |
- /** |
- * Create() creates a new <code>NetworkList</code> object. |
- * |
- * @param[in] instance A <code>PP_Instance</code> identifying one instance |
- * of a module. |
- * |
- * @return A <code>PP_Resource</code> corresponding to a NetworkList if |
- * successful, 0 if the instance is invalid. |
- */ |
- PP_Resource (*Create)(PP_Instance instance); |
+struct PPB_NetworkList_Private_0_2 { |
/** |
* Determines if the specified <code>resource</code> is a |
* <code>NetworkList</code> object. |
@@ -114,26 +91,6 @@ struct PPB_NetworkList_Private_0_1 { |
*/ |
PP_Bool (*IsNetworkList)(PP_Resource resource); |
/** |
- * Updates the list with the current state of the network interfaces |
- * in the system. |
- */ |
- int32_t (*Update)(struct PP_CompletionCallback callback); |
- /** |
- * Starts change notifications. The specified <code>callback</code> |
- * will be called every time the network list changes. Every time |
- * the callback is called the plugin must call Update() method to |
- * actually receive updated list. |
- */ |
- int32_t (*StartNotifications)(PP_Resource resource, |
- PPB_NetworkListChanged_Callback callback, |
- void* user_data); |
- /** |
- * Stops change notifications. After this method is called the |
- * callback specified in <code>StartNotifications()</code> will not |
- * be called anymore. |
- */ |
- int32_t (*StopNotifications)(PP_Resource resource); |
- /** |
* @return Returns number of available network interfaces or 0 if |
* the list has never been updated. |
*/ |
@@ -154,14 +111,19 @@ struct PPB_NetworkList_Private_0_1 { |
*/ |
PP_NetworkListState (*GetState)(PP_Resource resource, uint32_t index); |
/** |
- * @return Returns <code>NetAddress</code> object that contains |
- * address of the specified <code>family</code> for the network |
- * interface with the specified <code>index</code>, or 0 if the |
- * address is not assigned. |
+ * Gets list of IP addresses for the network interface with the |
+ * specified <code>index</code> and stores them in |
+ * <code>addresses</code>. If the caller didn't allocate sufficient |
+ * space to store all addresses, then only first <code>count</code> |
+ * addresses are filled in. |
+ * |
+ * @return Returns total number of IP addresses assigned to the |
+ * network interface. |
*/ |
- PP_Resource (*GetIpAddress)(PP_Resource resource, |
- uint32_t index, |
- PP_NetAddressFamily_Private family); |
+ int32_t (*GetIpAddresses)(PP_Resource resource, |
+ uint32_t index, |
+ struct PP_NetAddress_Private* addresses[], |
+ int32_t* count); |
/** |
* @return Returns display name for the network interface with the |
* specified <code>index</code>. |
@@ -174,7 +136,7 @@ struct PPB_NetworkList_Private_0_1 { |
uint32_t (*GetMTU)(PP_Resource resource, uint32_t index); |
}; |
-typedef struct PPB_NetworkList_Private_0_1 PPB_NetworkList_Private; |
+typedef struct PPB_NetworkList_Private_0_2 PPB_NetworkList_Private; |
/** |
* @} |
*/ |