fe9f1a6ded
New data types net_addr and variants (in lib/net.h) describing network addresses (prefix/pxlen). Modifications of FIB structures to handle these data types and changing everything to use these data types instead of prefix/pxlen pairs where possible. The commit is WiP, some protocols are not yet updated (BGP, Kernel), and the code contains some temporary scaffolding. Comments are welcome.
48 lines
1.2 KiB
C
48 lines
1.2 KiB
C
|
|
#include "nest/bird.h"
|
|
#include "lib/ip.h"
|
|
#include "lib/net.h"
|
|
|
|
const u16 net_addr_length[] = {
|
|
[NET_IP4] = sizeof(net_addr_ip4),
|
|
[NET_IP6] = sizeof(net_addr_ip6),
|
|
[NET_VPN4] = sizeof(net_addr_vpn4),
|
|
[NET_VPN6] = sizeof(net_addr_vpn6)
|
|
}
|
|
|
|
char *
|
|
net_format(const net_addr *N, char *buf, int buflen)
|
|
{
|
|
net_addr_union *n = (void *) N;
|
|
|
|
/* FIXME: quick hack */
|
|
switch (n->n.type)
|
|
{
|
|
case NET_IP4:
|
|
return bsnprintf(buf, buflen, "%I/%d", n->ip4.prefix, n->ip4.pxlen);
|
|
case NET_IP6:
|
|
return bsnprintf(buf, buflen, "%I/%d", n->ip6.prefix, n->ip6.pxlen);
|
|
case NET_VPN4:
|
|
return bsnprintf(buf, buflen, "%u:%u %I/%d", (u32) (n->vpn4.rd >> 32), (u32) n->vpn4.rd, n->vpn4.prefix, n->vpn4.pxlen);
|
|
case NET_VPN6:
|
|
return bsnprintf(buf, buflen, "%u:%u %I/%d", (u32) (n->vpn6.rd >> 32), (u32) n->vpn6.rd, n->vpn6.prefix, n->vpn6.pxlen);
|
|
}
|
|
}
|
|
|
|
int
|
|
net_classify(const net_addr *N)
|
|
{
|
|
net_addr_union *n = (void *) N;
|
|
|
|
switch (n->n.type)
|
|
{
|
|
case NET_IP4:
|
|
case NET_VPN4:
|
|
return ip4_zero(n->ip4.prefix) ? (IADDR_HOST | SCOPE_UNIVERSE) : ip4_classify(n->ip4.prefix);
|
|
|
|
case NET_IP6:
|
|
case NET_VPN6:
|
|
return ip6_zero(n->ip6.prefix) ? (IADDR_HOST | SCOPE_UNIVERSE) : ip6_classify(n->ip6.prefix);
|
|
}
|
|
}
|