1 files changed, 23 insertions, 32 deletions

diff --git a/toxcore/ping_array.h b/toxcore/ping_array.h
index bdf3c6db..b927bbd4 100644
--- a/toxcore/ping_array.h
+++ b/toxcore/ping_array.h
@@ -26,51 +26,42 @@
 
 #include "network.h"
 
-typedef struct {
-    void *data;
-    uint32_t length;
-    uint64_t time;
-    uint64_t ping_id;
-} Ping_Array_Entry;
+#ifndef PING_ARRAY_DEFINED
+#define PING_ARRAY_DEFINED
+typedef struct Ping_Array Ping_Array;
+#endif /* PING_ARRAY_DEFINED */
 
+/**
+ * Initialize a Ping_Array.
+ * size represents the total size of the array and should be a power of 2.
+ * timeout represents the maximum timeout in seconds for the entry.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+struct Ping_Array *ping_array_new(uint32_t size, uint32_t timeout);
 
-typedef struct {
-    Ping_Array_Entry *entries;
-
-    uint32_t last_deleted; /* number representing the next entry to be deleted. */
-    uint32_t last_added; /* number representing the last entry to be added. */
-    uint32_t total_size; /* The length of entries */
-    uint32_t timeout; /* The timeout after which entries are cleared. */
-} Ping_Array;
-
+/**
+ * Free all the allocated memory in a Ping_Array.
+ */
+void ping_array_kill(struct Ping_Array *_array);
 
-/* Add a data with length to the Ping_Array list and return a ping_id.
+/**
+ * Add a data with length to the Ping_Array list and return a ping_id.
  *
  * return ping_id on success.
  * return 0 on failure.
  */
-uint64_t ping_array_add(Ping_Array *array, const uint8_t *data, uint32_t length);
+uint64_t ping_array_add(struct Ping_Array *_array, const uint8_t *data, uint32_t length);
 
-/* Check if ping_id is valid and not timed out.
+/**
+ * Check if ping_id is valid and not timed out.
  *
  * On success, copies the data into data of length,
  *
  * return length of data copied on success.
  * return -1 on failure.
  */
-int ping_array_check(uint8_t *data, uint32_t length, Ping_Array *array, uint64_t ping_id);
-
-/* Initialize a Ping_Array.
- * size represents the total size of the array and should be a power of 2.
- * timeout represents the maximum timeout in seconds for the entry.
- *
- * return 0 on success.
- * return -1 on failure.
- */
-int ping_array_init(Ping_Array *empty_array, uint32_t size, uint32_t timeout);
-
-/* Free all the allocated memory in a Ping_Array.
- */
-void ping_array_free_all(Ping_Array *array);
+int32_t ping_array_check(struct Ping_Array *_array, uint8_t *data, size_t length, uint64_t ping_id);
 
 #endif