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

ospfd: Remove unused function

Browse Source 
The ospf_external_route_lookup function was not
being used so let's just remove it.

Unfortunately the removal was not quite so simple as
that ospf_asbr.h was being used to generate a reference
for the `struct ospf_route` data structure, so we
need to fix up the compile by fixing up header
inclusions so that ospf_route.h is actually included

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-08-21 08:40:51 -04:00
parent f8a523363e
commit 19c0412aad
6 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ospfclient/ospf_apiclient.c
View File

@ -46,6 +46,7 @@
#include "ospfd/ospf_lsdb.h" #include "ospfd/ospf_lsdb.h"
#include "ospfd/ospf_neighbor.h" #include "ospfd/ospf_neighbor.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_api.h" #include "ospfd/ospf_api.h"

20
ospfd/ospf_asbr.c
View File

@ -73,26 +73,6 @@ void ospf_external_route_remove(struct ospf *ospf, struct prefix_ipv4 *p)
p->prefixlen); p->prefixlen);
} }
/* Lookup external route. */
struct ospf_route *ospf_external_route_lookup(struct ospf *ospf,
struct prefix_ipv4 *p)
{
struct route_node *rn;
rn = route_node_lookup(ospf->old_external_route, (struct prefix *)p);
if (rn) {
route_unlock_node(rn);
if (rn->info)
return rn->info;
}
zlog_warn("Route[%s/%d]: lookup, no such prefix", inet_ntoa(p->prefix),
p->prefixlen);
return NULL;
}
/* Add an External info for AS-external-LSA. */ /* Add an External info for AS-external-LSA. */
struct external_info *ospf_external_info_new(uint8_t type, struct external_info *ospf_external_info_new(uint8_t type,
unsigned short instance) unsigned short instance)

2
ospfd/ospf_asbr.h
View File

@ -68,8 +68,6 @@ extern void ospf_external_info_delete(struct ospf *, uint8_t, unsigned short,
extern struct external_info *ospf_external_info_lookup(struct ospf *, uint8_t, extern struct external_info *ospf_external_info_lookup(struct ospf *, uint8_t,
unsigned short, unsigned short,
struct prefix_ipv4 *); struct prefix_ipv4 *);
extern struct ospf_route *ospf_external_route_lookup(struct ospf *,
struct prefix_ipv4 *);
extern void ospf_asbr_status_update(struct ospf *, uint8_t); extern void ospf_asbr_status_update(struct ospf *, uint8_t);
extern void ospf_redistribute_withdraw(struct ospf *, uint8_t, unsigned short); extern void ospf_redistribute_withdraw(struct ospf *, uint8_t, unsigned short);

1
ospfd/ospf_main.c
View File

@ -49,6 +49,7 @@
#include "ospfd/ospf_lsdb.h" #include "ospfd/ospf_lsdb.h"
#include "ospfd/ospf_neighbor.h" #include "ospfd/ospf_neighbor.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_vty.h" #include "ospfd/ospf_vty.h"
#include "ospfd/ospf_bfd.h" #include "ospfd/ospf_bfd.h"

1
ospfd/ospf_snmp.c
View File

@ -47,6 +47,7 @@
#include "ospfd/ospf_flood.h" #include "ospfd/ospf_flood.h"
#include "ospfd/ospf_ism.h" #include "ospfd/ospf_ism.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
/* OSPF2-MIB. */ /* OSPF2-MIB. */

2
ospfd/ospfd.c
View File

@ -52,10 +52,10 @@
#include "ospfd/ospf_spf.h" #include "ospfd/ospf_spf.h"
#include "ospfd/ospf_packet.h" #include "ospfd/ospf_packet.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_abr.h" #include "ospfd/ospf_abr.h"
#include "ospfd/ospf_flood.h" #include "ospfd/ospf_flood.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_ase.h" #include "ospfd/ospf_ase.h"