Make Onion_Announce a module-private type.

1 files changed, 5 insertions, 17 deletions

diff --git a/toxcore/onion_announce.h b/toxcore/onion_announce.h
index 548d4b79..36484ff2 100644
--- a/toxcore/onion_announce.h
+++ b/toxcore/onion_announce.h
@@ -46,23 +46,11 @@
 #define ONION_DATA_REQUEST_MIN_SIZE (1 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE)
 #define MAX_DATA_REQUEST_SIZE (ONION_MAX_DATA_SIZE - ONION_DATA_REQUEST_MIN_SIZE)
 
-typedef struct {
-    uint8_t public_key[CRYPTO_PUBLIC_KEY_SIZE];
-    IP_Port ret_ip_port;
-    uint8_t ret[ONION_RETURN_3];
-    uint8_t data_public_key[CRYPTO_PUBLIC_KEY_SIZE];
-    uint64_t time;
-} Onion_Announce_Entry;
-
-typedef struct {
-    DHT     *dht;
-    Networking_Core *net;
-    Onion_Announce_Entry entries[ONION_ANNOUNCE_MAX_ENTRIES];
-    /* This is CRYPTO_SYMMETRIC_KEY_SIZE long just so we can use new_symmetric_key() to fill it */
-    uint8_t secret_bytes[CRYPTO_SYMMETRIC_KEY_SIZE];
-
-    Shared_Keys shared_keys_recv;
-} Onion_Announce;
+typedef struct Onion_Announce Onion_Announce;
+
+/* These two are not public; they are for tests only! */
+uint8_t *onion_announce_entry_public_key(Onion_Announce *onion_a, uint32_t entry);
+void onion_announce_entry_set_time(Onion_Announce *onion_a, uint32_t entry, uint64_t time);
 
 /* Create an onion announce request packet in packet of max_packet_length (recommended size ONION_ANNOUNCE_REQUEST_SIZE).
  *