diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-04-14 18:51:15 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-04-21 04:31:26 +0200 |
| commit | 800fff7616d6d5258cb4c68d192c450762b1d34b (patch) | |
| tree | 98bd1ca409e94d52840b1806c478e44e3747fac9 /src/routingtable.h | |
| parent | compat: work on old 3.10 (diff) | |
| download | wireguard-monolithic-historical-800fff7616d6d5258cb4c68d192c450762b1d34b.tar.xz wireguard-monolithic-historical-800fff7616d6d5258cb4c68d192c450762b1d34b.zip | |
routingtable: rewrite core functions
When removing by peer, prev needs to be set to *nptr in order to
traverse that part of the trie.
The other remove by IP function can simply be removed, as it's not in
use.
The root freeing function can use pre-order traversal instead of
post-order.
The pre-order traversal code in general is now a nice iterator macro.
The common bits function can use the fast fls instructions and the match
function can be rewritten to simply compare common bits.
While we're at it, let's add tons of new tests, randomized checking
against a dumb implementation, and graphviz output.
And in general, it's nice to clean things up.
Diffstat (limited to 'src/routingtable.h')
| -rw-r--r-- | src/routingtable.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/routingtable.h b/src/routingtable.h index adcc632..4fdf410 100644 --- a/src/routingtable.h +++ b/src/routingtable.h @@ -20,16 +20,12 @@ void routing_table_init(struct routing_table *table); void routing_table_free(struct routing_table *table); int routing_table_insert_v4(struct routing_table *table, const struct in_addr *ip, u8 cidr, struct wireguard_peer *peer); int routing_table_insert_v6(struct routing_table *table, const struct in6_addr *ip, u8 cidr, struct wireguard_peer *peer); -int routing_table_remove_v4(struct routing_table *table, const struct in_addr *ip, u8 cidr); -int routing_table_remove_v6(struct routing_table *table, const struct in6_addr *ip, u8 cidr); -int routing_table_remove_by_peer(struct routing_table *table, struct wireguard_peer *peer); -int routing_table_walk_ips(struct routing_table *table, void *ctx, int (*func)(void *ctx, struct wireguard_peer *peer, union nf_inet_addr ip, u8 cidr, int family)); +void routing_table_remove_by_peer(struct routing_table *table, struct wireguard_peer *peer); +size_t routing_table_count_nodes(struct routing_table *table); int routing_table_walk_ips_by_peer(struct routing_table *table, void *ctx, struct wireguard_peer *peer, int (*func)(void *ctx, union nf_inet_addr ip, u8 cidr, int family)); int routing_table_walk_ips_by_peer_sleepable(struct routing_table *table, void *ctx, struct wireguard_peer *peer, int (*func)(void *ctx, union nf_inet_addr ip, u8 cidr, int family)); /* These return a strong reference to a peer: */ -struct wireguard_peer *routing_table_lookup_v4(struct routing_table *table, const struct in_addr *ip); -struct wireguard_peer *routing_table_lookup_v6(struct routing_table *table, const struct in6_addr *ip); struct wireguard_peer *routing_table_lookup_dst(struct routing_table *table, struct sk_buff *skb); struct wireguard_peer *routing_table_lookup_src(struct routing_table *table, struct sk_buff *skb); |