database: Encode prefix length into tree

[people/ms/libloc.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 77425e6efe03cba5f4e46c7c4fccb361a91738ec..45afd4058f9819dca4a2aaf5e28cc3ca1c50e242 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -59,7 +59,7 @@ static struct in6_addr prefix_to_bitmask(unsigned int prefix) {
        for (unsigned int i = 0; i < 16; i++)
                bitmask.s6_addr[i] = 0;
 
-       for (unsigned int i = prefix, j = 0; i > 0; i -= 8, j++) {
+       for (int i = prefix, j = 0; i > 0; i -= 8, j++) {
                if (i >= 8)
                        bitmask.s6_addr[j] = 0xff;
                else
@@ -86,7 +86,7 @@ static struct in6_addr make_last_address(const struct in6_addr* address, unsigne
 
        // Perform bitwise OR
        for (unsigned int i = 0; i < 4; i++)
-               a.s6_addr32[i] = address->s6_addr[i] | ~bitmask.s6_addr32[i];
+               a.s6_addr32[i] = address->s6_addr32[i] | ~bitmask.s6_addr32[i];
 
        return a;
 }
@@ -209,17 +209,17 @@ LOC_EXPORT struct loc_network* loc_network_unref(struct loc_network* network) {
        return NULL;
 }
 
-static int format_ipv6_address(struct loc_network* network, char* string, size_t length) {
-       const char* ret = inet_ntop(AF_INET6, &network->start_address, string, length);
+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(struct loc_network* network, char* string, size_t length) {
+static int format_ipv4_address(const struct in6_addr* address, char* string, size_t length) {
        struct in_addr ipv4_address;
-       ipv4_address.s_addr = network->start_address.s6_addr32[3];
+       ipv4_address.s_addr = address->s6_addr32[3];
 
        const char* ret = inet_ntop(AF_INET, &ipv4_address, string, length);
        if (!ret)
@@ -241,11 +241,11 @@ LOC_EXPORT char* loc_network_str(struct loc_network* network) {
        int family = loc_network_address_family(network);
        switch (family) {
                case AF_INET6:
-                       r = format_ipv6_address(network, string, length);
+                       r = format_ipv6_address(&network->start_address, string, length);
                        break;
 
                case AF_INET:
-                       r = format_ipv4_address(network, string, length);
+                       r = format_ipv4_address(&network->start_address, string, length);
                        prefix -= 96;
                        break;
 
@@ -288,6 +288,12 @@ LOC_EXPORT const char* loc_network_get_country_code(struct loc_network* network)
 }
 
 LOC_EXPORT int loc_network_set_country_code(struct loc_network* network, const char* country_code) {
+       // Set empty country code
+       if (!country_code || !*country_code) {
+               *network->country_code = '\0';
+               return 0;
+       }
+
        // Country codes must be two characters
        if (strlen(country_code) != 2)
                return -EINVAL;
@@ -310,8 +316,6 @@ LOC_EXPORT int loc_network_set_asn(struct loc_network* network, uint32_t asn) {
 }
 
 LOC_EXPORT int loc_network_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj) {
-       dbobj->prefix = network->prefix;
-
        // Add country code
        for (unsigned int i = 0; i < 2; i++) {
                dbobj->country_code[i] = network->country_code ? network->country_code[i] : '\0';
@@ -324,8 +328,8 @@ LOC_EXPORT int loc_network_to_database_v0(struct loc_network* network, struct lo
 }
 
 LOC_EXPORT int loc_network_new_from_database_v0(struct loc_ctx* ctx, struct loc_network** network,
-               struct in6_addr* address, const struct loc_database_network_v0* dbobj) {
-       int r = loc_network_new(ctx, network, address, dbobj->prefix);
+               struct in6_addr* address, unsigned int prefix, const struct loc_database_network_v0* dbobj) {
+       int r = loc_network_new(ctx, network, address, prefix);
        if (r)
                return r;
 
@@ -407,10 +411,10 @@ static struct loc_network_tree_node* loc_network_tree_get_node(struct loc_networ
        return *n;
 }
 
-static struct loc_network_tree_node* loc_network_tree_get_path(struct loc_network_tree* tree, const struct in6_addr* address) {
+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;
 
-       for (unsigned int i = 0; i < 128; i++) {
+       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));
        }
@@ -502,7 +506,8 @@ LOC_EXPORT int loc_network_tree_dump(struct loc_network_tree* tree) {
 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);
 
-       struct loc_network_tree_node* node = loc_network_tree_get_path(tree, &network->start_address);
+       struct loc_network_tree_node* node = loc_network_tree_get_path(tree,
+                       &network->start_address, network->prefix);
        if (!node) {
                ERROR(tree->ctx, "Could not find a node\n");
                return -ENOMEM;
@@ -511,7 +516,7 @@ LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struc
        // Check if node has not been set before
        if (node->network) {
                DEBUG(tree->ctx, "There is already a network at this path\n");
-               return 1;
+               return -EBUSY;
        }
 
        // Point node to the network