Lesser General Public License for more details.
*/
-#include <arpa/inet.h>
#include <endian.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/queue.h>
#include <time.h>
+#include <loc/libloc.h>
+#include <loc/as.h>
#include <loc/format.h>
+#include <loc/network.h>
+#include <loc/private.h>
#include <loc/writer.h>
-#include "libloc-private.h"
-#include "as.h"
-
struct loc_writer {
struct loc_ctx* ctx;
int refcount;
struct loc_as** as;
size_t as_count;
+
+ struct loc_network_tree* networks;
};
LOC_EXPORT int loc_writer_new(struct loc_ctx* ctx, struct loc_writer** writer) {
w->ctx = loc_ref(ctx);
w->refcount = 1;
- int r = loc_stringpool_new(ctx, &w->pool, 1024 * 1024);
+ int r = loc_stringpool_new(ctx, &w->pool);
+ if (r) {
+ loc_writer_unref(w);
+ return r;
+ }
+
+ // Initialize the network tree
+ r = loc_network_tree_new(ctx, &w->networks);
if (r) {
loc_writer_unref(w);
return r;
loc_as_unref(writer->as[i]);
}
+ // Release network tree
+ if (writer->networks)
+ loc_network_tree_unref(writer->networks);
+
// Unref the string pool
loc_stringpool_unref(writer->pool);
}
LOC_EXPORT int loc_writer_add_as(struct loc_writer* writer, struct loc_as** as, uint32_t number) {
- int r = loc_as_new(writer->ctx, writer->pool, as, number);
+ int r = loc_as_new(writer->ctx, as, number);
if (r)
return r;
return 0;
}
+LOC_EXPORT int loc_writer_add_network(struct loc_writer* writer, struct loc_network** network, const char* string) {
+ int r;
+
+ // Create a new network object
+ r = loc_network_new_from_string(writer->ctx, network, string);
+ if (r)
+ return r;
+
+ // Add it to the local tree
+ return loc_network_tree_add_network(writer->networks, *network);
+}
+
static void make_magic(struct loc_writer* writer, struct loc_database_magic* magic) {
// Copy magic bytes
for (unsigned int i = 0; i < strlen(LOC_DATABASE_MAGIC); i++)
magic->magic[i] = LOC_DATABASE_MAGIC[i];
// Set version
- magic->version = htons(LOC_DATABASE_VERSION);
+ magic->version = htobe16(LOC_DATABASE_VERSION);
}
static void align_page_boundary(off_t* offset, FILE* f) {
struct loc_database_header_v0* header, off_t* offset, FILE* f) {
// Save the offset of the pool section
DEBUG(writer->ctx, "Pool starts at %jd bytes\n", *offset);
- header->pool_offset = htonl(*offset);
+ header->pool_offset = htobe32(*offset);
// Write the pool
size_t pool_length = loc_stringpool_write(writer->pool, f);
*offset += pool_length;
DEBUG(writer->ctx, "Pool has a length of %zu bytes\n", pool_length);
- header->pool_length = htonl(pool_length);
+ header->pool_length = htobe32(pool_length);
return 0;
}
static int loc_database_write_as_section(struct loc_writer* writer,
struct loc_database_header_v0* header, off_t* offset, FILE* f) {
DEBUG(writer->ctx, "AS section starts at %jd bytes\n", *offset);
- header->as_offset = htonl(*offset);
+ header->as_offset = htobe32(*offset);
size_t as_length = 0;
struct loc_database_as_v0 as;
for (unsigned int i = 0; i < writer->as_count; i++) {
// Convert AS into database format
- loc_as_to_database_v0(writer->as[i], &as);
+ loc_as_to_database_v0(writer->as[i], writer->pool, &as);
// Write to disk
- offset += fwrite(&as, 1, sizeof(as), f);
+ *offset += fwrite(&as, 1, sizeof(as), f);
as_length += sizeof(as);
}
DEBUG(writer->ctx, "AS section has a length of %zu bytes\n", as_length);
- header->as_length = htonl(as_length);
+ header->as_length = htobe32(as_length);
+
+ align_page_boundary(offset, f);
+
+ return 0;
+}
+
+struct node {
+ TAILQ_ENTRY(node) nodes;
+
+ struct loc_network_tree_node* node;
+
+ // Indices of the child nodes
+ uint32_t index_zero;
+ uint32_t index_one;
+};
+
+static struct node* make_node(struct loc_network_tree_node* node) {
+ struct node* n = malloc(sizeof(*n));
+ if (!n)
+ return NULL;
+
+ n->node = loc_network_tree_node_ref(node);
+ n->index_zero = n->index_one = 0;
+
+ return n;
+}
+
+static void free_node(struct node* node) {
+ loc_network_tree_node_unref(node->node);
+
+ free(node);
+}
+
+struct network {
+ TAILQ_ENTRY(network) networks;
+
+ struct loc_network* network;
+};
+
+static struct network* make_network(struct loc_network* network) {
+ struct network* n = malloc(sizeof(*n));
+ if (!n)
+ return NULL;
+
+ n->network = loc_network_ref(network);
+
+ return n;
+}
+
+static void free_network(struct network* network) {
+ loc_network_unref(network->network);
+
+ free(network);
+}
+
+static int loc_database_write_networks(struct loc_writer* writer,
+ struct loc_database_header_v0* header, off_t* offset, FILE* f) {
+ // Write the network tree
+ DEBUG(writer->ctx, "Network tree starts at %jd bytes\n", *offset);
+ header->network_tree_offset = htobe32(*offset);
+
+ size_t network_tree_length = 0;
+ size_t network_data_length = 0;
+
+ struct node* node;
+ struct node* child_node;
+
+ uint32_t index = 0;
+ uint32_t network_index = 0;
+
+ struct loc_database_network_v0 db_network;
+ struct loc_database_network_node_v0 db_node;
+
+ // Initialize queue for nodes
+ TAILQ_HEAD(node_t, node) nodes;
+ TAILQ_INIT(&nodes);
+
+ // Initialize queue for networks
+ TAILQ_HEAD(network_t, network) networks;
+ TAILQ_INIT(&networks);
+
+ // Add root
+ struct loc_network_tree_node* root = loc_network_tree_get_root(writer->networks);
+ node = make_node(root);
+
+ TAILQ_INSERT_TAIL(&nodes, node, nodes);
+
+ while (!TAILQ_EMPTY(&nodes)) {
+ // Pop first node in list
+ node = TAILQ_FIRST(&nodes);
+ TAILQ_REMOVE(&nodes, node, nodes);
+
+ DEBUG(writer->ctx, "Processing node %p\n", node);
+
+ // Get child nodes
+ struct loc_network_tree_node* node_zero = loc_network_tree_node_get(node->node, 0);
+ if (node_zero) {
+ node->index_zero = ++index;
+
+ child_node = make_node(node_zero);
+ loc_network_tree_node_unref(node_zero);
+
+ TAILQ_INSERT_TAIL(&nodes, child_node, nodes);
+ }
+
+ struct loc_network_tree_node* node_one = loc_network_tree_node_get(node->node, 1);
+ if (node_one) {
+ node->index_one = ++index;
+
+ child_node = make_node(node_one);
+ loc_network_tree_node_unref(node_one);
+
+ TAILQ_INSERT_TAIL(&nodes, child_node, nodes);
+ }
+
+ // Prepare what we are writing to disk
+ if (loc_network_tree_node_is_leaf(node->node)) {
+ struct loc_network* network = loc_network_tree_node_get_network(node->node);
+
+ // Append network to be written out later
+ struct network* nw = make_network(network);
+ TAILQ_INSERT_TAIL(&networks, nw, networks);
+
+ db_node.zero = htobe32(0xffffffff);
+ db_node.one = htobe32(network_index++);
+
+ loc_network_unref(network);
+ } else {
+ db_node.zero = htobe32(node->index_zero);
+ db_node.one = htobe32(node->index_one);
+ }
+
+ // Write the current node
+ DEBUG(writer->ctx, "Writing node %p (0 = %d, 1 = %d)\n",
+ node, node->index_zero, node->index_one);
+
+ *offset += fwrite(&db_node, 1, sizeof(db_node), f);
+ network_tree_length += sizeof(db_node);
+
+ free_node(node);
+ }
+
+ loc_network_tree_node_unref(root);
+
+ header->network_tree_length = htobe32(network_tree_length);
+
+ align_page_boundary(offset, f);
+
+ DEBUG(writer->ctx, "Networks data section starts at %jd bytes\n", *offset);
+ header->network_data_offset = htobe32(*offset);
+
+ // We have now written the entire tree and have all networks
+ // in a queue in order as they are indexed
+ while (!TAILQ_EMPTY(&networks)) {
+ struct network* nw = TAILQ_FIRST(&networks);
+ TAILQ_REMOVE(&networks, nw, networks);
+
+ // Prepare what we are writing to disk
+ int r = loc_network_to_database_v0(nw->network, &db_network);
+ if (r)
+ return r;
+
+ *offset += fwrite(&db_network, 1, sizeof(db_network), f);
+ network_data_length += sizeof(db_network);
+
+ free_network(nw);
+ }
+
+ header->network_data_length = htobe32(network_data_length);
+
+ align_page_boundary(offset, f);
return 0;
}
// Make the header
struct loc_database_header_v0 header;
- header.vendor = htonl(writer->vendor);
- header.description = htonl(writer->description);
+ header.vendor = htobe32(writer->vendor);
+ header.description = htobe32(writer->description);
time_t now = time(NULL);
header.created_at = htobe64(now);
if (r)
return r;
- align_page_boundary(&offset, f);
+ // Write all networks
+ r = loc_database_write_networks(writer, &header, &offset, f);
+ if (r)
+ return r;
// Write pool
r = loc_database_write_pool(writer, &header, &offset, f);
projects / people / ms / libloc.git / blobdiff