#include <loc/compat.h>
#include <loc/country.h>
#include <loc/network.h>
+#include <loc/network-list.h>
#include <loc/private.h>
struct loc_network {
return network->family;
}
+LOC_EXPORT unsigned int loc_network_prefix(struct loc_network* network) {
+ switch (network->family) {
+ case AF_INET6:
+ return network->prefix;
+
+ case AF_INET:
+ return network->prefix - 96;
+ }
+
+ return 0;
+}
+
static char* loc_network_format_address(struct loc_network* network, const struct in6_addr* address) {
const size_t length = INET6_ADDRSTRLEN;
return string;
}
+LOC_EXPORT const struct in6_addr* loc_network_get_first_address(struct loc_network* network) {
+ return &network->first_address;
+}
+
LOC_EXPORT char* loc_network_format_first_address(struct loc_network* network) {
return loc_network_format_address(network, &network->first_address);
}
+LOC_EXPORT const struct in6_addr* loc_network_get_last_address(struct loc_network* network) {
+ return &network->last_address;
+}
+
LOC_EXPORT char* loc_network_format_last_address(struct loc_network* network) {
return loc_network_format_address(network, &network->last_address);
}
return loc_network_has_flag(network, flag);
}
+LOC_EXPORT int loc_network_cmp(struct loc_network* self, struct loc_network* other) {
+ // Compare family
+ if (self->family > other->family)
+ return 1;
+ else if (self->family < other->family)
+ return -1;
+
+ // Compare address
+ int r = in6_addr_cmp(&self->first_address, &other->first_address);
+ if (r)
+ return r;
+
+ // Compare prefix
+ if (self->prefix > other->prefix)
+ return 1;
+ else if (self->prefix < other->prefix)
+ return -1;
+
+ // Both networks are equal
+ return 0;
+}
+
LOC_EXPORT int loc_network_eq(struct loc_network* self, struct loc_network* other) {
// Family must be the same
if (self->family != other->family)
return 1;
}
-static int loc_network_gt(struct loc_network* self, struct loc_network* other) {
+LOC_EXPORT int loc_network_gt(struct loc_network* self, struct loc_network* other) {
// Families must match
if (self->family != other->family)
return -1;
}
LOC_EXPORT int loc_network_is_subnet(struct loc_network* self, struct loc_network* other) {
- // If the start address of the other network is smaller than this network,
- // it cannot be a subnet.
- if (in6_addr_cmp(&self->first_address, &other->first_address) < 0)
+ // Check family
+ if (self->family != other->family)
return 0;
- // If the end address of the other network is greater than this network,
- // it cannot be a subnet.
- if (in6_addr_cmp(&self->last_address, &other->last_address) > 0)
+ // The prefix must be smaller (this avoids the more complex comparisons later)
+ if (self->prefix > other->prefix)
return 0;
- return 1;
-}
-
-// XXX DEPRECATED - I find this too difficult to use
-LOC_EXPORT int loc_network_is_subnet_of(struct loc_network* self, struct loc_network* other) {
// If the start address of the other network is smaller than this network,
// it cannot be a subnet.
- if (in6_addr_cmp(&self->first_address, &other->first_address) < 0)
+ if (in6_addr_cmp(&self->first_address, &other->first_address) > 0)
return 0;
// If the end address of the other network is greater than this network,
// it cannot be a subnet.
- if (in6_addr_cmp(&self->last_address, &other->last_address) > 0)
+ if (in6_addr_cmp(&self->last_address, &other->last_address) < 0)
return 0;
return 1;
}
-LOC_EXPORT struct loc_network_list* loc_network_subnets(struct loc_network* network) {
- struct loc_network_list* list;
+LOC_EXPORT int loc_network_subnets(struct loc_network* network,
+ struct loc_network** subnet1, struct loc_network** subnet2) {
+ int r;
+ *subnet1 = NULL;
+ *subnet2 = NULL;
// New prefix length
unsigned int prefix = network->prefix + 1;
// Check if the new prefix is valid
if (valid_prefix(&network->first_address, prefix))
- return NULL;
-
- // Create a new list with the result
- int r = loc_network_list_new(network->ctx, &list);
- if (r) {
- ERROR(network->ctx, "Could not create network list: %d\n", r);
- return NULL;
- }
-
- struct loc_network* subnet1 = NULL;
- struct loc_network* subnet2 = NULL;
+ return -1;
// Create the first half of the network
- r = loc_network_new(network->ctx, &subnet1, &network->first_address, prefix);
+ r = loc_network_new(network->ctx, subnet1, &network->first_address, prefix);
if (r)
- goto ERROR;
+ return r;
// The next subnet starts after the first one
- struct in6_addr first_address = address_increment(&subnet1->last_address);
+ struct in6_addr first_address = address_increment(&(*subnet1)->last_address);
// Create the second half of the network
- r = loc_network_new(network->ctx, &subnet2, &first_address, prefix);
+ r = loc_network_new(network->ctx, subnet2, &first_address, prefix);
if (r)
- goto ERROR;
+ return r;
- // Push the both onto the stack (in reverse order)
- r = loc_network_list_push(list, subnet2);
- if (r)
- goto ERROR;
+ // Copy country code
+ const char* country_code = loc_network_get_country_code(network);
+ if (country_code) {
+ loc_network_set_country_code(*subnet1, country_code);
+ loc_network_set_country_code(*subnet2, country_code);
+ }
+
+ // Copy ASN
+ uint32_t asn = loc_network_get_asn(network);
+ if (asn) {
+ loc_network_set_asn(*subnet1, asn);
+ loc_network_set_asn(*subnet2, asn);
+ }
+
+ return 0;
+}
+
+static int __loc_network_exclude(struct loc_network* network,
+ struct loc_network* other, struct loc_network_list* list) {
+ struct loc_network* subnet1 = NULL;
+ struct loc_network* subnet2 = NULL;
- r = loc_network_list_push(list, subnet1);
+ int r = loc_network_subnets(network, &subnet1, &subnet2);
if (r)
goto ERROR;
- loc_network_unref(subnet1);
- loc_network_unref(subnet2);
+ if (loc_network_eq(other, subnet1)) {
+ r = loc_network_list_push(list, subnet2);
+ if (r)
+ goto ERROR;
- return list;
+ } else if (loc_network_eq(other, subnet2)) {
+ r = loc_network_list_push(list, subnet1);
+ if (r)
+ goto ERROR;
+
+ } else if (loc_network_is_subnet(subnet1, other)) {
+ r = loc_network_list_push(list, subnet2);
+ if (r)
+ goto ERROR;
+
+ r = __loc_network_exclude(subnet1, other, list);
+ if (r)
+ goto ERROR;
+
+ } else if (loc_network_is_subnet(subnet2, other)) {
+ r = loc_network_list_push(list, subnet1);
+ if (r)
+ goto ERROR;
+
+ r = __loc_network_exclude(subnet2, other, list);
+ if (r)
+ goto ERROR;
+
+ } else {
+ ERROR(network->ctx, "We should never get here\n");
+ r = 1;
+ goto ERROR;
+ }
ERROR:
if (subnet1)
if (subnet2)
loc_network_unref(subnet2);
- if (list)
- loc_network_list_unref(list);
-
- return NULL;
+ return r;
}
LOC_EXPORT struct loc_network_list* loc_network_exclude(
}
// Other must be a subnet of self
- if (!loc_network_is_subnet_of(other, self)) {
+ if (!loc_network_is_subnet(self, other)) {
DEBUG(self->ctx, "Network %p is not contained in network %p\n", other, self);
return NULL;
return NULL;
}
- struct loc_network_list* subnets = loc_network_subnets(self);
+ r = __loc_network_exclude(self, other, list);
+ if (r) {
+ loc_network_list_unref(list);
- struct loc_network* subnet1 = NULL;
- struct loc_network* subnet2 = NULL;
+ return NULL;
+ }
- while (subnets) {
- // Fetch both subnets
- subnet1 = loc_network_list_get(subnets, 0);
- subnet2 = loc_network_list_get(subnets, 1);
+ // Return the result
+ return list;
+}
- // Free list
- loc_network_list_unref(subnets);
- subnets = NULL;
+LOC_EXPORT struct loc_network_list* loc_network_exclude_list(
+ struct loc_network* network, struct loc_network_list* list) {
+ struct loc_network_list* to_check;
- if (loc_network_eq(other, subnet1)) {
- r = loc_network_list_push(list, subnet2);
- if (r)
- goto ERROR;
+ // Create a new list with all networks to look at
+ int r = loc_network_list_new(network->ctx, &to_check);
+ if (r)
+ return NULL;
- } else if (loc_network_eq(other, subnet2)) {
- r = loc_network_list_push(list, subnet1);
- if (r)
- goto ERROR;
+ struct loc_network* subnet = NULL;
+ struct loc_network_list* subnets = NULL;
- } else if (loc_network_is_subnet_of(other, subnet1)) {
- r = loc_network_list_push(list, subnet2);
- if (r)
- goto ERROR;
+ for (unsigned int i = 0; i < loc_network_list_size(list); i++) {
+ subnet = loc_network_list_get(list, i);
- subnets = loc_network_subnets(subnet1);
+ // Find all excluded networks
+ struct loc_network_list* excluded = loc_network_exclude(network, subnet);
+ if (excluded) {
+ // Add them all to the "to check" list
+ loc_network_list_merge(to_check, excluded);
+ loc_network_list_unref(excluded);
+ }
- } else if (loc_network_is_subnet_of(other, subnet2)) {
- r = loc_network_list_push(list, subnet1);
- if (r)
- goto ERROR;
+ // Cleanup
+ loc_network_unref(subnet);
+ }
- subnets = loc_network_subnets(subnet2);
+ r = loc_network_list_new(network->ctx, &subnets);
+ if (r) {
+ loc_network_list_unref(to_check);
+ return NULL;
+ }
- } else {
- ERROR(self->ctx, "We should never get here\n");
- goto ERROR;
- }
+ while (!loc_network_list_empty(to_check)) {
+ struct loc_network* subnet_to_check = loc_network_list_pop(to_check);
- loc_network_unref(subnet1);
- loc_network_unref(subnet2);
- }
+ // Marks whether this subnet passed all checks
+ int passed = 1;
-#ifdef ENABLE_DEBUG
- loc_network_list_dump(list);
-#endif
+ for (unsigned int i = 0; i < loc_network_list_size(list); i++) {
+ subnet = loc_network_list_get(list, i);
- // Return the result
- return list;
+ // Drop this subnet if is is already in list
+ if (loc_network_eq(subnet_to_check, subnet)) {
+ passed = 0;
+ loc_network_unref(subnet);
+ break;
+ }
-ERROR:
- if (subnet1)
- loc_network_unref(subnet1);
+ // Drop this subnet if is a subnet of another subnet
+ if (loc_network_is_subnet(subnet_to_check, subnet)) {
+ passed = 0;
+ loc_network_unref(subnet);
+ break;
+ }
- if (subnet2)
- loc_network_unref(subnet2);
+ // Break it down if it overlaps
+ if (loc_network_overlaps(subnet_to_check, subnet)) {
+ passed = 0;
- if (list)
- loc_network_list_unref(list);
+ struct loc_network_list* excluded = loc_network_exclude(subnet_to_check, subnet);
+ if (excluded) {
+ loc_network_list_merge(to_check, excluded);
+ loc_network_list_unref(excluded);
+ }
- return NULL;
+ loc_network_unref(subnet);
+ break;
+ }
+
+ loc_network_unref(subnet);
+ }
+
+ if (passed) {
+ r = loc_network_list_push(subnets, subnet_to_check);
+ }
+
+ loc_network_unref(subnet_to_check);
+ }
+
+ loc_network_list_unref(to_check);
+
+ // Sort the result
+ loc_network_list_sort(subnets);
+
+ return subnets;
}
LOC_EXPORT int loc_network_to_database_v1(struct loc_network* network, struct loc_database_network_v1* dbobj) {
struct loc_network* network;
};
-LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) {
+int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) {
struct loc_network_tree* t = calloc(1, sizeof(*t));
if (!t)
return -ENOMEM;
return 0;
}
-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) {
+struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) {
return loc_network_tree_node_ref(tree->root);
}
return 0;
}
-LOC_EXPORT int loc_network_tree_walk(struct loc_network_tree* tree,
+int loc_network_tree_walk(struct loc_network_tree* tree,
int(*filter_callback)(struct loc_network* network, void* data),
int(*callback)(struct loc_network* network, void* data), void* data) {
return __loc_network_tree_walk(tree->ctx, tree->root, filter_callback, callback, data);
free(tree);
}
-LOC_EXPORT struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) {
+struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) {
if (--tree->refcount > 0)
return tree;
return 0;
}
-LOC_EXPORT int loc_network_tree_dump(struct loc_network_tree* tree) {
+int loc_network_tree_dump(struct loc_network_tree* tree) {
DEBUG(tree->ctx, "Dumping network tree at %p\n", tree);
return loc_network_tree_walk(tree, NULL, __loc_network_tree_dump, NULL);
}
-LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) {
+int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) {
DEBUG(tree->ctx, "Adding network %p to tree %p\n", network, tree);
struct loc_network_tree_node* node = loc_network_tree_get_path(tree,
return 0;
}
-LOC_EXPORT size_t loc_network_tree_count_networks(struct loc_network_tree* tree) {
+size_t loc_network_tree_count_networks(struct loc_network_tree* tree) {
size_t counter = 0;
int r = loc_network_tree_walk(tree, NULL, __loc_network_tree_count, &counter);
return counter;
}
-LOC_EXPORT size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) {
+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) {
+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;
return 0;
}
-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) {
+struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) {
if (node)
node->refcount++;
free(node);
}
-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) {
+struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) {
if (!node)
return NULL;
return NULL;
}
-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) {
+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
return loc_network_tree_node_ref(node);
}
-LOC_EXPORT int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) {
+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) {
+struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) {
return loc_network_ref(node->network);
}
-
-// List
-
-struct loc_network_list {
- struct loc_ctx* ctx;
- int refcount;
-
- struct loc_network* list[1024];
- size_t size;
- size_t max_size;
-};
-
-LOC_EXPORT int loc_network_list_new(struct loc_ctx* ctx,
- struct loc_network_list** list) {
- struct loc_network_list* l = calloc(1, sizeof(*l));
- if (!l)
- return -ENOMEM;
-
- l->ctx = loc_ref(ctx);
- l->refcount = 1;
-
- // Do not allow this list to grow larger than this
- l->max_size = 1024;
-
- DEBUG(l->ctx, "Network list allocated at %p\n", l);
- *list = l;
- return 0;
-}
-
-LOC_EXPORT struct loc_network_list* loc_network_list_ref(struct loc_network_list* list) {
- list->refcount++;
-
- return list;
-}
-
-static void loc_network_list_free(struct loc_network_list* list) {
- DEBUG(list->ctx, "Releasing network list at %p\n", list);
-
- for (unsigned int i = 0; i < list->size; i++)
- loc_network_unref(list->list[i]);
-
- loc_unref(list->ctx);
- free(list);
-}
-
-LOC_EXPORT struct loc_network_list* loc_network_list_unref(struct loc_network_list* list) {
- if (!list)
- return NULL;
-
- if (--list->refcount > 0)
- return list;
-
- loc_network_list_free(list);
- return NULL;
-}
-
-LOC_EXPORT size_t loc_network_list_size(struct loc_network_list* list) {
- return list->size;
-}
-
-LOC_EXPORT int loc_network_list_empty(struct loc_network_list* list) {
- return list->size == 0;
-}
-
-LOC_EXPORT void loc_network_list_clear(struct loc_network_list* list) {
- for (unsigned int i = 0; i < list->size; i++)
- loc_network_unref(list->list[i]);
-
- list->size = 0;
-}
-
-LOC_EXPORT void loc_network_list_dump(struct loc_network_list* list) {
- struct loc_network* network;
- char* s;
-
- for (unsigned int i = 0; i < list->size; i++) {
- network = list->list[i];
-
- s = loc_network_str(network);
-
- INFO(list->ctx, "%s\n", s);
- free(s);
- }
-}
-
-LOC_EXPORT struct loc_network* loc_network_list_get(struct loc_network_list* list, size_t index) {
- // Check index
- if (index >= list->size)
- return NULL;
-
- return loc_network_ref(list->list[index]);
-}
-
-LOC_EXPORT int loc_network_list_push(struct loc_network_list* list, struct loc_network* network) {
- // Do not add networks that are already on the list
- if (loc_network_list_contains(list, network))
- return 0;
-
- // Check if we have space left
- if (list->size == list->max_size) {
- ERROR(list->ctx, "%p: Could not push network onto the stack: Stack full\n", list);
- return -ENOMEM;
- }
-
- DEBUG(list->ctx, "%p: Pushing network %p onto stack\n", list, network);
-
- list->list[list->size++] = loc_network_ref(network);
-
- return 0;
-}
-
-LOC_EXPORT struct loc_network* loc_network_list_pop(struct loc_network_list* list) {
- // Return nothing when empty
- if (loc_network_list_empty(list)) {
- DEBUG(list->ctx, "%p: Popped empty stack\n", list);
- return NULL;
- }
-
- struct loc_network* network = list->list[--list->size];
-
- DEBUG(list->ctx, "%p: Popping network %p from stack\n", list, network);
-
- return network;
-}
-
-LOC_EXPORT int loc_network_list_contains(struct loc_network_list* list, struct loc_network* network) {
- for (unsigned int i = 0; i < list->size; i++) {
- if (loc_network_eq(list->list[i], network))
- return 1;
- }
-
- return 0;
-}
-
-static void loc_network_list_swap(struct loc_network_list* list, unsigned int i1, unsigned int i2) {
- // Do nothing for invalid indices
- if (i1 >= list->size || i2 >= list->size)
- return;
-
- struct loc_network* network1 = list->list[i1];
- struct loc_network* network2 = list->list[i2];
-
- list->list[i1] = network2;
- list->list[i2] = network1;
-}
-
-LOC_EXPORT void loc_network_list_reverse(struct loc_network_list* list) {
- unsigned int i = 0;
- unsigned int j = list->size - 1;
-
- while (i < j) {
- loc_network_list_swap(list, i++, j--);
- }
-}
-
-LOC_EXPORT void loc_network_list_sort(struct loc_network_list* list) {
- unsigned int n = list->size;
- int swapped;
-
- do {
- swapped = 0;
-
- for (unsigned int i = 1; i < n; i++) {
- if (loc_network_gt(list->list[i-1], list->list[i]) > 0) {
- loc_network_list_swap(list, i-1, i);
- swapped = 1;
- }
- }
-
- n--;
- } while (swapped);
-}
-
-LOC_EXPORT int loc_network_list_merge(
- struct loc_network_list* self, struct loc_network_list* other) {
- int r;
-
- for (unsigned int i = 0; i < other->size; i++) {
- r = loc_network_list_push(self, other->list[i]);
- if (r)
- return r;
- }
-
- return 0;
-}
projects / people / ms / libloc.git / blobdiff