Merge branch 'pr/3063'

[mirror_frr.git] / pimd / pim_zlookup.c

diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 12958b0390a983382f20f6b6930cd54d6b5cbc7b..6e703521043b823bd1d6c1eb5e143d024f04a8c8 100644 (file)
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -18,7 +18,6 @@
  */
 
 #include <zebra.h>
-#include "zebra/rib.h"
 
 #include "log.h"
 #include "prefix.h"
@@ -123,8 +122,8 @@ void zclient_lookup_new(void)
 {
        zlookup = zclient_new_notify(master, &zclient_options_default);
        if (!zlookup) {
-               zlog_ferr(LIB_ERR_ZAPI_SOCKET, "%s: zclient_new() failure",
-                         __PRETTY_FUNCTION__);
+               flog_err(EC_LIB_ZAPI_SOCKET, "%s: zclient_new() failure",
+                        __PRETTY_FUNCTION__);
                return;
        }
 
@@ -170,9 +169,9 @@ static int zclient_read_nexthop(struct pim_instance *pim,
                err = zclient_read_header(s, zlookup->sock, &length, &marker,
                                          &version, &vrf_id, &command);
                if (err < 0) {
-                       zlog_ferr(LIB_ERR_ZAPI_MISSMATCH,
-                                 "%s: zclient_read_header() failed",
-                                 __PRETTY_FUNCTION__);
+                       flog_err(EC_LIB_ZAPI_MISSMATCH,
+                                "%s: zclient_read_header() failed",
+                                __PRETTY_FUNCTION__);
                        zclient_lookup_failed(zlookup);
                        return -1;
                }
@@ -315,14 +314,15 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
 
        /* Check socket. */
        if (zlookup->sock < 0) {
-               zlog_err("%s: zclient lookup socket is not connected",
+               flog_err(EC_LIB_ZAPI_SOCKET,
+                        "%s: zclient lookup socket is not connected",
                         __PRETTY_FUNCTION__);
                zclient_lookup_failed(zlookup);
                return -1;
        }
 
        if (pim->vrf->vrf_id == VRF_UNKNOWN) {
-               zlog_err(
+               zlog_notice(
                        "%s: VRF: %s does not fully exist yet, delaying lookup",
                        __PRETTY_FUNCTION__, pim->vrf->name);
                return -1;
@@ -336,17 +336,17 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
 
        ret = writen(zlookup->sock, s->data, stream_get_endp(s));
        if (ret < 0) {
-               zlog_ferr(
-                       LIB_ERR_SOCKET,
+               flog_err(
+                       EC_LIB_SOCKET,
                        "%s: writen() failure: %d writing to zclient lookup socket",
                        __PRETTY_FUNCTION__, errno);
                zclient_lookup_failed(zlookup);
                return -2;
        }
        if (ret == 0) {
-               zlog_ferr(LIB_ERR_SOCKET,
-                         "%s: connection closed on zclient lookup socket",
-                         __PRETTY_FUNCTION__);
+               flog_err_sys(EC_LIB_SOCKET,
+                            "%s: connection closed on zclient lookup socket",
+                            __PRETTY_FUNCTION__);
                zclient_lookup_failed(zlookup);
                return -3;
        }
@@ -514,8 +514,8 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
        count = stream_get_endp(s);
        ret = writen(zlookup->sock, s->data, count);
        if (ret <= 0) {
-               zlog_ferr(
-                       LIB_ERR_SOCKET,
+               flog_err(
+                       EC_LIB_SOCKET,
                        "%s: writen() failure: %d writing to zclient lookup socket",
                        __PRETTY_FUNCTION__, errno);
                return -1;
@@ -534,9 +534,9 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
                err = zclient_read_header(s, zlookup->sock, &length, &marker,
                                          &version, &vrf_id, &command);
                if (err < 0) {
-                       zlog_ferr(LIB_ERR_ZAPI_MISSMATCH,
-                                 "%s: zclient_read_header() failed",
-                                 __PRETTY_FUNCTION__);
+                       flog_err(EC_LIB_ZAPI_MISSMATCH,
+                                "%s: zclient_read_header() failed",
+                                __PRETTY_FUNCTION__);
                        zclient_lookup_failed(zlookup);
                        return -1;
                }
@@ -551,8 +551,8 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
 
                        more.src = c_oil->oil.mfcc_origin;
                        more.grp = c_oil->oil.mfcc_mcastgrp;
-                       zlog_ferr(
-                               LIB_ERR_ZAPI_MISSMATCH,
+                       flog_err(
+                               EC_LIB_ZAPI_MISSMATCH,
                                "%s: Received wrong %s(%s) information requested",
                                __PRETTY_FUNCTION__, pim_str_sg_dump(&more),
                                c_oil->pim->vrf->name);