# include <endian.h>
#endif
-#include <loc/libloc.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/network.h>
-#include <loc/private.h>
+#include <libloc/libloc.h>
+#include <libloc/address.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
+#include <libloc/private.h>
struct loc_network {
struct loc_ctx* ctx;
char country_code[3];
uint32_t asn;
enum loc_network_flags flags;
-};
-
-static int valid_prefix(struct in6_addr* address, unsigned int prefix) {
- // The prefix cannot be larger than 128 bits
- if (prefix > 128)
- return 1;
-
- // And the prefix cannot be zero
- if (prefix == 0)
- return 1;
-
- // For IPv4-mapped addresses the prefix has to be 96 or lager
- if (IN6_IS_ADDR_V4MAPPED(address) && prefix <= 96)
- return 1;
-
- return 0;
-}
-
-static struct in6_addr prefix_to_bitmask(unsigned int prefix) {
- struct in6_addr bitmask;
-
- for (unsigned int i = 0; i < 16; i++)
- bitmask.s6_addr[i] = 0;
- for (int i = prefix, j = 0; i > 0; i -= 8, j++) {
- if (i >= 8)
- bitmask.s6_addr[j] = 0xff;
- else
- bitmask.s6_addr[j] = 0xff << (8 - i);
- }
-
- return bitmask;
-}
-
-static struct in6_addr make_first_address(const struct in6_addr* address, const struct in6_addr* bitmask) {
- struct in6_addr a;
-
- // Perform bitwise AND
- for (unsigned int i = 0; i < 4; i++)
- a.s6_addr32[i] = address->s6_addr32[i] & bitmask->s6_addr32[i];
-
- return a;
-}
-
-static struct in6_addr make_last_address(const struct in6_addr* address, const struct in6_addr* bitmask) {
- struct in6_addr a;
-
- // Perform bitwise OR
- for (unsigned int i = 0; i < 4; i++)
- a.s6_addr32[i] = address->s6_addr32[i] | ~bitmask->s6_addr32[i];
-
- return a;
-}
+ char string[INET6_ADDRSTRLEN + 4];
+};
LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network,
struct in6_addr* address, unsigned int prefix) {
- // Address cannot be unspecified
- if (IN6_IS_ADDR_UNSPECIFIED(address)) {
- DEBUG(ctx, "Start address is unspecified\n");
- return -EINVAL;
- }
-
- // Address cannot be loopback
- if (IN6_IS_ADDR_LOOPBACK(address)) {
- DEBUG(ctx, "Start address is loopback address\n");
- return -EINVAL;
- }
-
- // Address cannot be link-local
- if (IN6_IS_ADDR_LINKLOCAL(address)) {
- DEBUG(ctx, "Start address cannot be link-local\n");
- return -EINVAL;
- }
-
- // Address cannot be site-local
- if (IN6_IS_ADDR_SITELOCAL(address)) {
- DEBUG(ctx, "Start address cannot be site-local\n");
- return -EINVAL;
- }
+ struct loc_network* n = NULL;
// Validate the prefix
- if (valid_prefix(address, prefix) != 0) {
- DEBUG(ctx, "Invalid prefix: %u\n", prefix);
- return -EINVAL;
+ if (!loc_address_valid_prefix(address, prefix)) {
+ ERROR(ctx, "Invalid prefix in %s: %u\n", loc_address_str(address), prefix);
+ errno = EINVAL;
+ return 1;
}
- struct loc_network* n = calloc(1, sizeof(*n));
+ // Allocate a new network
+ n = calloc(1, sizeof(*n));
if (!n)
- return -ENOMEM;
+ return 1;
n->ctx = loc_ref(ctx);
n->refcount = 1;
// Store the prefix
- n->prefix = prefix;
+ if (IN6_IS_ADDR_V4MAPPED(address))
+ n->prefix = prefix + 96;
+ else
+ n->prefix = prefix;
// Convert the prefix into a bitmask
- struct in6_addr bitmask = prefix_to_bitmask(n->prefix);
+ const struct in6_addr bitmask = loc_prefix_to_bitmask(n->prefix);
// Store the first and last address in the network
- n->first_address = make_first_address(address, &bitmask);
- n->last_address = make_last_address(&n->first_address, &bitmask);
+ n->first_address = loc_address_and(address, &bitmask);
+ n->last_address = loc_address_or(&n->first_address, &bitmask);
// Set family
- if (IN6_IS_ADDR_V4MAPPED(&n->first_address))
- n->family = AF_INET;
- else
- n->family = AF_INET6;
+ n->family = loc_address_family(&n->first_address);
DEBUG(n->ctx, "Network allocated at %p\n", n);
*network = n;
return 0;
}
-LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx, struct loc_network** network,
- const char* address_string) {
- struct in6_addr first_address;
- char* prefix_string;
- unsigned int prefix = 128;
- int r = -EINVAL;
-
- DEBUG(ctx, "Attempting to parse network %s\n", address_string);
-
- // Make a copy of the string to work on it
- char* buffer = strdup(address_string);
- address_string = prefix_string = buffer;
-
- // Split address and prefix
- address_string = strsep(&prefix_string, "/");
-
- DEBUG(ctx, " Split into address = %s, prefix = %s\n", address_string, prefix_string);
+LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx,
+ struct loc_network** network, const char* string) {
+ struct in6_addr address;
+ unsigned int prefix;
- // Parse the address
- r = loc_parse_address(ctx, address_string, &first_address);
+ // Parse the input
+ int r = loc_address_parse(&address, &prefix, string);
if (r) {
- DEBUG(ctx, "The address could not be parsed\n");
- goto FAIL;
- }
-
- // If a prefix was given, we will try to parse it
- if (prefix_string) {
- // Convert prefix to integer
- prefix = strtol(prefix_string, NULL, 10);
-
- if (!prefix) {
- DEBUG(ctx, "The prefix was not parsable: %s\n", prefix_string);
- goto FAIL;
- }
-
- // Map the prefix to IPv6 if needed
- if (IN6_IS_ADDR_V4MAPPED(&first_address))
- prefix += 96;
- }
-
-FAIL:
- // Free temporary buffer
- free(buffer);
-
- // Exit if the parsing was unsuccessful
- if (r)
+ ERROR(ctx, "Could not parse network %s: %m\n", string);
return r;
+ }
// Create a new network
- return loc_network_new(ctx, network, &first_address, prefix);
+ return loc_network_new(ctx, network, &address, prefix);
}
LOC_EXPORT struct loc_network* loc_network_ref(struct loc_network* network) {
}
LOC_EXPORT struct loc_network* loc_network_unref(struct loc_network* network) {
- if (!network)
- return NULL;
-
if (--network->refcount > 0)
return network;
return NULL;
}
-static int format_ipv6_address(const struct in6_addr* address, char* string, size_t length) {
- const char* ret = inet_ntop(AF_INET6, address, string, length);
- if (!ret)
- return -1;
-
- return 0;
-}
-
-static int format_ipv4_address(const struct in6_addr* address, char* string, size_t length) {
- struct in_addr ipv4_address;
- ipv4_address.s_addr = address->s6_addr32[3];
-
- const char* ret = inet_ntop(AF_INET, &ipv4_address, string, length);
- if (!ret)
- return -1;
-
- return 0;
-}
-
-LOC_EXPORT char* loc_network_str(struct loc_network* network) {
- int r;
- const size_t length = INET6_ADDRSTRLEN + 4;
-
- char* string = malloc(length);
- if (!string)
- return NULL;
-
- unsigned int prefix = network->prefix;
-
- switch (network->family) {
- case AF_INET6:
- r = format_ipv6_address(&network->first_address, string, length);
- break;
-
- case AF_INET:
- r = format_ipv4_address(&network->first_address, string, length);
- prefix -= 96;
- break;
-
- default:
- r = -1;
- break;
- }
+LOC_EXPORT const char* loc_network_str(struct loc_network* network) {
+ if (!*network->string) {
+ // Format the address
+ const char* address = loc_address_str(&network->first_address);
+ if (!address)
+ return NULL;
- if (r) {
- ERROR(network->ctx, "Could not convert network to string: %s\n", strerror(errno));
- free(string);
+ // Fetch the prefix
+ unsigned int prefix = loc_network_prefix(network);
- return NULL;
+ // Format the string
+ int r = snprintf(network->string, sizeof(network->string) - 1,
+ "%s/%u", address, prefix);
+ if (r < 0) {
+ ERROR(network->ctx, "Could not format network string: %m\n");
+ *network->string = '\0';
+ return NULL;
+ }
}
- // Append prefix
- sprintf(string + strlen(string), "/%u", prefix);
-
- return string;
+ return network->string;
}
LOC_EXPORT int loc_network_address_family(struct loc_network* network) {
return network->family;
}
-static char* loc_network_format_address(struct loc_network* network, const struct in6_addr* address) {
- const size_t length = INET6_ADDRSTRLEN;
-
- char* string = malloc(length);
- if (!string)
- return NULL;
-
- int r = 0;
-
+LOC_EXPORT unsigned int loc_network_prefix(struct loc_network* network) {
switch (network->family) {
case AF_INET6:
- r = format_ipv6_address(address, string, length);
- break;
+ return network->prefix;
case AF_INET:
- r = format_ipv4_address(address, string, length);
- break;
-
- default:
- r = -1;
- break;
+ return network->prefix - 96;
}
- if (r) {
- ERROR(network->ctx, "Could not format IP address to string: %s\n", strerror(errno));
- free(string);
+ return 0;
+}
- return NULL;
- }
+unsigned int loc_network_raw_prefix(struct loc_network* network) {
+ return network->prefix;
+}
+
+LOC_EXPORT const struct in6_addr* loc_network_get_first_address(struct loc_network* network) {
+ return &network->first_address;
+}
- return string;
+LOC_EXPORT const char* loc_network_format_first_address(struct loc_network* network) {
+ return loc_address_str(&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);
+LOC_EXPORT const char* loc_network_format_last_address(struct loc_network* network) {
+ return loc_address_str(&network->last_address);
}
-LOC_EXPORT int loc_network_match_address(struct loc_network* network, const struct in6_addr* address) {
+LOC_EXPORT int loc_network_matches_address(struct loc_network* network, const struct in6_addr* address) {
// Address must be larger than the start address
- if (in6_addr_cmp(&network->first_address, address) > 0)
- return 1;
+ if (loc_address_cmp(&network->first_address, address) > 0)
+ return 0;
// Address must be smaller than the last address
- if (in6_addr_cmp(&network->last_address, address) < 0)
- return 1;
+ if (loc_address_cmp(&network->last_address, address) < 0)
+ return 0;
// The address is inside this network
- return 0;
+ return 1;
}
LOC_EXPORT const char* loc_network_get_country_code(struct loc_network* network) {
return 0;
}
-LOC_EXPORT int loc_network_match_country_code(struct loc_network* network, const char* country_code) {
+LOC_EXPORT int loc_network_matches_country_code(struct loc_network* network, const char* country_code) {
+ // Search for any special flags
+ const int flag = loc_country_special_code_to_flag(country_code);
+
+ // If we found a flag, we will return whether it is set or not
+ if (flag)
+ return loc_network_has_flag(network, flag);
+
// Check country code
if (!loc_country_code_is_valid(country_code))
return -EINVAL;
+ // Check for an exact match
return (network->country_code[0] == country_code[0])
&& (network->country_code[1] == country_code[1]);
}
return 0;
}
-LOC_EXPORT int loc_network_match_asn(struct loc_network* network, uint32_t asn) {
- return network->asn == asn;
-}
-
LOC_EXPORT int loc_network_has_flag(struct loc_network* network, uint32_t flag) {
return network->flags & flag;
}
return 0;
}
-LOC_EXPORT int loc_network_match_flag(struct loc_network* network, uint32_t flag) {
- return loc_network_has_flag(network, flag);
+LOC_EXPORT int loc_network_cmp(struct loc_network* self, struct loc_network* other) {
+ // Compare address
+ int r = loc_address_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_is_subnet_of(struct loc_network* self, struct loc_network* other) {
+int loc_network_properties_cmp(struct loc_network* self, struct loc_network* other) {
+ int r;
+
+ // Check country code
+ r = loc_country_code_cmp(self->country_code, other->country_code);
+ if (r)
+ return r;
+
+ // Check ASN
+ if (self->asn > other->asn)
+ return 1;
+ else if (self->asn < other->asn)
+ return -1;
+
+ // Check flags
+ if (self->flags > other->flags)
+ return 1;
+ else if (self->flags < other->flags)
+ return -1;
+
+ return 0;
+}
+
+LOC_EXPORT int loc_network_overlaps(struct loc_network* self, struct loc_network* other) {
+ // Either of the start addresses must be in the other subnet
+ if (loc_network_matches_address(self, &other->first_address))
+ return 1;
+
+ if (loc_network_matches_address(other, &self->first_address))
+ return 1;
+
+ // Or either of the end addresses is in the other subnet
+ if (loc_network_matches_address(self, &other->last_address))
+ return 1;
+
+ if (loc_network_matches_address(other, &self->last_address))
+ return 1;
+
+ return 0;
+}
+
+LOC_EXPORT int loc_network_is_subnet(struct loc_network* self, struct loc_network* other) {
+ // The prefix must be smaller (this avoids the more complex comparisons later)
+ if (self->prefix > other->prefix)
+ return 0;
+
// 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 (loc_address_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 (loc_address_cmp(&self->last_address, &other->last_address) < 0)
return 0;
return 1;
}
-LOC_EXPORT int loc_network_to_database_v1(struct loc_network* network, struct loc_database_network_v1* dbobj) {
- // Add country code
- loc_country_code_copy(dbobj->country_code, network->country_code);
-
- // Add ASN
- dbobj->asn = htobe32(network->asn);
+LOC_EXPORT int loc_network_subnets(struct loc_network* network,
+ struct loc_network** subnet1, struct loc_network** subnet2) {
+ int r;
+ *subnet1 = NULL;
+ *subnet2 = NULL;
- // Flags
- dbobj->flags = htobe16(network->flags);
+ // New prefix length
+ unsigned int prefix = loc_network_prefix(network) + 1;
- return 0;
-}
-
-LOC_EXPORT int loc_network_new_from_database_v1(struct loc_ctx* ctx, struct loc_network** network,
- struct in6_addr* address, unsigned int prefix, const struct loc_database_network_v1* dbobj) {
- char country_code[3] = "\0\0";
+ // Check if the new prefix is valid
+ if (!loc_address_valid_prefix(&network->first_address, prefix)) {
+ ERROR(network->ctx, "Invalid prefix: %d\n", prefix);
+ errno = EINVAL;
+ return 1;
+ }
- int r = loc_network_new(ctx, network, address, prefix);
- if (r) {
- ERROR(ctx, "Could not allocate a new network: %s", strerror(-r));
+ // Create the first half of the network
+ r = loc_network_new(network->ctx, subnet1, &network->first_address, prefix);
+ if (r)
return r;
- }
- // Import country code
- loc_country_code_copy(country_code, dbobj->country_code);
+ // The next subnet starts after the first one
+ struct in6_addr first_address = (*subnet1)->last_address;
+ loc_address_increment(&first_address);
- r = loc_network_set_country_code(*network, country_code);
- if (r) {
- ERROR(ctx, "Could not set country code: %s\n", country_code);
+ // Create the second half of the network
+ r = loc_network_new(network->ctx, subnet2, &first_address, prefix);
+ if (r)
return r;
- }
- // Import ASN
- uint32_t asn = be32toh(dbobj->asn);
- r = loc_network_set_asn(*network, asn);
- if (r) {
- ERROR(ctx, "Could not set ASN: %d\n", asn);
- return r;
+ // 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);
}
- // Import flags
- int flags = be16toh(dbobj->flags);
- r = loc_network_set_flag(*network, flags);
- if (r) {
- ERROR(ctx, "Could not set flags: %d\n", flags);
- return r;
+ // Copy ASN
+ uint32_t asn = loc_network_get_asn(network);
+ if (asn) {
+ loc_network_set_asn(*subnet1, asn);
+ loc_network_set_asn(*subnet2, asn);
}
+ // Copy flags
+ loc_network_set_flag(*subnet1, network->flags);
+ loc_network_set_flag(*subnet2, network->flags);
+
return 0;
}
-struct loc_network_tree {
- struct loc_ctx* ctx;
- int refcount;
+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;
- struct loc_network_tree_node* root;
-};
+ int r = loc_network_subnets(network, &subnet1, &subnet2);
+ if (r)
+ goto ERROR;
-struct loc_network_tree_node {
- struct loc_ctx* ctx;
- int refcount;
+ if (loc_network_cmp(other, subnet1) == 0) {
+ r = loc_network_list_push(list, subnet2);
+ if (r)
+ goto ERROR;
- struct loc_network_tree_node* zero;
- struct loc_network_tree_node* one;
+ } else if (loc_network_cmp(other, subnet2) == 0) {
+ r = loc_network_list_push(list, subnet1);
+ if (r)
+ goto ERROR;
- struct loc_network* network;
-};
+ } else if (loc_network_is_subnet(subnet1, other)) {
+ r = loc_network_list_push(list, subnet2);
+ if (r)
+ goto ERROR;
-LOC_EXPORT 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;
+ r = __loc_network_exclude(subnet1, other, list);
+ if (r)
+ goto ERROR;
- t->ctx = loc_ref(ctx);
- t->refcount = 1;
+ } else if (loc_network_is_subnet(subnet2, other)) {
+ r = loc_network_list_push(list, subnet1);
+ if (r)
+ goto ERROR;
- // Create the root node
- int r = loc_network_tree_node_new(ctx, &t->root);
- if (r) {
- loc_network_tree_unref(t);
- return r;
+ 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;
}
- DEBUG(t->ctx, "Network tree allocated at %p\n", t);
- *tree = t;
- return 0;
-}
+ERROR:
+ if (subnet1)
+ loc_network_unref(subnet1);
-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);
-}
+ if (subnet2)
+ loc_network_unref(subnet2);
-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 (r)
+ DEBUG(network->ctx, "%s has failed with %d\n", __FUNCTION__, r);
- if (path == 0)
- n = &node->zero;
- else
- n = &node->one;
+ return r;
+}
- // If the desired node doesn't exist, yet, we will create it
- if (*n == NULL) {
- int r = loc_network_tree_node_new(node->ctx, n);
- if (r)
- return NULL;
- }
+static int __loc_network_exclude_to_list(struct loc_network* self,
+ struct loc_network* other, struct loc_network_list* list) {
+ // Other must be a subnet of self
+ if (!loc_network_is_subnet(self, other)) {
+ DEBUG(self->ctx, "Network %p is not contained in network %p\n", other, self);
- return *n;
-}
+ // Exit silently
+ return 0;
+ }
-static struct loc_network_tree_node* loc_network_tree_get_path(struct loc_network_tree* tree, const struct in6_addr* address, unsigned int prefix) {
- struct loc_network_tree_node* node = tree->root;
+ // We cannot perform this operation if both networks equal
+ if (loc_network_cmp(self, other) == 0) {
+ DEBUG(self->ctx, "Networks %p and %p are equal\n", self, other);
- for (unsigned int i = 0; i < prefix; i++) {
- // Check if the ith bit is one or zero
- node = loc_network_tree_get_node(node, in6_addr_get_bit(address, i));
+ // Exit silently
+ return 0;
}
- return node;
+ return __loc_network_exclude(self, other, list);
}
-static int __loc_network_tree_walk(struct loc_ctx* ctx, struct loc_network_tree_node* node,
- int(*filter_callback)(struct loc_network* network, void* data),
- int(*callback)(struct loc_network* network, void* data), void* data) {
- int r;
+LOC_EXPORT struct loc_network_list* loc_network_exclude(
+ struct loc_network* self, struct loc_network* other) {
+ struct loc_network_list* list;
- // Finding a network ends the walk here
- if (node->network) {
- if (filter_callback) {
- int f = filter_callback(node->network, data);
- if (f < 0)
- return f;
+ DEBUG(self->ctx, "Returning %s excluding %s...\n",
+ loc_network_str(self), loc_network_str(other));
- // Skip network if filter function returns value greater than zero
- if (f > 0)
- return 0;
- }
+ // Create a new list with the result
+ int r = loc_network_list_new(self->ctx, &list);
+ if (r) {
+ ERROR(self->ctx, "Could not create network list: %d\n", r);
- r = callback(node->network, data);
- if (r)
- return r;
+ return NULL;
}
- // Walk down on the left side of the tree first
- if (node->zero) {
- r = __loc_network_tree_walk(ctx, node->zero, filter_callback, callback, data);
- if (r)
- return r;
- }
+ r = __loc_network_exclude_to_list(self, other, list);
+ if (r) {
+ loc_network_list_unref(list);
- // Then walk on the other side
- if (node->one) {
- r = __loc_network_tree_walk(ctx, node->one, filter_callback, callback, data);
- if (r)
- return r;
+ return NULL;
}
- return 0;
-}
-
-LOC_EXPORT 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);
+ // Return the result
+ return list;
}
-static void loc_network_tree_free(struct loc_network_tree* tree) {
- DEBUG(tree->ctx, "Releasing network tree at %p\n", tree);
+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;
- loc_network_tree_node_unref(tree->root);
+ // Create a new list with all networks to look at
+ int r = loc_network_list_new(network->ctx, &to_check);
+ if (r)
+ return NULL;
- loc_unref(tree->ctx);
- free(tree);
-}
+ struct loc_network* subnet = NULL;
+ struct loc_network_list* subnets = NULL;
-LOC_EXPORT struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) {
- if (--tree->refcount > 0)
- return tree;
+ for (unsigned int i = 0; i < loc_network_list_size(list); i++) {
+ subnet = loc_network_list_get(list, i);
- loc_network_tree_free(tree);
- return NULL;
-}
+ // Find all excluded networks
+ if (!loc_network_list_contains(to_check, subnet)) {
+ r = __loc_network_exclude_to_list(network, subnet, to_check);
+ if (r) {
+ loc_network_list_unref(to_check);
+ loc_network_unref(subnet);
-static int __loc_network_tree_dump(struct loc_network* network, void* data) {
- DEBUG(network->ctx, "Dumping network at %p\n", network);
+ return NULL;
+ }
+ }
- char* s = loc_network_str(network);
- if (!s)
- return 1;
+ // Cleanup
+ loc_network_unref(subnet);
+ }
- INFO(network->ctx, "%s\n", s);
- free(s);
+ r = loc_network_list_new(network->ctx, &subnets);
+ if (r) {
+ loc_network_list_unref(to_check);
+ return NULL;
+ }
- return 0;
-}
+ off_t smallest_subnet = 0;
-LOC_EXPORT int loc_network_tree_dump(struct loc_network_tree* tree) {
- DEBUG(tree->ctx, "Dumping network tree at %p\n", tree);
+ while (!loc_network_list_empty(to_check)) {
+ struct loc_network* subnet_to_check = loc_network_list_pop_first(to_check);
- return loc_network_tree_walk(tree, NULL, __loc_network_tree_dump, NULL);
-}
+ // Check whether the subnet to check is part of the input list
+ if (loc_network_list_contains(list, subnet_to_check)) {
+ loc_network_unref(subnet_to_check);
+ continue;
+ }
-LOC_EXPORT 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);
+ // Marks whether this subnet passed all checks
+ int passed = 1;
- struct loc_network_tree_node* node = loc_network_tree_get_path(tree,
- &network->first_address, network->prefix);
- if (!node) {
- ERROR(tree->ctx, "Could not find a node\n");
- return -ENOMEM;
- }
+ for (unsigned int i = smallest_subnet; i < loc_network_list_size(list); i++) {
+ subnet = loc_network_list_get(list, i);
- // Check if node has not been set before
- if (node->network) {
- DEBUG(tree->ctx, "There is already a network at this path\n");
- return -EBUSY;
- }
+ // Drop this subnet if is a subnet of another subnet
+ if (loc_network_is_subnet(subnet, subnet_to_check)) {
+ passed = 0;
+ loc_network_unref(subnet);
+ break;
+ }
- // Point node to the network
- node->network = loc_network_ref(network);
+ // Break it down if it overlaps
+ if (loc_network_overlaps(subnet, subnet_to_check)) {
+ passed = 0;
- return 0;
-}
+ __loc_network_exclude_to_list(subnet_to_check, subnet, to_check);
-static int __loc_network_tree_count(struct loc_network* network, void* data) {
- size_t* counter = (size_t*)data;
+ loc_network_unref(subnet);
+ break;
+ }
- // Increase the counter for each network
- counter++;
+ // If the subnet is strictly greater, we do not need to continue the search
+ r = loc_network_cmp(subnet, subnet_to_check);
+ if (r > 0) {
+ loc_network_unref(subnet);
+ break;
- return 0;
-}
+ // If it is strictly smaller, we can continue the search from here next
+ // time because all networks that are to be checked can only be larger
+ // than this one.
+ } else if (r < 0) {
+ smallest_subnet = i;
+ }
-LOC_EXPORT size_t loc_network_tree_count_networks(struct loc_network_tree* tree) {
- size_t counter = 0;
+ loc_network_unref(subnet);
+ }
- int r = loc_network_tree_walk(tree, NULL, __loc_network_tree_count, &counter);
- if (r)
- return r;
+ if (passed) {
+ r = loc_network_list_push(subnets, subnet_to_check);
+ }
- return counter;
-}
+ loc_network_unref(subnet_to_check);
+ }
-static size_t __loc_network_tree_count_nodes(struct loc_network_tree_node* node) {
- size_t counter = 1;
+ loc_network_list_unref(to_check);
- if (node->zero)
- counter += __loc_network_tree_count_nodes(node->zero);
+ return subnets;
+}
- if (node->one)
- counter += __loc_network_tree_count_nodes(node->one);
+int loc_network_merge(struct loc_network** n,
+ struct loc_network* n1, struct loc_network* n2) {
+ struct loc_network* network = NULL;
+ struct in6_addr address;
+ int r;
- return counter;
-}
+ // Reset pointer
+ *n = NULL;
-LOC_EXPORT size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) {
- return __loc_network_tree_count_nodes(tree->root);
-}
+ DEBUG(n1->ctx, "Attempting to merge %s and %s\n", loc_network_str(n1), loc_network_str(n2));
-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;
+ // Family must match
+ if (n1->family != n2->family)
+ return 0;
- n->ctx = loc_ref(ctx);
- n->refcount = 1;
+ // The prefix must match, too
+ if (n1->prefix != n2->prefix)
+ return 0;
- n->zero = n->one = NULL;
+ // Cannot merge ::/0 or 0.0.0.0/0
+ if (!n1->prefix || !n2->prefix)
+ return 0;
- DEBUG(n->ctx, "Network node allocated at %p\n", n);
- *node = n;
- return 0;
-}
+ const unsigned int prefix = loc_network_prefix(n1);
-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) {
- if (node)
- node->refcount++;
+ // How many bits do we need to represent this address?
+ const size_t bitlength = loc_address_bit_length(&n1->first_address);
- return node;
-}
+ // We cannot shorten this any more
+ if (bitlength >= prefix) {
+ DEBUG(n1->ctx, "Cannot shorten this any further because we need at least %jd bits,"
+ " but only have %d\n", bitlength, prefix);
-static void loc_network_tree_node_free(struct loc_network_tree_node* node) {
- DEBUG(node->ctx, "Releasing network node at %p\n", node);
+ return 0;
+ }
- if (node->network)
- loc_network_unref(node->network);
+ // Increment the last address of the first network
+ address = n1->last_address;
+ loc_address_increment(&address);
- if (node->zero)
- loc_network_tree_node_unref(node->zero);
+ // If they don't match they are not neighbours
+ if (loc_address_cmp(&address, &n2->first_address) != 0)
+ return 0;
- if (node->one)
- loc_network_tree_node_unref(node->one);
+ // All properties must match, too
+ if (loc_network_properties_cmp(n1, n2) != 0)
+ return 0;
- loc_unref(node->ctx);
- free(node);
-}
+ // Create a new network object
+ r = loc_network_new(n1->ctx, &network, &n1->first_address, prefix - 1);
+ if (r)
+ return r;
-LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) {
- if (!node)
- return NULL;
+ // Copy everything else
+ loc_country_code_copy(network->country_code, n1->country_code);
+ network->asn = n1->asn;
+ network->flags = n1->flags;
- if (--node->refcount > 0)
- return node;
+ // Return pointer
+ *n = network;
- loc_network_tree_node_free(node);
- return NULL;
+ return 0;
}
-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;
+int loc_network_to_database_v1(struct loc_network* network, struct loc_database_network_v1* dbobj) {
+ // Add country code
+ loc_country_code_copy(dbobj->country_code, network->country_code);
- if (!node)
- return NULL;
+ // Add ASN
+ dbobj->asn = htobe32(network->asn);
- return loc_network_tree_node_ref(node);
-}
+ // Flags
+ dbobj->flags = htobe16(network->flags);
-LOC_EXPORT int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) {
- return (!!node->network);
+ return 0;
}
-LOC_EXPORT struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) {
- return loc_network_ref(node->network);
-}
+int loc_network_new_from_database_v1(struct loc_ctx* ctx, struct loc_network** network,
+ struct in6_addr* address, unsigned int prefix, const struct loc_database_network_v1* dbobj) {
+ char country_code[3] = "\0\0";
-// List
+ // Adjust prefix for IPv4
+ if (IN6_IS_ADDR_V4MAPPED(address))
+ prefix -= 96;
-struct loc_network_list {
- struct loc_ctx* ctx;
- int refcount;
+ int r = loc_network_new(ctx, network, address, prefix);
+ if (r) {
+ ERROR(ctx, "Could not allocate a new network: %m\n");
+ return r;
+ }
- struct loc_network* list[1024];
- size_t size;
- size_t max_size;
-};
+ // Import country code
+ loc_country_code_copy(country_code, dbobj->country_code);
-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;
+ r = loc_network_set_country_code(*network, country_code);
+ if (r) {
+ ERROR(ctx, "Could not set country code: %s\n", country_code);
+ return r;
+ }
- l->ctx = loc_ref(ctx);
- l->refcount = 1;
+ // Import ASN
+ uint32_t asn = be32toh(dbobj->asn);
+ r = loc_network_set_asn(*network, asn);
+ if (r) {
+ ERROR(ctx, "Could not set ASN: %d\n", asn);
+ return r;
+ }
- // Do not allow this list to grow larger than this
- l->max_size = 1024;
+ // Import flags
+ int flags = be16toh(dbobj->flags);
+ r = loc_network_set_flag(*network, flags);
+ if (r) {
+ ERROR(ctx, "Could not set flags: %d\n", flags);
+ return r;
+ }
- 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++;
+static char* loc_network_reverse_pointer6(struct loc_network* network, const char* suffix) {
+ char* buffer = NULL;
+ int r;
- return list;
-}
+ unsigned int prefix = loc_network_prefix(network);
-static void loc_network_list_free(struct loc_network_list* list) {
- DEBUG(list->ctx, "Releasing network list at %p\n", list);
+ // Must border on a nibble
+ if (prefix % 4) {
+ errno = ENOTSUP;
+ return NULL;
+ }
- for (unsigned int i = 0; i < list->size; i++)
- loc_network_unref(list->list[i]);
+ if (!suffix)
+ suffix = "ip6.arpa.";
- loc_unref(list->ctx);
- free(list);
-}
+ // Initialize the buffer
+ r = asprintf(&buffer, "%s", suffix);
+ if (r < 0)
+ goto ERROR;
-LOC_EXPORT struct loc_network_list* loc_network_list_unref(struct loc_network_list* list) {
- if (!list)
- return NULL;
+ for (unsigned int i = 0; i < (prefix / 4); i++) {
+ r = asprintf(&buffer, "%x.%s", loc_address_get_nibble(&network->first_address, i), buffer);
+ if (r < 0)
+ goto ERROR;
+ }
- if (--list->refcount > 0)
- return list;
+ // Add the asterisk
+ if (prefix < 128) {
+ r = asprintf(&buffer, "*.%s", buffer);
+ if (r < 0)
+ goto ERROR;
+ }
- loc_network_list_free(list);
- return NULL;
-}
+ return buffer;
-LOC_EXPORT size_t loc_network_list_size(struct loc_network_list* list) {
- return list->size;
-}
+ERROR:
+ if (buffer)
+ free(buffer);
-LOC_EXPORT int loc_network_list_empty(struct loc_network_list* list) {
- return list->size == 0;
+ return NULL;
}
-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]);
+static char* loc_network_reverse_pointer4(struct loc_network* network, const char* suffix) {
+ char* buffer = NULL;
+ int r;
- list->size = 0;
-}
+ unsigned int prefix = loc_network_prefix(network);
-LOC_EXPORT struct loc_network* loc_network_list_get(struct loc_network_list* list, size_t index) {
- // Check index
- if (index >= list->size)
+ // Must border on an octet
+ if (prefix % 8) {
+ errno = ENOTSUP;
return NULL;
+ }
- return loc_network_ref(list->list[index]);
-}
+ if (!suffix)
+ suffix = "in-addr.arpa.";
+
+ switch (prefix) {
+ case 32:
+ r = asprintf(&buffer, "%d.%d.%d.%d.%s",
+ loc_address_get_octet(&network->first_address, 3),
+ loc_address_get_octet(&network->first_address, 2),
+ loc_address_get_octet(&network->first_address, 1),
+ loc_address_get_octet(&network->first_address, 0),
+ suffix);
+ break;
-LOC_EXPORT int loc_network_list_push(struct loc_network_list* list, struct loc_network* network) {
- // Check if we have space left
- if (list->size == list->max_size)
- return -ENOMEM;
+ case 24:
+ r = asprintf(&buffer, "*.%d.%d.%d.%s",
+ loc_address_get_octet(&network->first_address, 2),
+ loc_address_get_octet(&network->first_address, 1),
+ loc_address_get_octet(&network->first_address, 0),
+ suffix);
+ break;
- list->list[list->size++] = loc_network_ref(network);
+ case 16:
+ r = asprintf(&buffer, "*.%d.%d.%s",
+ loc_address_get_octet(&network->first_address, 1),
+ loc_address_get_octet(&network->first_address, 0),
+ suffix);
+ break;
- return 0;
-}
+ case 8:
+ r = asprintf(&buffer, "*.%d.%s",
+ loc_address_get_octet(&network->first_address, 0),
+ suffix);
+ break;
+
+ case 0:
+ r = asprintf(&buffer, "*.%s", suffix);
+ break;
-LOC_EXPORT struct loc_network* loc_network_list_pop(struct loc_network_list* list) {
- // Return nothing when empty
- if (loc_network_list_empty(list))
+ // To make the compiler happy
+ default:
+ return NULL;
+ }
+
+ if (r < 0)
return NULL;
- return list->list[list->size--];
+ return buffer;
+}
+
+LOC_EXPORT char* loc_network_reverse_pointer(struct loc_network* network, const char* suffix) {
+ switch (network->family) {
+ case AF_INET6:
+ return loc_network_reverse_pointer6(network, suffix);
+
+ case AF_INET:
+ return loc_network_reverse_pointer4(network, suffix);
+
+ default:
+ break;
+ }
+
+ return NULL;
}
projects / people / ms / libloc.git / blobdiff