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

eigrpd: Convert eigrp_hello.c to not use VRF_DEFAULT

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-06-15 15:12:19 -04:00 committed by Rafael Zalamena
parent 2ea6b572b5
commit 2d4592e4c3
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eigrpd/eigrp_hello.c
View File

@ -485,21 +485,15 @@ static uint16_t eigrp_tidlist_encode(struct stream *s)
* Part of conditional receive process * Part of conditional receive process
* *
*/ */
static uint16_t eigrp_sequence_encode(struct stream *s) static uint16_t eigrp_sequence_encode(struct eigrp *eigrp, struct stream *s)
{ {
uint16_t length = EIGRP_TLV_SEQ_BASE_LEN; uint16_t length = EIGRP_TLV_SEQ_BASE_LEN;
struct eigrp *eigrp;
struct eigrp_interface *ei; struct eigrp_interface *ei;
struct listnode *node, *node2, *nnode2; struct listnode *node, *node2, *nnode2;
struct eigrp_neighbor *nbr; struct eigrp_neighbor *nbr;
size_t backup_end, size_end; size_t backup_end, size_end;
int found; int found;
eigrp = eigrp_lookup(VRF_DEFAULT);
if (eigrp == NULL) {
return 0;
}
// add in the parameters TLV // add in the parameters TLV
backup_end = stream_get_endp(s); backup_end = stream_get_endp(s);
stream_putw(s, EIGRP_TLV_SEQ); stream_putw(s, EIGRP_TLV_SEQ);
@ -542,15 +536,10 @@ static uint16_t eigrp_sequence_encode(struct stream *s)
* Part of conditional receive process * Part of conditional receive process
* *
*/ */
static uint16_t eigrp_next_sequence_encode(struct stream *s) static uint16_t eigrp_next_sequence_encode(struct eigrp *eigrp,
struct stream *s)
{ {
uint16_t length = EIGRP_NEXT_SEQUENCE_TLV_SIZE; uint16_t length = EIGRP_NEXT_SEQUENCE_TLV_SIZE;
struct eigrp *eigrp;
eigrp = eigrp_lookup(VRF_DEFAULT);
if (eigrp == NULL) {
return 0;
}
// add in the parameters TLV // add in the parameters TLV
stream_putw(s, EIGRP_TLV_NEXT_MCAST_SEQ); stream_putw(s, EIGRP_TLV_NEXT_MCAST_SEQ);
@ -660,8 +649,8 @@ static struct eigrp_packet *eigrp_hello_encode(struct eigrp_interface *ei,
length += eigrp_sw_version_encode(ep->s); length += eigrp_sw_version_encode(ep->s);
if (flags & EIGRP_HELLO_ADD_SEQUENCE) { if (flags & EIGRP_HELLO_ADD_SEQUENCE) {
length += eigrp_sequence_encode(ep->s); length += eigrp_sequence_encode(ei->eigrp, ep->s);
length += eigrp_next_sequence_encode(ep->s); length += eigrp_next_sequence_encode(ei->eigrp, ep->s);
} }
// add in the TID list if doing multi-topology // add in the TID list if doing multi-topology