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 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)
}
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);
- if (r)
- goto ERROR;
-
- // Push the both onto the stack (in reverse order)
- r = loc_network_list_push(list, subnet2);
+ r = loc_network_new(network->ctx, subnet2, &first_address, prefix);
if (r)
- goto ERROR;
-
- r = loc_network_list_push(list, subnet1);
- if (r)
- goto ERROR;
+ 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);
+ 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);
+ loc_network_set_asn(*subnet1, asn);
+ loc_network_set_asn(*subnet2, asn);
}
- loc_network_unref(subnet1);
- loc_network_unref(subnet2);
+ return 0;
+}
- return list;
+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;
+
+ int r = loc_network_subnets(network, &subnet1, &subnet2);
+ if (r)
+ goto ERROR;
+
+ if (loc_network_eq(other, subnet1)) {
+ r = loc_network_list_push(list, subnet2);
+ if (r)
+ goto ERROR;
+
+ } 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);
-
- struct loc_network* subnet1 = NULL;
- struct loc_network* subnet2 = NULL;
-
- while (subnets) {
- // Fetch both subnets
- subnet1 = loc_network_list_get(subnets, 0);
- subnet2 = loc_network_list_get(subnets, 1);
-
- // Free list
- loc_network_list_unref(subnets);
- subnets = NULL;
-
- if (loc_network_eq(other, subnet1)) {
- r = loc_network_list_push(list, subnet2);
- if (r)
- goto ERROR;
-
- } else if (loc_network_eq(other, subnet2)) {
- r = loc_network_list_push(list, subnet1);
- if (r)
- goto ERROR;
-
- } else if (loc_network_is_subnet_of(other, subnet1)) {
- r = loc_network_list_push(list, subnet2);
- if (r)
- goto ERROR;
-
- subnets = loc_network_subnets(subnet1);
-
- } else if (loc_network_is_subnet_of(other, subnet2)) {
- r = loc_network_list_push(list, subnet1);
- if (r)
- goto ERROR;
-
- subnets = loc_network_subnets(subnet2);
-
- } else {
- ERROR(self->ctx, "We should never get here\n");
- goto ERROR;
- }
+ r = __loc_network_exclude(self, other, list);
+ if (r) {
+ loc_network_list_unref(list);
- loc_network_unref(subnet1);
- loc_network_unref(subnet2);
+ return NULL;
}
-#ifdef ENABLE_DEBUG
- loc_network_list_dump(list);
-#endif
-
// Return the result
return list;
-
-ERROR:
- if (subnet1)
- loc_network_unref(subnet1);
-
- if (subnet2)
- loc_network_unref(subnet2);
-
- if (list)
- loc_network_list_unref(list);
-
- return NULL;
}
LOC_EXPORT struct loc_network_list* loc_network_exclude_list(
}
// Drop this subnet if is a subnet of another subnet
- if (loc_network_is_subnet_of(subnet, subnet_to_check)) {
+ if (loc_network_is_subnet(subnet_to_check, subnet)) {
passed = 0;
loc_network_unref(subnet);
break;