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);
*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;
}
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->countries) {
- if (!loc_country_list_empty(enumerator->countries)) {
- const char* country_code = loc_network_get_country_code(network);
+ 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))
- return 1;
+ 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->asns) {
- if (!loc_as_list_empty(enumerator->asns)) {
- uint32_t asn = loc_network_get_asn(network);
+ 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))
- return 1;
+ 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_match_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;
}
- // Replace network with the first one
- loc_network_unref(*network);
-
- *network = loc_network_list_pop_first(excluded);
+ // 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);
- // Push the rest onto the stack
- loc_network_list_reverse(excluded);
- loc_network_list_merge(enumerator->stack, excluded);
+ return r;
+ }
- loc_network_list_unref(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);
-END:
- if (subnet)
- loc_network_unref(subnet);
+ return r;
+ }
loc_network_list_unref(subnets);
+ loc_network_list_unref(excluded);
- return r;
+ // Drop the network and restart the whole process again to pick the next network
+ loc_network_unref(*network);
+
+ return __loc_database_enumerator_next_network_flattened(enumerator, network);
}
LOC_EXPORT int loc_database_enumerator_next_network(
projects / people / ms / libloc.git / blobdiff