mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 15:33:56 +00:00
Merge pull request #9935 from idryzhov/fabricd-ifconf-cleanup
fabricd: cleanup interface config output
This commit is contained in:
commit
ab7e3ba180
@ -268,24 +268,6 @@ void isis_circuit_deconfigure(struct isis_circuit *circuit,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct isis_circuit *circuit_lookup_by_ifp(struct interface *ifp,
|
|
||||||
struct list *list)
|
|
||||||
{
|
|
||||||
struct isis_circuit *circuit = NULL;
|
|
||||||
struct listnode *node;
|
|
||||||
|
|
||||||
if (!list)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (ALL_LIST_ELEMENTS_RO(list, node, circuit))
|
|
||||||
if (circuit->interface == ifp) {
|
|
||||||
assert(ifp->info == circuit);
|
|
||||||
return circuit;
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct isis_circuit *circuit_scan_by_ifp(struct interface *ifp)
|
struct isis_circuit *circuit_scan_by_ifp(struct interface *ifp)
|
||||||
{
|
{
|
||||||
return (struct isis_circuit *)ifp->info;
|
return (struct isis_circuit *)ifp->info;
|
||||||
@ -1073,17 +1055,9 @@ static int isis_interface_config_write(struct vty *vty)
|
|||||||
{
|
{
|
||||||
struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
|
struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
|
||||||
int write = 0;
|
int write = 0;
|
||||||
struct listnode *node;
|
|
||||||
struct interface *ifp;
|
struct interface *ifp;
|
||||||
struct isis_area *area;
|
|
||||||
struct isis_circuit *circuit;
|
struct isis_circuit *circuit;
|
||||||
int i;
|
int i;
|
||||||
struct isis *isis = NULL;
|
|
||||||
|
|
||||||
isis = isis_lookup_by_vrfid(vrf->vrf_id);
|
|
||||||
|
|
||||||
if (isis == NULL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
FOR_ALL_INTERFACES (vrf, ifp) {
|
FOR_ALL_INTERFACES (vrf, ifp) {
|
||||||
/* IF name */
|
/* IF name */
|
||||||
@ -1095,14 +1069,13 @@ static int isis_interface_config_write(struct vty *vty)
|
|||||||
write++;
|
write++;
|
||||||
}
|
}
|
||||||
/* ISIS Circuit */
|
/* ISIS Circuit */
|
||||||
for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area)) {
|
do {
|
||||||
circuit =
|
circuit = circuit_scan_by_ifp(ifp);
|
||||||
circuit_lookup_by_ifp(ifp, area->circuit_list);
|
|
||||||
if (circuit == NULL)
|
if (circuit == NULL)
|
||||||
continue;
|
break;
|
||||||
if (circuit->ip_router) {
|
if (circuit->ip_router) {
|
||||||
vty_out(vty, " ip router " PROTO_NAME " %s\n",
|
vty_out(vty, " ip router " PROTO_NAME " %s\n",
|
||||||
area->area_tag);
|
circuit->tag);
|
||||||
write++;
|
write++;
|
||||||
}
|
}
|
||||||
if (circuit->is_passive) {
|
if (circuit->is_passive) {
|
||||||
@ -1115,7 +1088,7 @@ static int isis_interface_config_write(struct vty *vty)
|
|||||||
}
|
}
|
||||||
if (circuit->ipv6_router) {
|
if (circuit->ipv6_router) {
|
||||||
vty_out(vty, " ipv6 router " PROTO_NAME " %s\n",
|
vty_out(vty, " ipv6 router " PROTO_NAME " %s\n",
|
||||||
area->area_tag);
|
circuit->tag);
|
||||||
write++;
|
write++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1295,7 +1268,7 @@ static int isis_interface_config_write(struct vty *vty)
|
|||||||
}
|
}
|
||||||
write += hook_call(isis_circuit_config_write,
|
write += hook_call(isis_circuit_config_write,
|
||||||
circuit, vty);
|
circuit, vty);
|
||||||
}
|
} while (0);
|
||||||
vty_endframe(vty, "exit\n!\n");
|
vty_endframe(vty, "exit\n!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,8 +186,6 @@ DECLARE_QOBJ_TYPE(isis_circuit);
|
|||||||
void isis_circuit_init(void);
|
void isis_circuit_init(void);
|
||||||
struct isis_circuit *isis_circuit_new(struct interface *ifp, const char *tag);
|
struct isis_circuit *isis_circuit_new(struct interface *ifp, const char *tag);
|
||||||
void isis_circuit_del(struct isis_circuit *circuit);
|
void isis_circuit_del(struct isis_circuit *circuit);
|
||||||
struct isis_circuit *circuit_lookup_by_ifp(struct interface *ifp,
|
|
||||||
struct list *list);
|
|
||||||
struct isis_circuit *circuit_scan_by_ifp(struct interface *ifp);
|
struct isis_circuit *circuit_scan_by_ifp(struct interface *ifp);
|
||||||
void isis_circuit_configure(struct isis_circuit *circuit,
|
void isis_circuit_configure(struct isis_circuit *circuit,
|
||||||
struct isis_area *area);
|
struct isis_area *area);
|
||||||
|
Loading…
Reference in New Issue
Block a user