Lesser General Public License for more details.
*/
-#include <arpa/inet.h>
+#include <endian.h>
#include <errno.h>
#include <stddef.h>
#include <stdint.h>
#include <unistd.h>
#include <loc/libloc.h>
+#include <loc/as.h>
+#include <loc/database.h>
#include <loc/format.h>
-
-#include "libloc-private.h"
-#include "as.h"
-#include "database.h"
-#include "stringpool.h"
+#include <loc/private.h>
+#include <loc/stringpool.h>
struct loc_database {
struct loc_ctx* ctx;
int refcount;
- FILE* file;
unsigned int version;
time_t created_at;
off_t vendor;
struct loc_database_as_v0* as_v0;
size_t as_count;
+ // Network tree
+ 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_magic(struct loc_database* db) {
+static int loc_database_read_magic(struct loc_database* db, FILE* f) {
struct loc_database_magic magic;
// Read from file
- size_t bytes_read = fread(&magic, 1, sizeof(magic), db->file);
+ size_t bytes_read = fread(&magic, 1, sizeof(magic), f);
// Check if we have been able to read enough data
if (bytes_read < sizeof(magic)) {
DEBUG(db->ctx, "Magic value matches\n");
// Parse version
- db->version = ntohs(magic.version);
+ db->version = be16toh(magic.version);
DEBUG(db->ctx, "Database version is %u\n", db->version);
return 0;
}
static int loc_database_read_as_section_v0(struct loc_database* db,
- 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) {
db->as_v0 = mmap(NULL, as_length, PROT_READ,
- MAP_SHARED, fileno(db->file), as_offset);
+ MAP_SHARED, fileno(f), as_offset);
if (db->as_v0 == MAP_FAILED)
return -errno;
return 0;
}
-static int loc_database_read_header_v0(struct loc_database* db) {
+static int loc_database_read_network_nodes_section_v0(struct loc_database* db,
+ 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);
+
+ if (network_nodes_length > 0) {
+ db->network_nodes_v0 = mmap(NULL, network_nodes_length, PROT_READ,
+ MAP_SHARED, fileno(f), network_nodes_offset);
+
+ if (db->network_nodes_v0 == MAP_FAILED)
+ return -errno;
+ }
+
+ db->network_nodes_count = network_nodes_length / sizeof(*db->network_nodes_v0);
+
+ INFO(db->ctx, "Read %zu network nodes from the database\n", db->network_nodes_count);
+
+ 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;
// Read from file
- size_t size = fread(&header, 1, sizeof(header), db->file);
+ size_t size = fread(&header, 1, sizeof(header), f);
if (size < sizeof(header)) {
ERROR(db->ctx, "Could not read enough data for header\n");
// Copy over data
db->created_at = be64toh(header.created_at);
- db->vendor = ntohl(header.vendor);
- db->description = ntohl(header.description);
+ db->vendor = be32toh(header.vendor);
+ db->description = be32toh(header.description);
// Open pool
- off_t pool_offset = ntohl(header.pool_offset);
- size_t pool_length = ntohl(header.pool_length);
+ off_t pool_offset = be32toh(header.pool_offset);
+ size_t pool_length = be32toh(header.pool_length);
- int r = loc_stringpool_new(db->ctx, &db->pool, 0);
+ int r = loc_stringpool_open(db->ctx, &db->pool,
+ f, pool_length, pool_offset);
if (r)
return r;
- r = loc_stringpool_read(db->pool, db->file, pool_offset, pool_length);
+ // AS section
+ r = loc_database_read_as_section_v0(db, f, &header);
if (r)
return r;
- // AS section
- off_t as_offset = ntohl(header.as_offset);
- size_t as_length = ntohl(header.as_length);
+ // Network Nodes
+ r = loc_database_read_network_nodes_section_v0(db, f, &header);
+ if (r)
+ return r;
- r = loc_database_read_as_section_v0(db, as_offset, as_length);
+ // Networks
+ r = loc_database_read_networks_section_v0(db, f, &header);
if (r)
return r;
return 0;
}
-static int loc_database_read_header(struct loc_database* db) {
+static int loc_database_read_header(struct loc_database* db, FILE* f) {
switch (db->version) {
case 0:
- return loc_database_read_header_v0(db);
+ return loc_database_read_header_v0(db, f);
default:
ERROR(db->ctx, "Incompatible database version: %u\n", db->version);
}
}
-static FILE* copy_file_pointer(FILE* f) {
- int fd = fileno(f);
+static int loc_database_read(struct loc_database* db, FILE* f) {
+ clock_t start = clock();
+
+ // Read magic bytes
+ int r = loc_database_read_magic(db, f);
+ if (r)
+ return r;
- // Make a copy
- fd = dup(fd);
+ // Read the header
+ r = loc_database_read_header(db, f);
+ if (r)
+ return r;
- return fdopen(fd, "r");
+ clock_t end = clock();
+
+ INFO(db->ctx, "Opened database in %.8fs\n",
+ (double)(end - start) / CLOCKS_PER_SEC);
+
+ return 0;
}
LOC_EXPORT int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, FILE* f) {
+ // Fail on invalid file handle
+ if (!f)
+ return -EINVAL;
+
struct loc_database* db = calloc(1, sizeof(*db));
if (!db)
return -ENOMEM;
DEBUG(db->ctx, "Database object allocated at %p\n", db);
- // Copy the file pointer and work on that so we don't care if
- // the calling function closes the file
- db->file = copy_file_pointer(f);
- if (!db->file)
- goto FAIL;
-
- // Read magic bytes
- int r = loc_database_read_magic(db);
- if (r)
- return r;
-
- // Read the header
- r = loc_database_read_header(db);
- if (r)
+ int r = loc_database_read(db, f);
+ if (r) {
+ loc_database_unref(db);
return r;
+ }
*database = db;
return 0;
-
-FAIL:
- loc_database_unref(db);
-
- return -errno;
}
LOC_EXPORT struct loc_database* loc_database_ref(struct loc_database* db) {
loc_stringpool_unref(db->pool);
- // Close file
- if (db->file)
- fclose(db->file);
-
loc_unref(db->ctx);
free(db);
}
off_t lo = 0;
off_t hi = db->as_count - 1;
+ // Save start time
+ clock_t start = clock();
+
while (lo <= hi) {
off_t i = (lo + hi) / 2;
// Check if this is a match
uint32_t as_number = loc_as_get_number(*as);
- if (as_number == number)
+ if (as_number == number) {
+ clock_t end = clock();
+
+ // Log how fast this has been
+ DEBUG(db->ctx, "Found AS%u in %.8fs\n", as_number,
+ (double)(end - start) / CLOCKS_PER_SEC);
+
return 0;
+ }
// If it wasn't, we release the AS and
// adjust our search pointers
// Nothing found
*as = NULL;
- return 0;
+ return 1;
}