aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gschwantner <tharre3@gmail.com>2019-04-14 23:46:57 +0200
committerThomas Gschwantner <tharre3@gmail.com>2019-06-02 00:39:36 +0200
commit325260edb16447416a41ae1fa7985e5c0ebc91d4 (patch)
tree1b083c5941241b8f2f7f4ec662f503378924fbc4
parentUse hashtable to match ll-ip with pubkey (diff)
downloadwg-dynamic-325260edb16447416a41ae1fa7985e5c0ebc91d4.tar.xz
wg-dynamic-325260edb16447416a41ae1fa7985e5c0ebc91d4.zip
radix-trie: remove bits arg from radix_insert_v4/6
-rw-r--r--radix-trie.c8
-rw-r--r--radix-trie.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/radix-trie.c b/radix-trie.c
index 0e67a52..4786c69 100644
--- a/radix-trie.c
+++ b/radix-trie.c
@@ -293,15 +293,15 @@ void radix_free(struct radix_trie *trie)
radix_free_nodes(trie->ip6_root);
}
-void *radix_find_v4(struct radix_trie *trie, uint8_t bits, const void *be_ip)
+void *radix_find_v4(struct radix_trie *trie, const void *be_ip)
{
- struct radix_node *found = lookup(trie->ip4_root, bits, be_ip);
+ struct radix_node *found = lookup(trie->ip4_root, 32, be_ip);
return found ? found->data : NULL;
}
-void *radix_find_v6(struct radix_trie *trie, uint8_t bits, const void *be_ip)
+void *radix_find_v6(struct radix_trie *trie, const void *be_ip)
{
- struct radix_node *found = lookup(trie->ip6_root, bits, be_ip);
+ struct radix_node *found = lookup(trie->ip6_root, 128, be_ip);
return found ? found->data : NULL;
}
diff --git a/radix-trie.h b/radix-trie.h
index 3d0b00f..9e210af 100644
--- a/radix-trie.h
+++ b/radix-trie.h
@@ -16,8 +16,8 @@ struct radix_trie {
void radix_init(struct radix_trie *trie);
void radix_free(struct radix_trie *trie);
-void *radix_find_v4(struct radix_trie *trie, uint8_t bits, const void *be_ip);
-void *radix_find_v6(struct radix_trie *trie, uint8_t bits, const void *be_ip);
+void *radix_find_v4(struct radix_trie *trie, const void *be_ip);
+void *radix_find_v6(struct radix_trie *trie, const void *be_ip);
int radix_insert_v4(struct radix_trie *root, const struct in_addr *ip,
uint8_t cidr, void *data);
int radix_insert_v6(struct radix_trie *root, const struct in6_addr *ip,