diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-03 18:03:29 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-08-14 20:02:05 +0000 |
| commit | af4c27286d8eb3f347ff431a17a47a8d07cd8976 (patch) | |
| tree | caf5eae55c21f72baec4945cdb2cbc333d99f916 /zebra/label_manager.c | |
| parent | fa8b3ca66abee50e57034ef594883011f302057b (diff) | |
*: rename zlog_fer -> flog_err
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'zebra/label_manager.c')
| -rw-r--r-- | zebra/label_manager.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c index c6a32343d9..e53764c770 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -83,7 +83,7 @@ static int relay_response_back(void) ret = zclient_read_header(src, zclient->sock, &size, &marker, &version, &vrf_id, &resp_cmd); if (ret < 0 && errno != EAGAIN) { - zlog_ferr(ZEBRA_ERR_LM_RESPONSE, + flog_err(ZEBRA_ERR_LM_RESPONSE, "Error reading Label Manager response: %s", strerror(errno)); return -1; @@ -103,7 +103,7 @@ static int relay_response_back(void) /* lookup the client to relay the msg to */ zserv = zserv_find_client(proto, instance); if (!zserv) { - zlog_ferr( + flog_err( ZEBRA_ERR_LM_NO_SUCH_CLIENT, "Error relaying LM response: can't find client %s, instance %u", proto_str, instance); @@ -119,7 +119,7 @@ static int relay_response_back(void) /* send response back */ ret = writen(zserv->sock, dst->data, stream_get_endp(dst)); if (ret <= 0) { - zlog_ferr(ZEBRA_ERR_LM_RELAY_FAILED, + flog_err(ZEBRA_ERR_LM_RELAY_FAILED, "Error relaying LM response to %s instance %u: %s", proto_str, instance, strerror(errno)); return -1; @@ -187,7 +187,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv, unsigned short instance; if (zclient->sock < 0) { - zlog_ferr(ZEBRA_ERR_LM_NO_SOCKET, + flog_err(ZEBRA_ERR_LM_NO_SOCKET, "Unable to relay LM request: no socket"); reply_error(cmd, zserv, vrf_id); return -1; @@ -216,7 +216,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv, /* check & set client instance if unset */ if (zserv->instance && zserv->instance != instance) { - zlog_ferr(ZEBRA_ERR_LM_BAD_INSTANCE, + flog_err(ZEBRA_ERR_LM_BAD_INSTANCE, "Client instance(%u) != msg instance(%u)", zserv->instance, instance); return -1; @@ -239,7 +239,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv, /* Send request to external label manager */ ret = writen(zclient->sock, dst->data, stream_get_endp(dst)); if (ret <= 0) { - zlog_ferr(ZEBRA_ERR_LM_RELAY_FAILED, + flog_err(ZEBRA_ERR_LM_RELAY_FAILED, "Error relaying LM request from %s instance %u: %s", proto_str, instance, strerror(errno)); reply_error(cmd, zserv, vrf_id); @@ -269,7 +269,7 @@ static int lm_zclient_connect(struct thread *t) return 0; if (zclient_socket_connect(zclient) < 0) { - zlog_ferr(ZEBRA_ERR_LM_CLIENT_CONNECTION_FAILED, + flog_err(ZEBRA_ERR_LM_CLIENT_CONNECTION_FAILED, "Error connecting synchronous zclient!"); thread_add_timer(zebrad.master, lm_zclient_connect, zclient, CONNECTION_DELAY, &zclient->t_connect); @@ -401,7 +401,7 @@ struct label_manager_chunk *assign_label_chunk(uint8_t proto, ->end + 1; if (lmc->start > MPLS_LABEL_UNRESERVED_MAX - size + 1) { - zlog_ferr(ZEBRA_ERR_LM_EXHAUSTED_LABELS, + flog_err(ZEBRA_ERR_LM_EXHAUSTED_LABELS, "Reached max labels. Start: %u, size: %u", lmc->start, size); XFREE(MTYPE_LM_CHUNK, lmc); @@ -441,7 +441,7 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start, if (lmc->end != end) continue; if (lmc->proto != proto || lmc->instance != instance) { - zlog_ferr(ZEBRA_ERR_LM_DAEMON_MISMATCH, + flog_err(ZEBRA_ERR_LM_DAEMON_MISMATCH, "%s: Daemon mismatch!!", __func__); continue; } @@ -452,7 +452,7 @@ int release_label_chunk(uint8_t proto, unsigned short instance, uint32_t start, break; } if (ret != 0) - zlog_ferr(ZEBRA_ERR_LM_UNRELEASED_CHUNK, + flog_err(ZEBRA_ERR_LM_UNRELEASED_CHUNK, "%s: Label chunk not released!!", __func__); return ret; |