Implement filtering networks for the ASN they belong to

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

diff --git a/src/database.c b/src/database.c
index 710fa5641fe37c5708d6bb831111d9354fdb66c6..75fc50a03dc6cb6614c00a98c3c37e3b172d90d8 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -78,6 +78,7 @@ struct loc_database_enumerator {
        // Search string
        char* string;
        char country_code[3];
+       uint32_t asn;
 
        // Index of the AS we are looking at
        unsigned int as_index;
@@ -651,6 +652,13 @@ LOC_EXPORT int loc_database_enumerator_set_country_code(struct loc_database_enum
        return 0;
 }
 
+LOC_EXPORT int loc_database_enumerator_set_asn(
+               struct loc_database_enumerator* enumerator, unsigned int asn) {
+       enumerator->asn = asn;
+
+       return 0;
+}
+
 LOC_EXPORT struct loc_as* loc_database_enumerator_next_as(struct loc_database_enumerator* enumerator) {
        struct loc_database* db = enumerator->db;
        struct loc_as* as;
@@ -771,6 +779,12 @@ static int loc_database_enumerator_network_depth_first_search(
                                continue;
                        }
 
+                       // Skip if the ASN does not match
+                       if (e->asn && !loc_network_match_asn(*network, e->asn)) {
+                               loc_network_unref(*network);
+                               continue;
+                       }
+
                        return 0;
                }
        }

diff --git a/src/libloc.sym b/src/libloc.sym
index 017faf3b984c0f885e5c1794d0e9c858cb64ed64..976491a6224f7da43096d6bee39d225142dc50fd 100644 (file)
--- a/src/libloc.sym
+++ b/src/libloc.sym
@@ -55,6 +55,7 @@ global:
        loc_database_enumerator_next_as;
        loc_database_enumerator_next_network;
        loc_database_enumerator_ref;
+       loc_database_enumerator_set_asn;
        loc_database_enumerator_set_country_code;
        loc_database_enumerator_set_string;
        loc_database_enumerator_unref;
@@ -62,6 +63,7 @@ global:
        # Network
        loc_network_get_asn;
        loc_network_get_country_code;
+       loc_network_match_asn;
        loc_network_match_country_code;
        loc_network_new;
        loc_network_new_from_string;

diff --git a/src/loc/database.h b/src/loc/database.h
index d0579ab811245d7732749658ecef61e0256fba9a..7d0b20c3b025e8035a16160f76d77344abf41fde 100644 (file)
--- a/src/loc/database.h
+++ b/src/loc/database.h
@@ -50,6 +50,7 @@ struct loc_database_enumerator* loc_database_enumerator_unref(struct loc_databas
 
 int loc_database_enumerator_set_string(struct loc_database_enumerator* enumerator, const char* string);
 int loc_database_enumerator_set_country_code(struct loc_database_enumerator* enumerator, const char* country_code);
+int loc_database_enumerator_set_asn(struct loc_database_enumerator* enumerator, unsigned int asn);
 struct loc_as* loc_database_enumerator_next_as(struct loc_database_enumerator* enumerator);
 struct loc_network* loc_database_enumerator_next_network(struct loc_database_enumerator* enumerator);
 

diff --git a/src/loc/network.h b/src/loc/network.h
index 63f4bfa81ab3e2e3f483bc51786eafd94cc667e1..bb89a8544dd5fd984920084ffbe17f2408a0fa6e 100644 (file)
--- a/src/loc/network.h
+++ b/src/loc/network.h
@@ -38,6 +38,7 @@ int loc_network_match_country_code(struct loc_network* network, const char* coun
 
 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);
 
 #ifdef LIBLOC_PRIVATE
 

diff --git a/src/network.c b/src/network.c
index b8bc0f7d7a23dc8a4268e65eb2c9ce9427f90fdf..2bdb32bb1c8caa9706417f0ecc2e3188271c1220 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -324,6 +324,10 @@ LOC_EXPORT int loc_network_set_asn(struct loc_network* network, uint32_t asn) {
        return 0;
 }
 
+LOC_EXPORT int loc_network_match_asn(struct loc_network* network, uint32_t asn) {
+       return network->asn == asn;
+}
+
 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++) {