proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-03 21:28:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Cleanup the rest of the global config to be vrf aware for spacing

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-22 15:49:01 -04:00
parent 0c8b717ee6
commit c9657fdc91
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pimd/pim_msdp.c
View File

@ -1537,7 +1537,8 @@ enum pim_msdp_err pim_msdp_mg_src_add(struct pim_instance *pim,
}
/*********************** MSDP feature APIs *********************************/
int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty)
int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty,
const char *spaces)
{
struct listnode *mbrnode;
struct pim_msdp_mg_mbr *mbr;
@ -1552,14 +1553,14 @@ int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty)
if (mg->src_ip.s_addr != INADDR_ANY) {
pim_inet4_dump("<src?>", mg->src_ip, src_str, sizeof(src_str));
vty_out(vty, "ip msdp mesh-group %s source %s\n",
vty_out(vty, "%sip msdp mesh-group %s source %s\n", spaces,
mg->mesh_group_name, src_str);
++count;
}
for (ALL_LIST_ELEMENTS_RO(mg->mbr_list, mbrnode, mbr)) {
pim_inet4_dump("<mbr?>", mbr->mbr_ip, mbr_str, sizeof(mbr_str));
vty_out(vty, "ip msdp mesh-group %s member %s\n",
vty_out(vty, "%sip msdp mesh-group %s member %s\n", spaces,
mg->mesh_group_name, mbr_str);
++count;
}
@ -1568,7 +1569,7 @@ int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty)
int pim_msdp_config_write(struct vty *vty)
{
return pim_msdp_config_write_helper(pimg, vty);
return pim_msdp_config_write_helper(pimg, vty, "");
}
/* Enable feature including active/periodic timers etc. on the first peer

3
pimd/pim_msdp.h
View File

@ -239,7 +239,8 @@ int pim_msdp_write(struct thread *thread);
char *pim_msdp_peer_key_dump(struct pim_msdp_peer *mp, char *buf, int buf_size,
bool long_format);
int pim_msdp_config_write(struct vty *vty);
int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty);
int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty,
const char *spaces);
void pim_msdp_peer_pkt_txed(struct pim_msdp_peer *mp);
void pim_msdp_sa_ref(struct pim_instance *pim, struct pim_msdp_peer *mp,
struct prefix_sg *sg, struct in_addr rp);

30
pimd/pim_vty.c
View File

@ -153,10 +153,10 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
else
sprintf(spaces, "%s", " ");
writes += pim_msdp_config_write_helper(pim, vty);
writes += pim_msdp_config_write_helper(pim, vty, spaces);
if (!pim->send_v6_secondary) {
vty_out(vty, "no ip pim send-v6-secondary\n");
vty_out(vty, "%sno ip pim send-v6-secondary\n", spaces);
++writes;
}
@ -164,55 +164,57 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
if (qpim_register_suppress_time
!= PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) {
vty_out(vty, "ip pim register-suppress-time %d\n",
vty_out(vty, "%sip pim register-suppress-time %d\n", spaces,
qpim_register_suppress_time);
++writes;
}
if (qpim_t_periodic != PIM_DEFAULT_T_PERIODIC) {
vty_out(vty, "ip pim join-prune-interval %d\n",
vty_out(vty, "%sip pim join-prune-interval %d\n", spaces,
qpim_t_periodic);
++writes;
}
if (qpim_keep_alive_time != PIM_KEEPALIVE_PERIOD) {
vty_out(vty, "ip pim keep-alive-timer %d\n",
vty_out(vty, "%sip pim keep-alive-timer %d\n", spaces,
qpim_keep_alive_time);
++writes;
}
if (qpim_packet_process != PIM_DEFAULT_PACKET_PROCESS) {
vty_out(vty, "ip pim packets %d\n", qpim_packet_process);
vty_out(vty, "%sip pim packets %d\n", spaces,
qpim_packet_process);
++writes;
}
if (ssm->plist_name) {
vty_out(vty, "ip pim ssm prefix-list %s\n", ssm->plist_name);
vty_out(vty, "%sip pim ssm prefix-list %s\n", spaces,
ssm->plist_name);
++writes;
}
if (pim->spt.switchover == PIM_SPT_INFINITY) {
if (pim->spt.plist)
vty_out(vty,
"ip pim spt-switchover infinity-and-beyond prefix-list %s\n",
pim->spt.plist);
"%sip pim spt-switchover infinity-and-beyond prefix-list %s\n",
spaces, pim->spt.plist);
else
vty_out(vty,
"ip pim spt-switchover infinity-and-beyond\n");
"%sip pim spt-switchover infinity-and-beyond\n",
spaces);
++writes;
}
if (qpim_ecmp_rebalance_enable) {
vty_out(vty, "ip pim ecmp rebalance\n");
vty_out(vty, "%sip pim ecmp rebalance\n", spaces);
++writes;
} else if (qpim_ecmp_enable) {
vty_out(vty, "ip pim ecmp\n");
vty_out(vty, "%sip pim ecmp\n", spaces);
++writes;
}
if (pim->ssmpingd_list) {
struct listnode *node;
struct ssmpingd_sock *ss;
vty_out(vty, "!\n");
++writes;
for (ALL_LIST_ELEMENTS_RO(pim->ssmpingd_list, node, ss)) {
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", ss->source_addr, source_str,
sizeof(source_str));
vty_out(vty, "ip ssmpingd %s\n", source_str);
vty_out(vty, "%sip ssmpingd %s\n", spaces, source_str);
++writes;
}
}