mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-05 16:41:53 +00:00
Code Releases Activity

Use idiomatic functions for manipulating net_addr, remove unnecessary use of alloca

Browse Source
This commit is contained in:
Igor Putovny 2024-03-05 10:47:30 +01:00
parent 7644f7594b
commit 89c55c241e
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
proto/aggregator/aggregator.c
View File

@ -678,13 +678,15 @@ print_prefixes(const struct trie_node *node, int type)
{ {
if (type == NET_IP4) if (type == NET_IP4)
{ {
struct net_addr_ip4 *addr = allocz(sizeof(struct net_addr_ip4)); struct net_addr_ip4 addr = { 0 };
print_prefixes_ip4_helper(node, addr, 0); net_fill_ip4((net_addr *)&addr, IP4_NONE, 0);
print_prefixes_ip4_helper(node, &addr, 0);
} }
else if (type == NET_IP6) else if (type == NET_IP6)
{ {
struct net_addr_ip6 *addr = allocz(sizeof(struct net_addr_ip6)); struct net_addr_ip6 addr = { 0 };
print_prefixes_ip6_helper(node, addr, 0); net_fill_ip6((net_addr *)&addr, IP6_NONE, 0);
print_prefixes_ip6_helper(node, &addr, 0);
} }
} }
@ -796,18 +798,18 @@ collect_prefixes(struct aggregator_proto *p)
if (type == NET_IP4) if (type == NET_IP4)
{ {
struct net_addr_ip4 *addr = allocz(sizeof(struct net_addr_ip4)); struct net_addr_ip4 addr = { 0 };
addr->type = NET_IP4; net_fill_ip4((net_addr *)&addr, IP4_NONE, 0);
addr->length = sizeof(struct net_addr_ip4); collect_prefixes_helper_ip4(p->root, &addr, p, 0, &count);
collect_prefixes_helper_ip4(p->root, addr, p, 0, &count);
} }
else if (type == NET_IP6) else if (type == NET_IP6)
{ {
struct net_addr_ip6 *addr = allocz(sizeof(struct net_addr_ip6)); struct net_addr_ip6 addr = { 0 };
addr->type = NET_IP6; net_fill_ip6((net_addr *)&addr, IP6_NONE, 0);
addr->length = sizeof(struct net_addr_ip6); collect_prefixes_helper_ip6(p->root, &addr, p, 0, &count);
collect_prefixes_helper_ip6(p->root, addr, p, 0, &count);
} }
else
bug("Invalid NET type");
log("%d prefixes collected", count); log("%d prefixes collected", count);
} }
@ -1504,7 +1506,7 @@ aggregator_start(struct proto *P)
}; };
struct network *default_net = mb_alloc(P->pool, sizeof(struct network) + sizeof(struct net_addr_ip4)); struct network *default_net = mb_alloc(P->pool, sizeof(struct network) + sizeof(struct net_addr_ip4));
net_fill_ip4(default_net->n.addr, (struct ip4_addr) { 0 }, 0); net_fill_ip4(default_net->n.addr, IP4_NONE, 0);
log("Creating net %p for default route", default_net); log("Creating net %p for default route", default_net);
/* Create route attributes with zero nexthop */ /* Create route attributes with zero nexthop */