Skip to content
Permalink
Browse files

ospfd: Remove unused function

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>
  • Loading branch information...
donaldsharp committed Aug 21, 2018
1 parent f8a5233 commit 19c0412aadd7ee454c9cfb4beffad69232c27330
Showing with 4 additions and 23 deletions.
  1. +1 −0 ospfclient/ospf_apiclient.c
  2. +0 −20 ospfd/ospf_asbr.c
  3. +0 −2 ospfd/ospf_asbr.h
  4. +1 −0 ospfd/ospf_main.c
  5. +1 −0 ospfd/ospf_snmp.c
  6. +1 −1 ospfd/ospfd.c
@@ -46,6 +46,7 @@
#include "ospfd/ospf_lsdb.h"
#include "ospfd/ospf_neighbor.h"
#include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_api.h"

@@ -73,26 +73,6 @@ void ospf_external_route_remove(struct ospf *ospf, struct prefix_ipv4 *p)
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. */
struct external_info *ospf_external_info_new(uint8_t type,
unsigned short instance)
@@ -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,
unsigned short,
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_redistribute_withdraw(struct ospf *, uint8_t, unsigned short);
@@ -49,6 +49,7 @@
#include "ospfd/ospf_lsdb.h"
#include "ospfd/ospf_neighbor.h"
#include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_vty.h"
#include "ospfd/ospf_bfd.h"
@@ -47,6 +47,7 @@
#include "ospfd/ospf_flood.h"
#include "ospfd/ospf_ism.h"
#include "ospfd/ospf_dump.h"
#include "ospfd/ospf_route.h"
#include "ospfd/ospf_zebra.h"

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


0 comments on commit 19c0412

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.