/* Remove route from zebra. */
if (or->type == OSPF_DESTINATION_NETWORK)
- ospf_zebra_delete(ospf,
- (struct prefix_ipv4 *)&rn->p,
- or);
+ ospf_zebra_delete(
+ ospf, (struct prefix_ipv4 *)&rn->p, or);
ospf_route_free(or);
rn->info = NULL;
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(u_char type, u_short instance)
+struct external_info *ospf_external_info_new(uint8_t type,
+ unsigned short instance)
{
struct external_info *new;
- new = (struct external_info *)XCALLOC(MTYPE_OSPF_EXTERNAL_INFO,
- sizeof(struct external_info));
+ new = XCALLOC(MTYPE_OSPF_EXTERNAL_INFO, sizeof(struct external_info));
new->type = type;
new->instance = instance;
}
/* Add an External info for AS-external-LSA. */
-struct external_info *ospf_external_info_add(u_char type, u_short instance,
- struct prefix_ipv4 p,
- ifindex_t ifindex,
- struct in_addr nexthop,
- route_tag_t tag)
+struct external_info *
+ospf_external_info_add(struct ospf *ospf, uint8_t type, unsigned short instance,
+ struct prefix_ipv4 p, ifindex_t ifindex,
+ struct in_addr nexthop, route_tag_t tag)
{
struct external_info *new;
struct route_node *rn;
struct ospf_external *ext;
char inetbuf[INET6_BUFSIZ];
- ext = ospf_external_lookup(type, instance);
+ ext = ospf_external_lookup(ospf, type, instance);
if (!ext)
- ext = ospf_external_add(type, instance);
+ ext = ospf_external_add(ospf, type, instance);
rn = route_node_get(EXTERNAL_INFO(ext), (struct prefix *)&p);
/* If old info exists, -- discard new one or overwrite with new one? */
inet_ntop(AF_INET, (void *)&nexthop.s_addr, inetbuf,
INET6_BUFSIZ);
- zlog_warn(
- "Redistribute[%s][%d]: %s/%d discarding old info with NH %s.",
- ospf_redist_string(type), instance,
- inet_ntoa(p.prefix), p.prefixlen, inetbuf);
+ if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
+ zlog_debug(
+ "Redistribute[%s][%d][%u]: %s/%d discarding old info with NH %s.",
+ ospf_redist_string(type), instance,
+ ospf->vrf_id, inet_ntoa(p.prefix),
+ p.prefixlen, inetbuf);
XFREE(MTYPE_OSPF_EXTERNAL_INFO, rn->info);
rn->info = NULL;
}
inet_ntop(AF_INET, (void *)&nexthop.s_addr, inetbuf,
INET6_BUFSIZ);
zlog_debug(
- "Redistribute[%s]: %s/%d external info created, with NH %s",
- ospf_redist_string(type), inet_ntoa(p.prefix),
- p.prefixlen, inetbuf);
+ "Redistribute[%s][%u]: %s/%d external info created, with NH %s",
+ ospf_redist_string(type), ospf->vrf_id,
+ inet_ntoa(p.prefix), p.prefixlen, inetbuf);
}
return new;
}
-void ospf_external_info_delete(u_char type, u_short instance,
- struct prefix_ipv4 p)
+void ospf_external_info_delete(struct ospf *ospf, uint8_t type,
+ unsigned short instance, struct prefix_ipv4 p)
{
struct route_node *rn;
struct ospf_external *ext;
- ext = ospf_external_lookup(type, instance);
+ ext = ospf_external_lookup(ospf, type, instance);
if (!ext)
return;
}
}
-struct external_info *ospf_external_info_lookup(u_char type, u_short instance,
+struct external_info *ospf_external_info_lookup(struct ospf *ospf, uint8_t type,
+ unsigned short instance,
struct prefix_ipv4 *p)
{
struct route_node *rn;
struct ospf_external *ext;
- ext = ospf_external_lookup(type, instance);
+ ext = ospf_external_lookup(ospf, type, instance);
if (!ext)
return NULL;
/* Update ASBR status. */
-void ospf_asbr_status_update(struct ospf *ospf, u_char status)
+void ospf_asbr_status_update(struct ospf *ospf, uint8_t status)
{
- zlog_info("ASBR[Status:%d]: Update", status);
+ zlog_info("ASBR[%s:Status:%d]: Update",
+ ospf_get_name(ospf), status);
/* ASBR on. */
if (status) {
/* Already ASBR. */
if (IS_OSPF_ASBR(ospf)) {
- zlog_info("ASBR[Status:%d]: Already ASBR", status);
+ zlog_info("ASBR[%s:Status:%d]: Already ASBR",
+ ospf_get_name(ospf), status);
return;
}
SET_FLAG(ospf->flags, OSPF_FLAG_ASBR);
} else {
/* Already non ASBR. */
if (!IS_OSPF_ASBR(ospf)) {
- zlog_info("ASBR[Status:%d]: Already non ASBR", status);
+ zlog_info("ASBR[%s:Status:%d]: Already non ASBR",
+ ospf_get_name(ospf), status);
return;
}
UNSET_FLAG(ospf->flags, OSPF_FLAG_ASBR);
ospf_router_lsa_update(ospf);
}
-void ospf_redistribute_withdraw(struct ospf *ospf, u_char type,
- u_short instance)
+void ospf_redistribute_withdraw(struct ospf *ospf, uint8_t type,
+ unsigned short instance)
{
struct route_node *rn;
struct external_info *ei;
struct ospf_external *ext;
- ext = ospf_external_lookup(type, instance);
+ ext = ospf_external_lookup(ospf, type, instance);
if (!ext)
return;