struct loc_database_network_node_v0* network_nodes_v0;
size_t network_nodes_count;
+ // Networks
+ struct loc_database_network_v0* networks_v0;
+ size_t networks_count;
+
struct loc_stringpool* pool;
};
}
static int loc_database_read_as_section_v0(struct loc_database* db,
- FILE* f, off_t as_offset, size_t as_length) {
+ FILE* f, const struct loc_database_header_v0* header) {
+ off_t as_offset = be32toh(header->as_offset);
+ size_t as_length = be32toh(header->as_length);
+
DEBUG(db->ctx, "Reading AS section from %jd (%zu bytes)\n", as_offset, as_length);
if (as_length > 0) {
}
static int loc_database_read_network_nodes_section_v0(struct loc_database* db,
- FILE* f, off_t network_nodes_offset, size_t network_nodes_length) {
+ FILE* f, const struct loc_database_header_v0* header) {
+ off_t network_nodes_offset = be32toh(header->network_tree_offset);
+ size_t network_nodes_length = be32toh(header->network_tree_length);
+
DEBUG(db->ctx, "Reading network nodes section from %jd (%zu bytes)\n",
network_nodes_offset, network_nodes_length);
return 0;
}
+static int loc_database_read_networks_section_v0(struct loc_database* db,
+ FILE* f, const struct loc_database_header_v0* header) {
+ off_t networks_offset = be32toh(header->network_data_offset);
+ size_t networks_length = be32toh(header->network_data_length);
+
+ DEBUG(db->ctx, "Reading networks section from %jd (%zu bytes)\n",
+ networks_offset, networks_length);
+
+ if (networks_length > 0) {
+ db->networks_v0 = mmap(NULL, networks_length, PROT_READ,
+ MAP_SHARED, fileno(f), networks_offset);
+
+ if (db->networks_v0 == MAP_FAILED)
+ return -errno;
+ }
+
+ db->networks_count = networks_length / sizeof(*db->networks_v0);
+
+ INFO(db->ctx, "Read %zu networks from the database\n", db->networks_count);
+
+ return 0;
+}
+
static int loc_database_read_header_v0(struct loc_database* db, FILE* f) {
struct loc_database_header_v0 header;
return r;
// AS section
- off_t as_offset = be32toh(header.as_offset);
- size_t as_length = be32toh(header.as_length);
-
- r = loc_database_read_as_section_v0(db, f, as_offset, as_length);
+ r = loc_database_read_as_section_v0(db, f, &header);
if (r)
return r;
// Network Nodes
- off_t network_nodes_offset = be32toh(header.network_tree_offset);
- size_t network_nodes_length = be32toh(header.network_tree_length);
+ r = loc_database_read_network_nodes_section_v0(db, f, &header);
+ if (r)
+ return r;
- r = loc_database_read_network_nodes_section_v0(db, f,
- network_nodes_offset, network_nodes_length);
+ // Networks
+ r = loc_database_read_networks_section_v0(db, f, &header);
if (r)
return r;