proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 05:42:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5768 from donaldsharp/bgp_nexthop

Browse Source 
Bgp nexthop
This commit is contained in:
Donatas Abraitis 2020-02-20 10:05:53 +02:00 committed by GitHub
commit 8cf0a20551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
bgpd/bgp_nexthop.c
View File

@ -180,7 +180,7 @@ void bgp_tip_del(struct bgp *bgp, struct in_addr *tip)
/* BGP own address structure */ /* BGP own address structure */
struct bgp_addr { struct bgp_addr {
struct prefix *p; struct prefix p;
struct list *ifp_name_list; struct list *ifp_name_list;
}; };
@ -192,17 +192,10 @@ static void show_address_entry(struct hash_bucket *bucket, void *args)
struct listnode *node; struct listnode *node;
char str[INET6_ADDRSTRLEN] = {0}; char str[INET6_ADDRSTRLEN] = {0};
if (addr->p->family == AF_INET) { vty_out(vty, "addr: %s, count: %d : ",
vty_out(vty, "addr: %s, count: %d : ", inet_ntop(AF_INET, inet_ntop(addr->p.family, &(addr->p.u.prefix),
&(addr->p->u.prefix4), str, INET6_ADDRSTRLEN),
str, INET_ADDRSTRLEN), addr->ifp_name_list->count);
addr->ifp_name_list->count);
} else if (addr->p->family == AF_INET6) {
vty_out(vty, "addr: %s, count: %d : ", inet_ntop(AF_INET6,
&(addr->p->u.prefix6),
str, INET6_ADDRSTRLEN),
addr->ifp_name_list->count);
}
for (ALL_LIST_ELEMENTS_RO(addr->ifp_name_list, node, name)) { for (ALL_LIST_ELEMENTS_RO(addr->ifp_name_list, node, name)) {
vty_out(vty, " %s,", name); vty_out(vty, " %s,", name);
@ -231,8 +224,7 @@ static void *bgp_address_hash_alloc(void *p)
struct bgp_addr *addr = NULL; struct bgp_addr *addr = NULL;
addr = XMALLOC(MTYPE_BGP_ADDR, sizeof(struct bgp_addr)); addr = XMALLOC(MTYPE_BGP_ADDR, sizeof(struct bgp_addr));
addr->p = prefix_new(); prefix_copy(&addr->p, &copy_addr->p);
prefix_copy(addr->p, copy_addr->p);
addr->ifp_name_list = list_new(); addr->ifp_name_list = list_new();
addr->ifp_name_list->del = bgp_address_hash_string_del; addr->ifp_name_list->del = bgp_address_hash_string_del;
@ -244,7 +236,6 @@ static void bgp_address_hash_free(void *data)
{ {
struct bgp_addr *addr = data; struct bgp_addr *addr = data;
prefix_free(&addr->p);
list_delete(&addr->ifp_name_list); list_delete(&addr->ifp_name_list);
XFREE(MTYPE_BGP_ADDR, addr); XFREE(MTYPE_BGP_ADDR, addr);
} }
@ -253,7 +244,7 @@ static unsigned int bgp_address_hash_key_make(const void *p)
{ {
const struct bgp_addr *addr = p; const struct bgp_addr *addr = p;
return prefix_hash_key((const void *)(addr->p)); return prefix_hash_key(&addr->p);
} }
static bool bgp_address_hash_cmp(const void *p1, const void *p2) static bool bgp_address_hash_cmp(const void *p1, const void *p2)
@ -261,7 +252,7 @@ static bool bgp_address_hash_cmp(const void *p1, const void *p2)
const struct bgp_addr *addr1 = p1; const struct bgp_addr *addr1 = p1;
const struct bgp_addr *addr2 = p2; const struct bgp_addr *addr2 = p2;
return prefix_same(addr1->p, addr2->p); return prefix_same(&addr1->p, &addr2->p);
} }
void bgp_address_init(struct bgp *bgp) void bgp_address_init(struct bgp *bgp)
@ -288,12 +279,12 @@ static void bgp_address_add(struct bgp *bgp, struct connected *ifc,
struct listnode *node; struct listnode *node;
char *name; char *name;
tmp.p = p; tmp.p = *p;
if (tmp.p->family == AF_INET) if (tmp.p.family == AF_INET)
tmp.p->prefixlen = IPV4_MAX_BITLEN; tmp.p.prefixlen = IPV4_MAX_BITLEN;
else if (tmp.p->family == AF_INET6) else if (tmp.p.family == AF_INET6)
tmp.p->prefixlen = IPV6_MAX_BITLEN; tmp.p.prefixlen = IPV6_MAX_BITLEN;
addr = hash_get(bgp->address_hash, &tmp, bgp_address_hash_alloc); addr = hash_get(bgp->address_hash, &tmp, bgp_address_hash_alloc);
@ -315,12 +306,12 @@ static void bgp_address_del(struct bgp *bgp, struct connected *ifc,
struct listnode *node; struct listnode *node;
char *name; char *name;
tmp.p = p; tmp.p = *p;
if (tmp.p->family == AF_INET) if (tmp.p.family == AF_INET)
tmp.p->prefixlen = IPV4_MAX_BITLEN; tmp.p.prefixlen = IPV4_MAX_BITLEN;
else if (tmp.p->family == AF_INET6) else if (tmp.p.family == AF_INET6)
tmp.p->prefixlen = IPV6_MAX_BITLEN; tmp.p.prefixlen = IPV6_MAX_BITLEN;
addr = hash_lookup(bgp->address_hash, &tmp); addr = hash_lookup(bgp->address_hash, &tmp);
/* may have been deleted earlier by bgp_interface_down() */ /* may have been deleted earlier by bgp_interface_down() */
@ -482,75 +473,67 @@ static void bgp_connected_cleanup(struct route_table *table,
int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type, int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type,
struct attr *attr, struct bgp_node *rn) struct attr *attr, struct bgp_node *rn)
{ {
struct prefix p = {0}; uint8_t new_afi = afi == AFI_IP ? AF_INET : AF_INET6;
afi_t new_afi = afi; struct bgp_addr tmp_addr = {{0}}, *addr = NULL;
struct bgp_addr tmp_addr = {0}, *addr = NULL;
struct tip_addr tmp_tip, *tip = NULL; struct tip_addr tmp_tip, *tip = NULL;
bool is_bgp_static_route = ((type == ZEBRA_ROUTE_BGP) bool is_bgp_static_route =
&& (sub_type == BGP_ROUTE_STATIC)) ((type == ZEBRA_ROUTE_BGP) && (sub_type == BGP_ROUTE_STATIC))
? true ? true
: false; : false;
if (!is_bgp_static_route) if (!is_bgp_static_route)
new_afi = BGP_ATTR_NEXTHOP_AFI_IP6(attr) ? AFI_IP6 : AFI_IP; new_afi = BGP_ATTR_NEXTHOP_AFI_IP6(attr) ? AF_INET6 : AF_INET;
tmp_addr.p.family = new_afi;
switch (new_afi) { switch (new_afi) {
case AFI_IP: case AF_INET:
p.family = AF_INET;
if (is_bgp_static_route) { if (is_bgp_static_route) {
p.u.prefix4 = rn->p.u.prefix4; tmp_addr.p.u.prefix4 = rn->p.u.prefix4;
p.prefixlen = rn->p.prefixlen; tmp_addr.p.prefixlen = rn->p.prefixlen;
} else { } else {
/* Here we need to find out which nexthop to be used*/ /* Here we need to find out which nexthop to be used*/
if (attr->flag & if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {
ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) { tmp_addr.p.u.prefix4 = attr->nexthop;
tmp_addr.p.prefixlen = IPV4_MAX_BITLEN;
p.u.prefix4 = attr->nexthop; } else if ((attr->mp_nexthop_len)
p.prefixlen = IPV4_MAX_BITLEN; && ((attr->mp_nexthop_len
== BGP_ATTR_NHLEN_IPV4)
} else if ((attr->mp_nexthop_len) && || (attr->mp_nexthop_len
((attr->mp_nexthop_len == == BGP_ATTR_NHLEN_VPNV4))) {
BGP_ATTR_NHLEN_IPV4) || tmp_addr.p.u.prefix4 =
(attr->mp_nexthop_len ==
BGP_ATTR_NHLEN_VPNV4))) {
p.u.prefix4 =
attr->mp_nexthop_global_in; attr->mp_nexthop_global_in;
p.prefixlen = IPV4_MAX_BITLEN; tmp_addr.p.prefixlen = IPV4_MAX_BITLEN;
} else } else
return 0; return 0;
} }
break; break;
case AFI_IP6: case AF_INET6:
p.family = AF_INET6;
if (is_bgp_static_route) { if (is_bgp_static_route) {
p.u.prefix6 = rn->p.u.prefix6; tmp_addr.p.u.prefix6 = rn->p.u.prefix6;
p.prefixlen = rn->p.prefixlen; tmp_addr.p.prefixlen = rn->p.prefixlen;
} else { } else {
p.u.prefix6 = attr->mp_nexthop_global; tmp_addr.p.u.prefix6 = attr->mp_nexthop_global;
p.prefixlen = IPV6_MAX_BITLEN; tmp_addr.p.prefixlen = IPV6_MAX_BITLEN;
} }
break; break;
default: default:
break; break;
} }
tmp_addr.p = &p;
addr = hash_lookup(bgp->address_hash, &tmp_addr); addr = hash_lookup(bgp->address_hash, &tmp_addr);
if (addr) if (addr)
return 1; return 1;
if (new_afi == AFI_IP) { if (new_afi == AF_INET) {
memset(&tmp_tip, 0, sizeof(struct tip_addr)); memset(&tmp_tip, 0, sizeof(struct tip_addr));
tmp_tip.addr = attr->nexthop; tmp_tip.addr = attr->nexthop;
if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) { if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {
tmp_tip.addr = attr->nexthop; tmp_tip.addr = attr->nexthop;
} else if ((attr->mp_nexthop_len) && } else if ((attr->mp_nexthop_len) &&
((attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV4) ((attr->mp_nexthop_len == BGP_ATTR_NHLEN_IPV4)
|| (attr->mp_nexthop_len == || (attr->mp_nexthop_len == BGP_ATTR_NHLEN_VPNV4))) {
BGP_ATTR_NHLEN_VPNV4))) {
tmp_tip.addr = attr->mp_nexthop_global_in; tmp_tip.addr = attr->mp_nexthop_global_in;
} }