Add flags to network objects

This changes the database format on disk.

Flags can be used to mark networks in order to add more information
later than only ASN and CC.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libloc.sym b/src/libloc.sym
index 976491a6224f7da43096d6bee39d225142dc50fd..0a3a76da43319fd8210884a81367cbb0927f5057 100644 (file)
--- a/src/libloc.sym
+++ b/src/libloc.sym
@@ -63,13 +63,16 @@ global:
        # Network
        loc_network_get_asn;
        loc_network_get_country_code;
+       loc_network_has_flag;
        loc_network_match_asn;
        loc_network_match_country_code;
+       loc_network_match_flag;
        loc_network_new;
        loc_network_new_from_string;
        loc_network_ref;
        loc_network_set_asn;
        loc_network_set_country_code;
+       loc_network_set_flag;
        loc_network_str;
        loc_network_unref;
 

diff --git a/src/loc/format.h b/src/loc/format.h
index c590a6447aa594f4639eaa3d355f29d50147f223..e138f69d3f8c9dd5f6e3d9cf72ea6c9dfc023486 100644 (file)
--- a/src/loc/format.h
+++ b/src/loc/format.h
@@ -79,6 +79,9 @@ struct loc_database_network_v0 {
 
        // ASN
        uint32_t asn;
+
+       // Flags
+       uint32_t flags;
 };
 
 struct loc_database_as_v0 {

diff --git a/src/loc/network.h b/src/loc/network.h
index bb89a8544dd5fd984920084ffbe17f2408a0fa6e..8603e47f062856ee6cbc71d9e7d048fe2772d3bd 100644 (file)
--- a/src/loc/network.h
+++ b/src/loc/network.h
@@ -40,6 +40,10 @@ uint32_t loc_network_get_asn(struct loc_network* network);
 int loc_network_set_asn(struct loc_network* network, uint32_t asn);
 int loc_network_match_asn(struct loc_network* network, uint32_t asn);
 
+int loc_network_has_flag(struct loc_network* network, uint32_t flag);
+int loc_network_set_flag(struct loc_network* network, uint32_t flag);
+int loc_network_match_flag(struct loc_network* network, uint32_t flag);
+
 #ifdef LIBLOC_PRIVATE
 
 int loc_network_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj);

diff --git a/src/network.c b/src/network.c
index 2bdb32bb1c8caa9706417f0ecc2e3188271c1220..a4a77478c3760ed6a616eb6081da0ae92e28c0e8 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -35,6 +35,7 @@ struct loc_network {
 
        char country_code[3];
        uint32_t asn;
+       uint32_t flags;
 };
 
 static int valid_prefix(struct in6_addr* address, unsigned int prefix) {
@@ -328,6 +329,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 +352,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 +380,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;
 }