diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-30 15:01:09 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-30 15:34:03 +0200 |
| commit | dba7860904ec03bf3c856efee1fae9fc06821121 (patch) | |
| tree | 30aec946f331743d2f20b5dba7a5fcb7d7009d14 /pimd/pim_pim.c | |
| parent | pimd: Add ability to encode/decode v6 secondary addresses (diff) | |
| download | frr-dba7860904ec03bf3c856efee1fae9fc06821121.tar.xz frr-dba7860904ec03bf3c856efee1fae9fc06821121.zip | |
pimd: Send v6 secondary addresses to neighbors in hello
Send v6 secondary addresses to our neighbor in hello's.
Additionally allow the disabling it via the cli introduced
earlier.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_pim.c')
| -rw-r--r-- | pimd/pim_pim.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index f82687245..bc13e10a6 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -629,7 +629,7 @@ static int hello_send(struct interface *ifp, listcount(ifp->connected)); } - pim_tlv_size = pim_hello_build_tlv(ifp->name, + pim_tlv_size = pim_hello_build_tlv(ifp, pim_msg + PIM_PIM_MIN_LEN, sizeof(pim_msg) - PIM_PIM_MIN_LEN, holdtime, @@ -637,8 +637,7 @@ static int hello_send(struct interface *ifp, pim_ifp->pim_generation_id, pim_ifp->pim_propagation_delay_msec, pim_ifp->pim_override_interval_msec, - PIM_IF_TEST_PIM_CAN_DISABLE_JOIN_SUPRESSION(pim_ifp->options), - ifp->connected); + PIM_IF_TEST_PIM_CAN_DISABLE_JOIN_SUPRESSION(pim_ifp->options)); if (pim_tlv_size < 0) { return -1; } |