country: Add simple function to test if a country code is valid

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

diff --git a/src/network.c b/src/network.c
index 2bdb32bb1c8caa9706417f0ecc2e3188271c1220..387e18d526f4e2eac5e31f2d20fc6e8097e7adcf 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include <loc/libloc.h>
+#include <loc/country.h>
 #include <loc/network.h>
 #include <loc/private.h>
 
@@ -35,6 +36,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,8 +296,8 @@ 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++) {
@@ -306,8 +308,8 @@ LOC_EXPORT int loc_network_set_country_code(struct loc_network* network, const c
 }
 
 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,6 +330,20 @@ 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++) {
@@ -337,6 +353,9 @@ LOC_EXPORT int loc_network_to_database_v0(struct loc_network* network, struct lo
        // Add ASN
        dbobj->asn = htobe32(network->asn);
 
+       // Flags
+       dbobj->flags = htobe32(network->flags);
+
        return 0;
 }
 
@@ -362,6 +381,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, be32toh(dbobj->flags));
+       if (r)
+               return r;
+
        return 0;
 }