#include <openssl/evp.h>
#include <openssl/pem.h>
-#include <loc/libloc.h>
-#include <loc/as.h>
-#include <loc/compat.h>
-#include <loc/country.h>
-#include <loc/database.h>
-#include <loc/format.h>
-#include <loc/network.h>
-#include <loc/private.h>
-#include <loc/stringpool.h>
+#include <libloc/libloc.h>
+#include <libloc/as.h>
+#include <libloc/as-list.h>
+#include <libloc/compat.h>
+#include <libloc/country.h>
+#include <libloc/country-list.h>
+#include <libloc/database.h>
+#include <libloc/format.h>
+#include <libloc/network.h>
+#include <libloc/network-list.h>
+#include <libloc/private.h>
+#include <libloc/stringpool.h>
struct loc_database {
struct loc_ctx* ctx;
// Search string
char* string;
- char country_code[3];
- uint32_t asn;
+ struct loc_country_list* countries;
+ struct loc_as_list* asns;
enum loc_network_flags flags;
int family;
int network_stack_depth;
unsigned int* networks_visited;
- // For subnet search
+ // For subnet search and bogons
struct loc_network_list* stack;
+ struct loc_network* last_network;
};
static int loc_database_read_magic(struct loc_database* db) {
char** dst, char* src, size_t length) {
// Check for a plausible signature length
if (length > LOC_SIGNATURE_MAX_LENGTH) {
- ERROR(db->ctx, "Signature too long: %ld\n", length);
+ ERROR(db->ctx, "Signature too long: %zu\n", length);
return -EINVAL;
}
- DEBUG(db->ctx, "Reading signature of %ld bytes\n", length);
+ DEBUG(db->ctx, "Reading signature of %zu bytes\n", length);
// Allocate space
*dst = malloc(length);
ERROR(db->ctx, "Could not unmap network nodes section: %s\n", strerror(errno));
}
+ // Remove mapped countries section
+ if (db->countries_v1) {
+ r = munmap(db->countries_v1, db->countries_count * sizeof(*db->countries_v1));
+ if (r)
+ ERROR(db->ctx, "Could not unmap countries section: %s\n", strerror(errno));
+ }
+
if (db->pool)
loc_stringpool_unref(db->pool);
}
clock_t end = clock();
- DEBUG(db->ctx, "Signature checked in %.4fms\n",
+ INFO(db->ctx, "Signature checked in %.4fms\n",
(double)(end - start) / CLOCKS_PER_SEC * 1000);
CLEANUP:
off_t lo = 0;
off_t hi = db->as_count - 1;
+#ifdef ENABLE_DEBUG
// Save start time
clock_t start = clock();
+#endif
while (lo <= hi) {
off_t i = (lo + hi) / 2;
// Check if this is a match
uint32_t as_number = loc_as_get_number(*as);
if (as_number == number) {
+#ifdef ENABLE_DEBUG
clock_t end = clock();
// Log how fast this has been
DEBUG(db->ctx, "Found AS%u in %.4fms\n", as_number,
(double)(end - start) / CLOCKS_PER_SEC * 1000);
+#endif
return 0;
}
return -1;
}
+#ifdef ENABLE_DEBUG
if (r == 0) {
char* string = loc_network_str(*network);
DEBUG(db->ctx, "Got network %s\n", string);
free(string);
}
+#endif
return r;
}
}
// Check if the given IP address is inside the network
- r = loc_network_match_address(*network, address);
- if (r) {
+ if (!loc_network_match_address(*network, address)) {
DEBUG(db->ctx, "Searched address is not part of the network\n");
loc_network_unref(*network);
}
LOC_EXPORT int loc_database_lookup(struct loc_database* db,
- struct in6_addr* address, struct loc_network** network) {
+ const struct in6_addr* address, struct loc_network** network) {
struct in6_addr network_address;
memset(&network_address, 0, sizeof(network_address));
*network = NULL;
+#ifdef ENABLE_DEBUG
// Save start time
clock_t start = clock();
+#endif
int r = __loc_database_lookup(db, address, network, &network_address,
db->network_nodes_v1, 0);
+#ifdef ENABLE_DEBUG
clock_t end = clock();
// Log how fast this has been
DEBUG(db->ctx, "Executed network search in %.4fms\n",
(double)(end - start) / CLOCKS_PER_SEC * 1000);
+#endif
return r;
}
off_t lo = 0;
off_t hi = db->countries_count - 1;
+#ifdef ENABLE_DEBUG
// Save start time
clock_t start = clock();
+#endif
while (lo <= hi) {
off_t i = (lo + hi) / 2;
int result = strcmp(code, cc);
if (result == 0) {
+#ifdef ENABLE_DEBUG
clock_t end = clock();
// Log how fast this has been
DEBUG(db->ctx, "Found country %s in %.4fms\n", cc,
(double)(end - start) / CLOCKS_PER_SEC * 1000);
+#endif
return 0;
}
if (enumerator->string)
free(enumerator->string);
+ if (enumerator->countries)
+ loc_country_list_unref(enumerator->countries);
+
+ if (enumerator->asns)
+ loc_as_list_unref(enumerator->asns);
+
// Free network search
free(enumerator->networks_visited);
- // Free subnet stack
+ // Free subnet/bogons stack
if (enumerator->stack)
loc_network_list_unref(enumerator->stack);
+ if (enumerator->last_network)
+ loc_network_unref(enumerator->last_network);
+
free(enumerator);
}
return 0;
}
-LOC_EXPORT int loc_database_enumerator_set_country_code(struct loc_database_enumerator* enumerator, const char* country_code) {
- // Set empty country code
- if (!country_code || !*country_code) {
- *enumerator->country_code = '\0';
- return 0;
- }
+LOC_EXPORT struct loc_country_list* loc_database_enumerator_get_countries(
+ struct loc_database_enumerator* enumerator) {
+ if (!enumerator->countries)
+ return NULL;
- // Treat A1, A2, A3 as special country codes,
- // but perform search for flags instead
- if (strcmp(country_code, "A1") == 0) {
- return loc_database_enumerator_set_flag(enumerator,
- LOC_NETWORK_FLAG_ANONYMOUS_PROXY);
- } else if (strcmp(country_code, "A2") == 0) {
- return loc_database_enumerator_set_flag(enumerator,
- LOC_NETWORK_FLAG_SATELLITE_PROVIDER);
- } else if (strcmp(country_code, "A3") == 0) {
- return loc_database_enumerator_set_flag(enumerator,
- LOC_NETWORK_FLAG_ANYCAST);
- }
+ return loc_country_list_ref(enumerator->countries);
+}
- // Country codes must be two characters
- if (!loc_country_code_is_valid(country_code))
- return -EINVAL;
+LOC_EXPORT int loc_database_enumerator_set_countries(
+ struct loc_database_enumerator* enumerator, struct loc_country_list* countries) {
+ if (enumerator->countries)
+ loc_country_list_unref(enumerator->countries);
- for (unsigned int i = 0; i < 3; i++) {
- enumerator->country_code[i] = country_code[i];
- }
+ enumerator->countries = loc_country_list_ref(countries);
return 0;
}
-LOC_EXPORT int loc_database_enumerator_set_asn(
- struct loc_database_enumerator* enumerator, unsigned int asn) {
- enumerator->asn = asn;
+LOC_EXPORT struct loc_as_list* loc_database_enumerator_get_asns(
+ struct loc_database_enumerator* enumerator) {
+ if (!enumerator->asns)
+ return NULL;
+
+ return loc_as_list_ref(enumerator->asns);
+}
+
+LOC_EXPORT int loc_database_enumerator_set_asns(
+ struct loc_database_enumerator* enumerator, struct loc_as_list* asns) {
+ if (enumerator->asns)
+ loc_as_list_unref(enumerator->asns);
+
+ enumerator->asns = loc_as_list_ref(asns);
return 0;
}
static int loc_database_enumerator_filter_network(
struct loc_database_enumerator* enumerator, struct loc_network* network) {
// Skip if the family does not match
- if (enumerator->family && loc_network_address_family(network) != enumerator->family)
+ if (enumerator->family && loc_network_address_family(network) != enumerator->family) {
+ DEBUG(enumerator->ctx, "Filtered network %p because of family not matching\n", network);
return 1;
+ }
// Skip if the country code does not match
- if (*enumerator->country_code &&
- !loc_network_match_country_code(network, enumerator->country_code))
- return 1;
+ if (enumerator->countries && !loc_country_list_empty(enumerator->countries)) {
+ const char* country_code = loc_network_get_country_code(network);
+
+ if (!loc_country_list_contains_code(enumerator->countries, country_code)) {
+ DEBUG(enumerator->ctx, "Filtered network %p because of country code not matching\n", network);
+ return 1;
+ }
+ }
// Skip if the ASN does not match
- if (enumerator->asn &&
- !loc_network_match_asn(network, enumerator->asn))
- return 1;
+ if (enumerator->asns && !loc_as_list_empty(enumerator->asns)) {
+ uint32_t asn = loc_network_get_asn(network);
+
+ if (!loc_as_list_contains_number(enumerator->asns, asn)) {
+ DEBUG(enumerator->ctx, "Filtered network %p because of ASN not matching\n", network);
+ return 1;
+ }
+ }
// Skip if flags do not match
- if (enumerator->flags &&
- !loc_network_match_flag(network, enumerator->flags))
+ if (enumerator->flags && !loc_network_has_flag(network, enumerator->flags)) {
+ DEBUG(enumerator->ctx, "Filtered network %p because of flags not matching\n", network);
return 1;
+ }
// Do not filter
return 0;
struct loc_database_enumerator* enumerator, struct loc_network** network, int filter) {
// Return top element from the stack
while (1) {
- *network = loc_network_list_pop(enumerator->stack);
+ *network = loc_network_list_pop_first(enumerator->stack);
// Stack is empty
if (!*network)
while (1) {
// Fetch the next network in line
r = __loc_database_enumerator_next_network(enumerator, &subnet, 0);
- if (r)
- goto END;
+ if (r) {
+ loc_network_unref(subnet);
+ loc_network_list_unref(subnets);
+
+ return r;
+ }
// End if we did not receive another subnet
if (!subnet)
// Collect all subnets in a list
if (loc_network_is_subnet(*network, subnet)) {
r = loc_network_list_push(subnets, subnet);
- if (r)
- goto END;
+ if (r) {
+ loc_network_unref(subnet);
+ loc_network_list_unref(subnets);
+
+ return r;
+ }
loc_network_unref(subnet);
continue;
// If this is not a subnet, we push it back onto the stack and break
r = loc_network_list_push(enumerator->stack, subnet);
- if (r)
- goto END;
+ if (r) {
+ loc_network_unref(subnet);
+ loc_network_list_unref(subnets);
+
+ return r;
+ }
loc_network_unref(subnet);
break;
// If the network has any subnets, we will break it into smaller parts
// without the subnets.
struct loc_network_list* excluded = loc_network_exclude_list(*network, subnets);
- if (!excluded || loc_network_list_empty(excluded)) {
- r = 1;
- goto END;
+ if (!excluded) {
+ loc_network_list_unref(subnets);
+ return -1;
+ }
+
+ // Merge subnets onto the stack
+ r = loc_network_list_merge(enumerator->stack, subnets);
+ if (r) {
+ loc_network_list_unref(subnets);
+ loc_network_list_unref(excluded);
+
+ return r;
}
- // Sort the result
- loc_network_list_sort(excluded);
+ // Push excluded list onto the stack
+ r = loc_network_list_merge(enumerator->stack, excluded);
+ if (r) {
+ loc_network_list_unref(subnets);
+ loc_network_list_unref(excluded);
- // Reverse the list
- loc_network_list_reverse(excluded);
+ return r;
+ }
+
+ loc_network_list_unref(subnets);
+ loc_network_list_unref(excluded);
- // Replace network with the first one
+ // Drop the network and restart the whole process again to pick the next network
loc_network_unref(*network);
- *network = loc_network_list_pop(excluded);
+ return __loc_database_enumerator_next_network_flattened(enumerator, network);
+}
- // Push the rest onto the stack
- loc_network_list_merge(enumerator->stack, excluded);
+/*
+ This function finds all bogons (i.e. gaps) between the input networks
+*/
+static int __loc_database_enumerator_find_bogons(struct loc_ctx* ctx,
+ struct loc_network* first, struct loc_network* second, struct loc_network_list* bogons) {
+ // We do not need to check if first < second because the graph is always ordered
- loc_network_list_unref(excluded);
+ // The last address of the first network + 1 is the start of the gap
+ struct in6_addr first_address = address_increment(loc_network_get_last_address(first));
-END:
- if (subnet)
- loc_network_unref(subnet);
+ // The first address of the second network - 1 is the end of the gap
+ struct in6_addr last_address = address_decrement(loc_network_get_first_address(second));
- loc_network_list_unref(subnets);
+ // If first address is now greater than last address, there is no gap
+ if (in6_addr_cmp(&first_address, &last_address) >= 0)
+ return 0;
+
+ return loc_network_list_summarize(ctx, &first_address, &last_address, &bogons);
+}
+
+static int __loc_database_enumerator_next_bogon(
+ struct loc_database_enumerator* enumerator, struct loc_network** bogon) {
+ int r;
+
+ // Return top element from the stack
+ while (1) {
+ *bogon = loc_network_list_pop_first(enumerator->stack);
+
+ // Stack is empty
+ if (!*bogon)
+ break;
+
+ // Return result
+ return 0;
+ }
+
+ struct loc_network* network = NULL;
+
+ while (1) {
+ r = __loc_database_enumerator_next_network(enumerator, &network, 1);
+ if (r)
+ goto ERROR;
+
+ if (!network)
+ break;
+ if (enumerator->last_network && loc_network_address_family(enumerator->last_network) == loc_network_address_family(network)) {
+ r = __loc_database_enumerator_find_bogons(enumerator->ctx,
+ enumerator->last_network, network, enumerator->stack);
+ if (r) {
+ loc_network_unref(network);
+ goto ERROR;
+ }
+ }
+
+ // Remember network for next iteration
+ enumerator->last_network = loc_network_ref(network);
+ loc_network_unref(network);
+
+ // Try to return something
+ *bogon = loc_network_list_pop_first(enumerator->stack);
+ if (*bogon)
+ break;
+ }
+
+ERROR:
return r;
}
LOC_EXPORT int loc_database_enumerator_next_network(
struct loc_database_enumerator* enumerator, struct loc_network** network) {
- // Do not do anything if not in network mode
- if (enumerator->mode != LOC_DB_ENUMERATE_NETWORKS)
- return 0;
+ switch (enumerator->mode) {
+ case LOC_DB_ENUMERATE_NETWORKS:
+ // Flatten output?
+ if (enumerator->flatten)
+ return __loc_database_enumerator_next_network_flattened(enumerator, network);
- // Flatten output?
- if (enumerator->flatten)
- return __loc_database_enumerator_next_network_flattened(enumerator, network);
+ return __loc_database_enumerator_next_network(enumerator, network, 1);
+
+ case LOC_DB_ENUMERATE_BOGONS:
+ return __loc_database_enumerator_next_bogon(enumerator, network);
- return __loc_database_enumerator_next_network(enumerator, network, 1);
+ default:
+ return 0;
+ }
}
LOC_EXPORT int loc_database_enumerator_next_country(
projects / location / libloc.git / blobdiff