#include "ospfd/ospf_route.h"
#include "ospfd/ospf_ase.h"
#include "ospfd/ospf_zebra.h"
+#include "ospfd/ospf_errors.h"
#include "ospfd/ospf_api.h"
#include "ospfd/ospf_apiserver.h"
NULL, /* ospf_apiserver_lsa_refresher */
ospf_apiserver_lsa_update, ospf_apiserver_lsa_delete);
if (rc != 0) {
- zlog_warn(
+ flog_warn(
+ EC_OSPF_OPAQUE_REGISTRATION,
"ospf_apiserver_init: Failed to register opaque type [0/0]");
}
/* Free client list itself */
if (apiserver_list)
- list_delete_and_null(&apiserver_list);
+ list_delete(&apiserver_list);
/* Free wildcard list */
/* XXX */
NULL /* ospf_apiserver_lsa_delete */);
if (rc != 0) {
- zlog_warn("Failed to register opaque type [%d/%d]", lsa_type,
+ flog_warn(EC_OSPF_OPAQUE_REGISTRATION,
+ "Failed to register opaque type [%d/%d]", lsa_type,
opaque_type);
return OSPF_API_OPAQUETYPEINUSE;
}
newlsa->length = htons(length);
/* Create OSPF LSA. */
- if ((new = ospf_lsa_new()) == NULL) {
- zlog_warn("ospf_apiserver_opaque_lsa_new: ospf_lsa_new() ?");
- stream_free(s);
- return NULL;
- }
-
- if ((new->data = ospf_lsa_data_new(length)) == NULL) {
- zlog_warn(
- "ospf_apiserver_opaque_lsa_new: ospf_lsa_data_new() ?");
- ospf_lsa_unlock(&new);
- stream_free(s);
- return NULL;
- }
+ new = ospf_lsa_new_and_data(length);
new->area = area;
new->oi = oi;
/* Install this LSA into LSDB. */
if (ospf_lsa_install(ospf, lsa->oi, lsa) == NULL) {
- zlog_warn("ospf_apiserver_originate1: ospf_lsa_install failed");
+ flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
+ "ospf_apiserver_originate1: ospf_lsa_install failed");
return -1;
}
/* Install LSA into LSDB. */
if (ospf_lsa_install(ospf, new->oi, new) == NULL) {
- zlog_warn(
+ flog_warn(
+ EC_OSPF_LSA_INSTALL_FAILURE,
"ospf_apiserver_lsa_refresher: ospf_lsa_install failed");
ospf_lsa_unlock(&new);
goto out;
/* zlog_warn for debugging */
zlog_warn("ospf_apiserver_del_if");
- zlog_warn("ifp name=%s status=%d index=%d\n", ifp->name, ifp->status,
+ zlog_warn("ifp name=%s status=%d index=%d", ifp->name, ifp->status,
ifp->ifindex);
oi = ospf_apiserver_if_lookup_by_ifp(ifp);
for (i = 0; i < opaquelen; i++) {
zlog_debug("0x%x ", olsa->data[i]);
}
- zlog_debug("\n");
}
return;
}
void ospf_apiserver_clients_notify_nsm_change(struct ospf_neighbor *nbr)
{
struct msg *msg;
- struct in_addr ifaddr = {.s_addr = 0L};
+ struct in_addr ifaddr;
struct in_addr nbraddr;
assert(nbr);
- if (nbr->oi) {
- ifaddr = nbr->oi->address->u.prefix4;
- }
+ ifaddr = nbr->oi->address->u.prefix4;
nbraddr = nbr->address.u.prefix4;