network: Initialize country code with nothing

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

diff --git a/src/network.c b/src/network.c
index 2bdb32bb1c8caa9706417f0ecc2e3188271c1220..ad3989250e421e098068ed52e5f4b8c6d3bd2522 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) {
@@ -294,20 +300,18 @@ LOC_EXPORT int loc_network_set_country_code(struct loc_network* network, const c
                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])
@@ -328,39 +332,67 @@ 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[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) {
+       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;
 }