Make package compile on Mac OS X

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

diff --git a/src/network.c b/src/network.c
index 4f297147f82e6d2e2bddcc65cab3507e667891f8..09f225e7138073204b444414eedbe659d6ee5a2e 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -16,13 +16,18 @@
 
 #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>
 
@@ -35,6 +40,7 @@ struct loc_network {
 
        char country_code[3];
        uint32_t asn;
+       enum loc_network_flags flags;
 };
 
 static int valid_prefix(struct in6_addr* address, unsigned int prefix) {
@@ -94,25 +100,25 @@ static struct in6_addr make_last_address(const struct in6_addr* address, unsigne
 LOC_EXPORT int loc_network_new(struct loc_ctx* ctx, struct loc_network** network,
                struct in6_addr* address, unsigned int prefix) {
        // Address cannot be unspecified
-       if (IN6_IS_ADDR_UNSPECIFIED(&address)) {
+       if (IN6_IS_ADDR_UNSPECIFIED(address)) {
                DEBUG(ctx, "Start address is unspecified\n");
                return -EINVAL;
        }
 
        // Address cannot be loopback
-       if (IN6_IS_ADDR_LOOPBACK(&address)) {
+       if (IN6_IS_ADDR_LOOPBACK(address)) {
                DEBUG(ctx, "Start address is loopback address\n");
                return -EINVAL;
        }
 
        // Address cannot be link-local
-       if (IN6_IS_ADDR_LINKLOCAL(&address)) {
+       if (IN6_IS_ADDR_LINKLOCAL(address)) {
                DEBUG(ctx, "Start address cannot be link-local\n");
                return -EINVAL;
        }
 
        // Address cannot be site-local
-       if (IN6_IS_ADDR_SITELOCAL(&address)) {
+       if (IN6_IS_ADDR_SITELOCAL(address)) {
                DEBUG(ctx, "Start address cannot be site-local\n");
                return -EINVAL;
        }
@@ -276,7 +282,7 @@ LOC_EXPORT int loc_network_match_address(struct loc_network* network, const stru
        struct in6_addr last_address = make_last_address(&network->start_address, network->prefix);
 
        // Address must be smaller than the last address
-       if (in6_addr_cmp(&last_address, address) > 0)
+       if (in6_addr_cmp(address, &last_address) > 0)
                return 1;
 
        // The address is inside this network
@@ -288,17 +294,30 @@ 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) {
-       // Country codes must be two characters
-       if (strlen(country_code) != 2)
+       // Set empty country code
+       if (!country_code || !*country_code) {
+               *network->country_code = '\0';
+               return 0;
+       }
+
+       // 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) {
+       // Check country code
+       if (!loc_country_code_is_valid(country_code))
+               return -EINVAL;
+
+       return (network->country_code[0] == country_code[0])
+               && (network->country_code[1] == country_code[1]);
+}
+
 LOC_EXPORT uint32_t loc_network_get_asn(struct loc_network* network) {
        return network->asn;
 }
@@ -309,32 +328,47 @@ LOC_EXPORT int loc_network_set_asn(struct loc_network* network, uint32_t asn) {
        return 0;
 }
 
-LOC_EXPORT int loc_network_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj) {
-       dbobj->prefix = network->prefix;
+LOC_EXPORT int loc_network_match_asn(struct loc_network* network, uint32_t asn) {
+       return network->asn == asn;
+}
+
+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_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj) {
        // Add country code
-       for (unsigned int i = 0; i < 2; i++) {
-               dbobj->country_code[i] = network->country_code ? 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, 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) {
+       char country_code[3];
+
+       int r = loc_network_new(ctx, network, address, prefix);
        if (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)
@@ -345,6 +379,11 @@ LOC_EXPORT int loc_network_new_from_database_v0(struct loc_ctx* ctx, struct loc_
        if (r)
                return r;
 
+       // Import flags
+       r = loc_network_set_flag(*network, be16toh(dbobj->flags));
+       if (r)
+               return r;
+
        return 0;
 }
 
@@ -407,10 +446,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 +541,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 +551,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