database: Encode prefix length into tree

[people/ms/libloc.git] / src / loc / format.h

diff --git a/src/loc/format.h b/src/loc/format.h
index c4690d5061eed2587a143d5d3b009c74f8a6ca64..c590a6447aa594f4639eaa3d355f29d50147f223 100644 (file)
--- a/src/loc/format.h
+++ b/src/loc/format.h
@@ -20,6 +20,9 @@
 #include <stdint.h>
 
 #define LOC_DATABASE_MAGIC      "LOCDBXX"
+
+#ifdef LIBLOC_PRIVATE
+
 #define LOC_DATABASE_VERSION    0
 
 #define LOC_DATABASE_PAGE_SIZE  4096
@@ -41,23 +44,35 @@ struct loc_database_header_v0 {
        // Description of the database
        uint32_t description;
 
+       // License of the database
+       uint32_t license;
+
        // Tells us where the ASes start
        uint32_t as_offset;
        uint32_t as_length;
 
+       // Tells us where the networks start
+       uint32_t network_data_offset;
+       uint32_t network_data_length;
+
+       // Tells us where the network nodes start
+       uint32_t network_tree_offset;
+       uint32_t network_tree_length;
+
        // Tells us where the pool starts
        uint32_t pool_offset;
        uint32_t pool_length;
 };
 
-struct loc_database_network_v0 {
+struct loc_database_network_node_v0 {
        uint32_t zero;
        uint32_t one;
+
+       uint32_t network;
 };
 
-struct loc_database_network_node_v0 {
-       // The start address will be encoded in the tree
-       uint8_t prefix;
+struct loc_database_network_v0 {
+       // The start address and prefix will be encoded in the tree
 
        // The country this network is located in
        char country_code[2];
@@ -75,3 +90,4 @@ struct loc_database_as_v0 {
 };
 
 #endif
+#endif