summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--isisd/isis_bpf.c9
-rw-r--r--isisd/isis_dlpi.c9
-rw-r--r--isisd/isis_lsp.c4
-rw-r--r--isisd/isis_main.c2
-rw-r--r--isisd/isis_pdu.c4
-rw-r--r--isisd/isis_pfpacket.c9
-rw-r--r--isisd/isis_spf.c3
7 files changed, 24 insertions, 16 deletions
diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index 2cc2fefd9a..b5a09aff22 100644
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -32,6 +32,7 @@
#include "network.h"
#include "stream.h"
#include "if.h"
+#include "lib_errors.h"
#include "isisd/dict.h"
#include "isisd/isis_constants.h"
@@ -187,8 +188,8 @@ int isis_sock_init(struct isis_circuit *circuit)
int retval = ISIS_OK;
if (isisd_privs.change(ZPRIVS_RAISE))
- zlog_err("%s: could not raise privs, %s", __func__,
- safe_strerror(errno));
+ zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
+ __func__, safe_strerror(errno));
retval = open_bpf_dev(circuit);
@@ -208,8 +209,8 @@ int isis_sock_init(struct isis_circuit *circuit)
end:
if (isisd_privs.change(ZPRIVS_LOWER))
- zlog_err("%s: could not lower privs, %s", __func__,
- safe_strerror(errno));
+ zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
+ __func__, safe_strerror(errno));
return retval;
}
diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c
index 718f3a8982..455a2ca3aa 100644
--- a/isisd/isis_dlpi.c
+++ b/isisd/isis_dlpi.c
@@ -36,6 +36,7 @@
#include "network.h"
#include "stream.h"
#include "if.h"
+#include "lib_errors.h"
#include "isisd/dict.h"
#include "isisd/isis_constants.h"
@@ -468,8 +469,8 @@ int isis_sock_init(struct isis_circuit *circuit)
int retval = ISIS_OK;
if (isisd_privs.change(ZPRIVS_RAISE))
- zlog_err("%s: could not raise privs, %s", __func__,
- safe_strerror(errno));
+ zlog_ferr(LIB_ERR_PRIVILEGE, "%s: could not raise privs, %s",
+ __func__, safe_strerror(errno));
retval = open_dlpi_dev(circuit);
@@ -489,8 +490,8 @@ int isis_sock_init(struct isis_circuit *circuit)
end:
if (isisd_privs.change(ZPRIVS_LOWER))
- zlog_err("%s: could not lower privs, %s", __func__,
- safe_strerror(errno));
+ zlog_ferr(LIB_ERR_PRIVILEGE, "%s: could not lower privs, %s",
+ __func__, safe_strerror(errno));
return retval;
}
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 37651163f5..63f7776551 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -38,6 +38,7 @@
#include "md5.h"
#include "table.h"
#include "srcdest_table.h"
+#include "lib_errors.h"
#include "isisd/dict.h"
#include "isisd/isis_constants.h"
@@ -453,7 +454,8 @@ void lsp_update(struct isis_lsp *lsp, struct isis_lsp_hdr *hdr,
struct isis_area *area, int level, bool confusion)
{
if (lsp->own_lsp) {
- zlog_err(
+ zlog_ferr(
+ LIB_ERR_DEVELOPMENT,
"ISIS-Upd (%s): BUG updating LSP %s still marked as own LSP",
area->area_tag, rawlspid_print(lsp->hdr.lsp_id));
lsp_clear_data(lsp);
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 40ceb99fb2..ec6b0922bb 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -103,7 +103,7 @@ static __attribute__((__noreturn__)) void terminate(int i)
void sighup(void)
{
- zlog_err("SIGHUP/reload is not implemented for isisd");
+ zlog_notice("SIGHUP/reload is not implemented for isisd");
return;
}
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index 8e2a7f13a5..1753ea22f6 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -34,6 +34,7 @@
#include "if.h"
#include "checksum.h"
#include "md5.h"
+#include "lib_errors.h"
#include "isisd/dict.h"
#include "isisd/isis_constants.h"
@@ -1365,7 +1366,8 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
uint8_t max_area_addrs = stream_getc(circuit->rcv_stream);
if (idrp == ISO9542_ESIS) {
- zlog_err("No support for ES-IS packet IDRP=%" PRIx8, idrp);
+ zlog_ferr(LIB_ERR_DEVELOPMENT,
+ "No support for ES-IS packet IDRP=%" PRIx8, idrp);
return ISIS_ERROR;
}
diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c
index fd82b85f51..f27ca2889f 100644
--- a/isisd/isis_pfpacket.c
+++ b/isisd/isis_pfpacket.c
@@ -31,6 +31,7 @@
#include "network.h"
#include "stream.h"
#include "if.h"
+#include "lib_errors.h"
#include "isisd/dict.h"
#include "isisd/isis_constants.h"
@@ -185,8 +186,8 @@ int isis_sock_init(struct isis_circuit *circuit)
int retval = ISIS_OK;
if (isisd_privs.change(ZPRIVS_RAISE))
- zlog_err("%s: could not raise privs, %s", __func__,
- safe_strerror(errno));
+ zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not raise privs, %s",
+ __func__, safe_strerror(errno));
retval = open_packet_socket(circuit);
@@ -210,8 +211,8 @@ int isis_sock_init(struct isis_circuit *circuit)
end:
if (isisd_privs.change(ZPRIVS_LOWER))
- zlog_err("%s: could not lower privs, %s", __func__,
- safe_strerror(errno));
+ zlog_ferr(LIB_ERR_PRIVILEGES, "%s: could not lower privs, %s",
+ __func__, safe_strerror(errno));
return retval;
}
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 63f8b34bed..8654fd4eed 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -38,6 +38,7 @@
#include "jhash.h"
#include "skiplist.h"
#include "srcdest_table.h"
+#include "lib_errors.h"
#include "isis_constants.h"
#include "isis_common.h"
@@ -437,7 +438,7 @@ static void isis_vertex_id_init(struct isis_vertex *vertex, union isis_N *n,
} else if (VTYPE_IP(vtype)) {
memcpy(&vertex->N.ip, &n->ip, sizeof(n->ip));
} else {
- zlog_err("WTF!");
+ zlog_ferr(LIB_ERR_DEVELOPMENT, "Unknown Vertex Type");
}
}