From 9237091adb012636ada8d7c161ba4966eec24ed7 Mon Sep 17 00:00:00 2001 From: Fredi Raspall Date: Tue, 1 May 2018 20:43:14 +0200 Subject: [PATCH] zebra, lib: Fix SA warning and formatting. Signed-off-by: Fredi Raspall --- lib/zclient.c | 38 +++++++++++++++++--------------------- zebra/label_manager.c | 17 ++++++++--------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/lib/zclient.c b/lib/zclient.c index 388c5a0b0d..e77d5fe7c7 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2059,7 +2059,7 @@ int lm_label_manager_connect(struct zclient *zclient) uint8_t result; if (zclient_debug) - zlog_debug("Connecting to Label Manager"); + zlog_debug("Connecting to Label Manager (LM)"); if (zclient->sock < 0) return -1; @@ -2079,20 +2079,19 @@ int lm_label_manager_connect(struct zclient *zclient) ret = writen(zclient->sock, s->data, stream_get_endp(s)); if (ret < 0) { - zlog_err("%s: can't write to zclient->sock", __func__); + zlog_err("Can't write to zclient sock"); close(zclient->sock); zclient->sock = -1; return -1; } if (ret == 0) { - zlog_err("%s: zclient->sock connection closed", __func__); + zlog_err("Zclient sock closed"); close(zclient->sock); zclient->sock = -1; return -1; } if (zclient_debug) - zlog_debug("%s: Label manager connect request (%d bytes) sent", - __func__, ret); + zlog_debug("LM connect request sent (%d bytes)", ret); /* read response */ if (zclient_read_sync_response(zclient, ZEBRA_LABEL_MANAGER_CONNECT) @@ -2107,18 +2106,17 @@ int lm_label_manager_connect(struct zclient *zclient) /* sanity */ if (proto != zclient->redist_default) - zlog_err("Wrong proto (%u) in lm_connect response. Should be %u", + zlog_err("Wrong proto (%u) in LM connect response. Should be %u", proto, zclient->redist_default); if (instance != zclient->instance) - zlog_err("Wrong instId (%u) in lm_connect response Should be %u", + zlog_err("Wrong instId (%u) in LM connect response. Should be %u", instance, zclient->instance); /* result code */ result = stream_getc(s); if (zclient_debug) zlog_debug( - "%s: Label Manager connect response received, result %u", - __func__, result); + "LM connect-response received, result %u", result); return (int)result; } @@ -2204,20 +2202,19 @@ int lm_get_label_chunk(struct zclient *zclient, uint8_t keep, ret = writen(zclient->sock, s->data, stream_get_endp(s)); if (ret < 0) { - zlog_err("%s: can't write to zclient->sock", __func__); + zlog_err("Can't write to zclient sock"); close(zclient->sock); zclient->sock = -1; return -1; } if (ret == 0) { - zlog_err("%s: zclient->sock connection closed", __func__); + zlog_err("Zclient sock closed"); close(zclient->sock); zclient->sock = -1; return -1; } if (zclient_debug) - zlog_debug("%s: Label chunk request (%d bytes) sent", __func__, - ret); + zlog_debug("Label chunk request (%d bytes) sent", ret); /* read response */ if (zclient_read_sync_response(zclient, ZEBRA_GET_LABEL_CHUNK) != 0) @@ -2247,19 +2244,18 @@ int lm_get_label_chunk(struct zclient *zclient, uint8_t keep, /* not owning this response */ if (keep != response_keep) { zlog_err( - "%s: Invalid Label chunk: %u - %u, keeps mismatch %u != %u", - __func__, *start, *end, keep, response_keep); + "Invalid Label chunk: %u - %u, keeps mismatch %u != %u", + *start, *end, keep, response_keep); } /* sanity */ if (*start > *end || *start < MPLS_LABEL_UNRESERVED_MIN || *end > MPLS_LABEL_UNRESERVED_MAX) { - zlog_err("%s: Invalid Label chunk: %u - %u", __func__, *start, - *end); + zlog_err("Invalid Label chunk: %u - %u", *start, *end); return -1; } if (zclient_debug) - zlog_debug("Label Chunk assign: %u - %u (%u) ", *start, *end, + zlog_debug("Label Chunk assign: %u - %u (%u)", *start, *end, response_keep); return 0; @@ -2280,7 +2276,7 @@ int lm_release_label_chunk(struct zclient *zclient, uint32_t start, struct stream *s; if (zclient_debug) - zlog_debug("Releasing Label Chunk"); + zlog_debug("Releasing Label Chunk %u - %u", start, end); if (zclient->sock < 0) return -1; @@ -2304,13 +2300,13 @@ int lm_release_label_chunk(struct zclient *zclient, uint32_t start, ret = writen(zclient->sock, s->data, stream_get_endp(s)); if (ret < 0) { - zlog_err("%s: can't write to zclient->sock", __func__); + zlog_err("Can't write to zclient sock"); close(zclient->sock); zclient->sock = -1; return -1; } if (ret == 0) { - zlog_err("%s: zclient->sock connection closed", __func__); + zlog_err("Zclient sock connection closed"); close(zclient->sock); zclient->sock = -1; return -1; diff --git a/zebra/label_manager.c b/zebra/label_manager.c index 1e69423dc9..230662df7a 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -75,7 +75,6 @@ static int relay_response_back(void) /* input buffer with msg from label manager */ src = zclient->ibuf; - dst = obuf; stream_reset(src); @@ -102,11 +101,11 @@ static int relay_response_back(void) /* lookup the client to relay the msg to */ zserv = zebra_find_client(proto, instance); if (!zserv) { - zlog_err("Error sending LM response back: can't find client with proto %s, instance %u", + zlog_err("Error relaying LM response: can't find client %s, instance %u", proto_str, instance); return -1; } - zlog_debug("Found client to relay LM msg to: %s instance %u", + zlog_debug("Found client to relay LM response to client %s instance %u", proto_str, instance); /* copy msg into output buffer */ @@ -116,11 +115,11 @@ static int relay_response_back(void) /* send response back */ ret = writen(zserv->sock, dst->data, stream_get_endp(dst)); if (ret <= 0) { - zlog_err("Error relaying Label Manager response to %s instance %u: %s", + zlog_err("Error relaying LM response to %s instance %u: %s", proto_str, instance, strerror(errno)); return -1; } - zlog_debug("Relayed Label Manager response (%d bytes) to %s instance %u", + zlog_debug("Relayed LM response (%d bytes) to %s instance %u", ret, proto_str, instance); return 0; @@ -183,7 +182,7 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv, unsigned short instance; if (zclient->sock < 0) { - zlog_err("Unable to relay label manager request: no socket"); + zlog_err("Unable to relay LM request: no socket"); reply_error(cmd, zserv, vrf_id); return -1; } @@ -233,12 +232,12 @@ 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_err("Error relaying label manager request from %s instance %u: %s", + zlog_err("Error relaying LM request from %s instance %u: %s", proto_str, instance, strerror(errno)); reply_error(cmd, zserv, vrf_id); return -1; } - zlog_debug("Relayed Label manager request (%d bytes) from %s instance %u", + zlog_debug("Relayed LM request (%d bytes) from %s instance %u", ret, proto_str, instance); @@ -337,7 +336,7 @@ void label_manager_init(char *lm_zserv_path) { /* this is an actual label manager */ if (!lm_zserv_path) { - zlog_debug("Initializing own label manager"); + zlog_debug("Initializing internal label manager"); lm_is_external = false; lbl_mgr.lc_list = list_new(); lbl_mgr.lc_list->del = delete_label_chunk; -- 2.39.5