#include <arpa/inet.h>
#include <assert.h>
-#include <endian.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_ENDIAN_H
+# include <endian.h>
+#endif
+
#include <loc/libloc.h>
+#include <loc/compat.h>
+#include <loc/country.h>
#include <loc/network.h>
#include <loc/private.h>
struct loc_ctx* ctx;
int refcount;
- struct in6_addr start_address;
+ struct in6_addr first_address;
unsigned int prefix;
char country_code[3];
uint32_t asn;
+ enum loc_network_flags flags;
};
static int valid_prefix(struct in6_addr* address, unsigned int prefix) {
return bitmask;
}
-static struct in6_addr make_start_address(const struct in6_addr* address, unsigned int prefix) {
+static struct in6_addr make_first_address(const struct in6_addr* address, unsigned int prefix) {
struct in6_addr a;
struct in6_addr bitmask = prefix_to_bitmask(prefix);
n->refcount = 1;
// Store the first address in the network
- n->start_address = make_start_address(address, prefix);
+ n->first_address = make_first_address(address, prefix);
n->prefix = prefix;
DEBUG(n->ctx, "Network allocated at %p\n", n);
return 0;
}
-static int loc_network_address_family(struct loc_network* network) {
- if (IN6_IS_ADDR_V4MAPPED(&network->start_address))
- return AF_INET;
-
- return AF_INET6;
-}
-
LOC_EXPORT int loc_network_new_from_string(struct loc_ctx* ctx, struct loc_network** network,
const char* address_string) {
- struct in6_addr start_address;
+ struct in6_addr first_address;
unsigned int prefix = 0;
char* prefix_string;
int r = 1;
if (prefix) {
// Parse the address
- r = loc_parse_address(ctx, address_string, &start_address);
+ r = loc_parse_address(ctx, address_string, &first_address);
// Map the prefix to IPv6 if needed
- if (IN6_IS_ADDR_V4MAPPED(&start_address))
+ if (IN6_IS_ADDR_V4MAPPED(&first_address))
prefix += 96;
}
}
free(buffer);
if (r == 0) {
- r = loc_network_new(ctx, network, &start_address, prefix);
+ r = loc_network_new(ctx, network, &first_address, prefix);
}
return r;
int family = loc_network_address_family(network);
switch (family) {
case AF_INET6:
- r = format_ipv6_address(&network->start_address, string, length);
+ r = format_ipv6_address(&network->first_address, string, length);
break;
case AF_INET:
- r = format_ipv4_address(&network->start_address, string, length);
+ r = format_ipv4_address(&network->first_address, string, length);
prefix -= 96;
break;
return string;
}
+LOC_EXPORT int loc_network_address_family(struct loc_network* network) {
+ if (IN6_IS_ADDR_V4MAPPED(&network->first_address))
+ return AF_INET;
+
+ return AF_INET6;
+}
+
LOC_EXPORT int loc_network_match_address(struct loc_network* network, const struct in6_addr* address) {
// Address must be larger than the start address
- if (in6_addr_cmp(&network->start_address, address) > 0)
+ if (in6_addr_cmp(&network->first_address, address) > 0)
return 1;
// Determine the last address in this network
- struct in6_addr last_address = make_last_address(&network->start_address, network->prefix);
+ struct in6_addr last_address = make_last_address(&network->first_address, network->prefix);
// Address must be smaller than the last address
if (in6_addr_cmp(address, &last_address) > 0)
return 0;
}
- // Country codes must be two characters
- if (strlen(country_code) != 2)
+ // Check country code
+ if (!loc_country_code_is_valid(country_code))
return -EINVAL;
- for (unsigned int i = 0; i < 3; i++) {
- network->country_code[i] = country_code[i];
- }
+ loc_country_code_copy(network->country_code, country_code);
return 0;
}
LOC_EXPORT int loc_network_match_country_code(struct loc_network* network, const char* country_code) {
- // Country codes must be two characters
- if (strlen(country_code) != 2)
+ // Check country code
+ if (!loc_country_code_is_valid(country_code))
return -EINVAL;
return (network->country_code[0] == country_code[0])
return network->asn == asn;
}
-LOC_EXPORT int loc_network_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj) {
+LOC_EXPORT int loc_network_has_flag(struct loc_network* network, uint32_t flag) {
+ return network->flags & flag;
+}
+
+LOC_EXPORT int loc_network_set_flag(struct loc_network* network, uint32_t flag) {
+ 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_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)
+ return 0;
+
+ // Get the end addresses
+ struct in6_addr last_address_self = make_last_address(&self->first_address, self->prefix);
+ struct in6_addr last_address_other = make_last_address(&other->first_address, other->prefix);
+
+ // If the end address of the other network is greater than this network,
+ // it cannot be a subnet.
+ if (in6_addr_cmp(&last_address_self, &last_address_other) > 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
- for (unsigned int i = 0; i < 2; i++) {
- dbobj->country_code[i] = network->country_code[i] ? network->country_code[i] : '\0';
- }
+ loc_country_code_copy(dbobj->country_code, network->country_code);
// Add ASN
dbobj->asn = htobe32(network->asn);
+ // Flags
+ dbobj->flags = htobe16(network->flags);
+
return 0;
}
-LOC_EXPORT int loc_network_new_from_database_v0(struct loc_ctx* ctx, struct loc_network** network,
- struct in6_addr* address, unsigned int prefix, const struct loc_database_network_v0* dbobj) {
+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";
+
int r = loc_network_new(ctx, network, address, prefix);
- if (r)
+ if (r) {
+ ERROR(ctx, "Could not allocate a new network: %s", strerror(-r));
return r;
+ }
// Import country code
- char country_code[3];
- for (unsigned int i = 0; i < 2; i++) {
- country_code[i] = dbobj->country_code[i];
- }
- country_code[2] = '\0';
+ loc_country_code_copy(country_code, dbobj->country_code);
r = loc_network_set_country_code(*network, country_code);
- if (r)
+ if (r) {
+ ERROR(ctx, "Could not set country code: %s\n", country_code);
return r;
+ }
// Import ASN
- r = loc_network_set_asn(*network, be32toh(dbobj->asn));
- if (r)
+ 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;
+ }
+
+ // 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;
+ }
return 0;
}
DEBUG(tree->ctx, "Adding network %p to tree %p\n", network, tree);
struct loc_network_tree_node* node = loc_network_tree_get_path(tree,
- &network->start_address, network->prefix);
+ &network->first_address, network->prefix);
if (!node) {
ERROR(tree->ctx, "Could not find a node\n");
return -ENOMEM;
projects / people / ms / libloc.git / blobdiff