summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--isisd/isis_circuit.c4
-rw-r--r--isisd/isis_csm.c4
-rw-r--r--isisd/isis_errors.c4
-rw-r--r--isisd/isis_errors.h4
-rw-r--r--isisd/isis_events.c2
-rw-r--r--isisd/isis_pdu.c26
6 files changed, 22 insertions, 22 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 817a44bafe..d318079f6e 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -568,7 +568,7 @@ int isis_circuit_up(struct isis_circuit *circuit)
if (circuit->area->lsp_mtu > isis_circuit_pdu_size(circuit)) {
flog_err(
- ISIS_ERR_CONFIG,
+ EC_ISIS_CONFIG,
"Interface MTU %zu on %s is too low to support area lsp mtu %u!",
isis_circuit_pdu_size(circuit),
circuit->interface->name, circuit->area->lsp_mtu);
@@ -580,7 +580,7 @@ int isis_circuit_up(struct isis_circuit *circuit)
circuit->circuit_id = isis_circuit_id_gen(isis, circuit->interface);
if (!circuit->circuit_id) {
flog_err(
- ISIS_ERR_CONFIG,
+ EC_ISIS_CONFIG,
"There are already 255 broadcast circuits active!");
return ISIS_ERROR;
}
diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c
index aae90b0080..e50f57ae1d 100644
--- a/isisd/isis_csm.c
+++ b/isisd/isis_csm.c
@@ -139,11 +139,11 @@ isis_csm_state_change(int event, struct isis_circuit *circuit, void *arg)
isis_circuit_if_add(circuit, (struct interface *)arg);
if (isis_circuit_up(circuit) != ISIS_OK) {
flog_err(
- ISIS_ERR_CONFIG,
+ EC_ISIS_CONFIG,
"Could not bring up %s because of invalid config.",
circuit->interface->name);
flog_err(
- ISIS_ERR_CONFIG,
+ EC_ISIS_CONFIG,
"Clearing config for %s. Please re-examine it.",
circuit->interface->name);
if (circuit->ip_router) {
diff --git a/isisd/isis_errors.c b/isisd/isis_errors.c
index ecff65da1f..755e70dbf6 100644
--- a/isisd/isis_errors.c
+++ b/isisd/isis_errors.c
@@ -26,13 +26,13 @@
/* clang-format off */
static struct log_ref ferr_isis_err[] = {
{
- .code = ISIS_ERR_PACKET,
+ .code = EC_ISIS_PACKET,
.title = "ISIS Packet Error",
.description = "Isis has detected an error with a packet from a peer",
.suggestion = "Gather log information and open an issue then restart FRR"
},
{
- .code = ISIS_ERR_CONFIG,
+ .code = EC_ISIS_CONFIG,
.title = "ISIS Configuration Error",
.description = "Isis has detected an error within configuration for the router",
.suggestion = "Ensure configuration is correct"
diff --git a/isisd/isis_errors.h b/isisd/isis_errors.h
index f738254a30..0732737607 100644
--- a/isisd/isis_errors.h
+++ b/isisd/isis_errors.h
@@ -24,8 +24,8 @@
#include "lib/ferr.h"
enum isis_log_refs {
- ISIS_ERR_PACKET = ISIS_FERR_START,
- ISIS_ERR_CONFIG,
+ EC_ISIS_PACKET = ISIS_FERR_START,
+ EC_ISIS_CONFIG,
};
extern void isis_error_init(void);
diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index 52a0b9fac6..342787af30 100644
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -158,7 +158,7 @@ void isis_circuit_is_type_set(struct isis_circuit *circuit, int newtype)
if (!(newtype & circuit->area->is_type)) {
flog_err(
- ISIS_ERR_CONFIG,
+ EC_ISIS_CONFIG,
"ISIS-Evt (%s) circuit type change - invalid level %s because area is %s",
circuit->area->area_tag, circuit_t2string(newtype),
circuit_t2string(circuit->area->is_type));
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index a335a96cdb..b500801198 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -90,7 +90,7 @@ static int ack_lsp(struct isis_lsp_hdr *hdr, struct isis_circuit *circuit,
retval = circuit->tx(circuit, level);
if (retval != ISIS_OK)
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"ISIS-Upd (%s): Send L%d LSP PSNP on %s failed",
circuit->area->area_tag, level,
circuit->interface->name);
@@ -625,7 +625,7 @@ static int process_hello(uint8_t pdu_type, struct isis_circuit *circuit,
}
if (!p2p_hello && !(level & iih.circ_type)) {
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"Level %d LAN Hello with Circuit Type %d", level,
iih.circ_type);
return ISIS_ERROR;
@@ -1408,7 +1408,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
/* Verify that at least the 8 bytes fixed header have been received */
if (stream_get_endp(circuit->rcv_stream) < ISIS_FIXED_HDR_LEN) {
- flog_err(ISIS_ERR_PACKET, "PDU is too short to be IS-IS.");
+ flog_err(EC_ISIS_PACKET, "PDU is too short to be IS-IS.");
return ISIS_ERROR;
}
@@ -1429,7 +1429,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
}
if (idrp != ISO10589_ISIS) {
- flog_err(ISIS_ERR_PACKET, "Not an IS-IS packet IDRP=%" PRIx8,
+ flog_err(EC_ISIS_PACKET, "Not an IS-IS packet IDRP=%" PRIx8,
idrp);
return ISIS_ERROR;
}
@@ -1441,7 +1441,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
if (id_len != 0 && id_len != ISIS_SYS_ID_LEN) {
flog_err(
- ISIS_ERR_PACKET,
+ EC_ISIS_PACKET,
"IDFieldLengthMismatch: ID Length field in a received PDU %" PRIu8
", while the parameter for this IS is %u",
id_len, ISIS_SYS_ID_LEN);
@@ -1455,7 +1455,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
}
if (length != expected_length) {
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"Exepected fixed header length = %" PRIu8
" but got %" PRIu8,
expected_length, length);
@@ -1464,7 +1464,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
if (stream_get_endp(circuit->rcv_stream) < length) {
flog_err(
- ISIS_ERR_PACKET,
+ EC_ISIS_PACKET,
"PDU is too short to contain fixed header of given PDU type.");
return ISIS_ERROR;
}
@@ -1485,7 +1485,7 @@ int isis_handle_pdu(struct isis_circuit *circuit, uint8_t *ssnpa)
&& max_area_addrs != 0
&& max_area_addrs != isis->max_area_addrs) {
flog_err(
- ISIS_ERR_PACKET,
+ EC_ISIS_PACKET,
"maximumAreaAddressesMismatch: maximumAreaAdresses in a received PDU %" PRIu8
" while the parameter for this IS is %u",
max_area_addrs, isis->max_area_addrs);
@@ -1727,7 +1727,7 @@ int send_hello(struct isis_circuit *circuit, int level)
retval = circuit->tx(circuit, level);
if (retval != ISIS_OK)
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"ISIS-Adj (%s): Send L%d IIH on %s failed",
circuit->area->area_tag, level,
circuit->interface->name);
@@ -1925,7 +1925,7 @@ int send_csnp(struct isis_circuit *circuit, int level)
int retval = circuit->tx(circuit, level);
if (retval != ISIS_OK) {
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"ISIS-Snp (%s): Send L%d CSNP on %s failed",
circuit->area->area_tag, level,
circuit->interface->name);
@@ -2092,7 +2092,7 @@ static int send_psnp(int level, struct isis_circuit *circuit)
int retval = circuit->tx(circuit, level);
if (retval != ISIS_OK) {
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"ISIS-Snp (%s): Send L%d PSNP on %s failed",
circuit->area->area_tag, level,
circuit->interface->name);
@@ -2188,7 +2188,7 @@ void send_lsp(void *arg, struct isis_lsp *lsp, enum isis_tx_type tx_type)
* the circuit's MTU. So handle and log this case here. */
if (stream_get_endp(lsp->pdu) > stream_get_size(circuit->snd_stream)) {
flog_err(
- ISIS_ERR_PACKET,
+ EC_ISIS_PACKET,
"ISIS-Upd (%s): Can't send L%d LSP %s, seq 0x%08" PRIx32
", cksum 0x%04" PRIx16 ", lifetime %" PRIu16
"s on %s. LSP Size is %zu while interface stream size is %zu.",
@@ -2228,7 +2228,7 @@ void send_lsp(void *arg, struct isis_lsp *lsp, enum isis_tx_type tx_type)
clear_srm = 0;
retval = circuit->tx(circuit, lsp->level);
if (retval != ISIS_OK) {
- flog_err(ISIS_ERR_PACKET,
+ flog_err(EC_ISIS_PACKET,
"ISIS-Upd (%s): Send L%d LSP on %s failed %s",
circuit->area->area_tag, lsp->level,
circuit->interface->name,