proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3048 from donaldsharp/pim_6.0

Browse Source 
pimd: Actually create vif's in non-integrated config
This commit is contained in:
Martin Winter 2018-09-20 23:39:13 +11:00 committed by GitHub
commit cc79c3ca0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pimd/pim_cmd.c
View File

@ -5789,7 +5789,8 @@ static int pim_cmd_igmp_start(struct vty *vty, struct interface *ifp)
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (!pim_ifp) { if (!pim_ifp) {
pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */); pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */,
false);
if (!pim_ifp) { if (!pim_ifp) {
vty_out(vty, "Could not enable IGMP on interface %s\n", vty_out(vty, "Could not enable IGMP on interface %s\n",
ifp->name); ifp->name);
@ -6400,7 +6401,8 @@ static int pim_cmd_interface_add(struct interface *ifp)
struct pim_interface *pim_ifp = ifp->info; struct pim_interface *pim_ifp = ifp->info;
if (!pim_ifp) { if (!pim_ifp) {
pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */); pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */,
false);
if (!pim_ifp) { if (!pim_ifp) {
return 0; return 0;
} }

16
pimd/pim_iface.c
View File

@ -108,7 +108,8 @@ static int pim_sec_addr_comp(const void *p1, const void *p2)
return 0; return 0;
} }
struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim) struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim,
bool ispimreg)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
@ -175,7 +176,7 @@ struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim)
pim_sock_reset(ifp); pim_sock_reset(ifp);
pim_if_add_vif(ifp); pim_if_add_vif(ifp, ispimreg);
return pim_ifp; return pim_ifp;
} }
@ -626,7 +627,7 @@ void pim_if_addr_add(struct connected *ifc)
address assigned, then try to create a vif_index. address assigned, then try to create a vif_index.
*/ */
if (pim_ifp->mroute_vif_index < 0) { if (pim_ifp->mroute_vif_index < 0) {
pim_if_add_vif(ifp); pim_if_add_vif(ifp, false);
} }
pim_ifchannel_scan_forward_start(ifp); pim_ifchannel_scan_forward_start(ifp);
} }
@ -759,7 +760,7 @@ void pim_if_addr_add_all(struct interface *ifp)
* address assigned, then try to create a vif_index. * address assigned, then try to create a vif_index.
*/ */
if (pim_ifp->mroute_vif_index < 0) { if (pim_ifp->mroute_vif_index < 0) {
pim_if_add_vif(ifp); pim_if_add_vif(ifp, false);
} }
pim_ifchannel_scan_forward_start(ifp); pim_ifchannel_scan_forward_start(ifp);
@ -924,7 +925,7 @@ static int pim_iface_next_vif_index(struct interface *ifp)
see also pim_if_find_vifindex_by_ifindex() see also pim_if_find_vifindex_by_ifindex()
*/ */
int pim_if_add_vif(struct interface *ifp) int pim_if_add_vif(struct interface *ifp, bool ispimreg)
{ {
struct pim_interface *pim_ifp = ifp->info; struct pim_interface *pim_ifp = ifp->info;
struct in_addr ifaddr; struct in_addr ifaddr;
@ -946,8 +947,7 @@ int pim_if_add_vif(struct interface *ifp)
} }
ifaddr = pim_ifp->primary_address; ifaddr = pim_ifp->primary_address;
if (ifp->ifindex != PIM_OIF_PIM_REGISTER_VIF if (!ispimreg && PIM_INADDR_IS_ANY(ifaddr)) {
&& PIM_INADDR_IS_ANY(ifaddr)) {
zlog_warn( zlog_warn(
"%s: could not get address for interface %s ifindex=%d", "%s: could not get address for interface %s ifindex=%d",
__PRETTY_FUNCTION__, ifp->name, ifp->ifindex); __PRETTY_FUNCTION__, ifp->name, ifp->ifindex);
@ -1468,7 +1468,7 @@ void pim_if_create_pimreg(struct pim_instance *pim)
pim->regiface = if_create(pimreg_name, pim->vrf_id); pim->regiface = if_create(pimreg_name, pim->vrf_id);
pim->regiface->ifindex = PIM_OIF_PIM_REGISTER_VIF; pim->regiface->ifindex = PIM_OIF_PIM_REGISTER_VIF;
pim_if_new(pim->regiface, 0, 0); pim_if_new(pim->regiface, 0, 0, true);
} }
} }

5
pimd/pim_iface.h
View File

@ -154,7 +154,8 @@ struct pim_interface {
void pim_if_init(struct pim_instance *pim); void pim_if_init(struct pim_instance *pim);
void pim_if_terminate(struct pim_instance *pim); void pim_if_terminate(struct pim_instance *pim);
struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim); struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim,
bool ispimreg);
void pim_if_delete(struct interface *ifp); void pim_if_delete(struct interface *ifp);
void pim_if_addr_add(struct connected *ifc); void pim_if_addr_add(struct connected *ifc);
void pim_if_addr_del(struct connected *ifc, int force_prim_as_any); void pim_if_addr_del(struct connected *ifc, int force_prim_as_any);
@ -163,7 +164,7 @@ void pim_if_addr_del_all(struct interface *ifp);
void pim_if_addr_del_all_igmp(struct interface *ifp); void pim_if_addr_del_all_igmp(struct interface *ifp);
void pim_if_addr_del_all_pim(struct interface *ifp); void pim_if_addr_del_all_pim(struct interface *ifp);
int pim_if_add_vif(struct interface *ifp); int pim_if_add_vif(struct interface *ifp, bool ispimreg);
int pim_if_del_vif(struct interface *ifp); int pim_if_del_vif(struct interface *ifp);
void pim_if_add_vif_all(struct pim_instance *pim); void pim_if_add_vif_all(struct pim_instance *pim);
void pim_if_del_vif_all(struct pim_instance *pim); void pim_if_del_vif_all(struct pim_instance *pim);

2
pimd/pim_zebra.c
View File

@ -112,7 +112,7 @@ static int pim_zebra_if_add(int command, struct zclient *zclient,
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
if (!ifp->info) { if (!ifp->info) {
pim_ifp = pim_if_new(ifp, 0, 0); pim_ifp = pim_if_new(ifp, 0, 0, false);
ifp->info = pim_ifp; ifp->info = pim_ifp;
} }