}
LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network,
- struct in6_addr address, unsigned int prefix) {
+ struct in6_addr* address, unsigned int prefix) {
// Address cannot be unspecified
if (IN6_IS_ADDR_UNSPECIFIED(&address)) {
DEBUG(ctx, "Start address is unspecified\n");
}
// Validate the prefix
- if (valid_prefix(&address, prefix) != 0) {
+ if (valid_prefix(address, prefix) != 0) {
DEBUG(ctx, "Invalid prefix: %u\n", prefix);
return -EINVAL;
}
n->refcount = 1;
// Store the first address in the network
- n->start_address = make_start_address(&address, prefix);
+ n->start_address = make_start_address(address, prefix);
n->prefix = prefix;
DEBUG(n->ctx, "Network allocated at %p\n", n);
free(buffer);
if (r == 0) {
- r = loc_network_new(ctx, network, start_address, prefix);
+ r = loc_network_new(ctx, network, &start_address, prefix);
}
return r;
return 0;
}
+LOC_EXPORT int loc_network_new_from_database_v0(struct loc_ctx* ctx, struct loc_network** network,
+ struct in6_addr* address, const struct loc_database_network_v0* dbobj) {
+ int r = loc_network_new(ctx, network, address, dbobj->prefix);
+ if (r)
+ return r;
+
+ // Import country code
+ char country_code[3];
+ for (unsigned int i = 0; i < 2; i++) {
+ country_code[i] = dbobj->country_code[i];
+ }
+ country_code[2] = '\0';
+
+ r = loc_network_set_country_code(*network, country_code);
+ if (r)
+ return r;
+
+ // Import ASN
+ r = loc_network_set_asn(*network, be32toh(dbobj->asn));
+ if (r)
+ return r;
+
+ return 0;
+}
+
struct loc_network_tree {
struct loc_ctx* ctx;
int refcount;
};
struct loc_network_tree_node {
+ struct loc_ctx* ctx;
+ int refcount;
+
struct loc_network_tree_node* zero;
struct loc_network_tree_node* one;
t->refcount = 1;
// Create the root node
- t->root = calloc(1, sizeof(*t->root));
+ int r = loc_network_tree_node_new(ctx, &t->root);
+ if (r) {
+ loc_network_tree_unref(t);
+ return r;
+ }
DEBUG(t->ctx, "Network tree allocated at %p\n", t);
*tree = t;
return 0;
}
-static int loc_network_tree_node_new(struct loc_network_tree_node** node) {
- struct loc_network_tree_node* n = calloc(1, sizeof(*n));
- if (!n)
- return -ENOMEM;
-
- n->zero = n->one = NULL;
-
- *node = n;
- return 0;
+LOC_EXPORT struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) {
+ return loc_network_tree_node_ref(tree->root);
}
static struct loc_network_tree_node* loc_network_tree_get_node(struct loc_network_tree_node* node, int path) {
struct loc_network_tree_node** n;
if (path)
- n = &node->one;
- else
n = &node->zero;
+ else
+ n = &node->one;
// If the desired node doesn't exist, yet, we will create it
if (*n == NULL) {
- int r = loc_network_tree_node_new(n);
+ int r = loc_network_tree_node_new(node->ctx, n);
if (r)
return NULL;
}
return __loc_network_tree_walk(tree->ctx, tree->root, filter_callback, callback, data);
}
-static void loc_network_tree_free_subtree(struct loc_network_tree_node* node) {
- if (node->network)
- loc_network_unref(node->network);
-
- if (node->zero)
- loc_network_tree_free_subtree(node->zero);
-
- if (node->one)
- loc_network_tree_free_subtree(node->one);
-
- free(node);
-}
-
static void loc_network_tree_free(struct loc_network_tree* tree) {
DEBUG(tree->ctx, "Releasing network tree at %p\n", tree);
- loc_network_tree_free_subtree(tree->root);
+ loc_network_tree_node_unref(tree->root);
loc_unref(tree->ctx);
free(tree);
LOC_EXPORT size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) {
return __loc_network_tree_count_nodes(tree->root);
}
+
+LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) {
+ struct loc_network_tree_node* n = calloc(1, sizeof(*n));
+ if (!n)
+ return -ENOMEM;
+
+ n->ctx = loc_ref(ctx);
+ n->refcount = 1;
+
+ n->zero = n->one = NULL;
+
+ DEBUG(n->ctx, "Network node allocated at %p\n", n);
+ *node = n;
+ return 0;
+}
+
+LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) {
+ if (node)
+ node->refcount++;
+
+ return node;
+}
+
+static void loc_network_tree_node_free(struct loc_network_tree_node* node) {
+ DEBUG(node->ctx, "Releasing network node at %p\n", node);
+
+ if (node->network)
+ loc_network_unref(node->network);
+
+ if (node->zero)
+ loc_network_tree_node_unref(node->zero);
+
+ if (node->one)
+ loc_network_tree_node_unref(node->one);
+
+ loc_unref(node->ctx);
+ free(node);
+}
+
+LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) {
+ if (!node)
+ return NULL;
+
+ if (--node->refcount > 0)
+ return node;
+
+ loc_network_tree_node_free(node);
+ return NULL;
+}
+
+LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) {
+ if (index == 0)
+ node = node->zero;
+ else
+ node = node->one;
+
+ if (!node)
+ return NULL;
+
+ return loc_network_tree_node_ref(node);
+}
+
+LOC_EXPORT int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) {
+ return (!!node->network);
+}
+
+LOC_EXPORT struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) {
+ return loc_network_ref(node->network);
+}