pim: fix compilation issue with pim

The change of vrf_id_t from 16 bit to 32 bit needs some changes in pim
daemon.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 1fccbaeafa3be332a308d95837ae03eb9bcf2e09..8da610a3a6d54e0650603e9a3e45fa05352fd5d6 100644 (file)
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -136,7 +136,7 @@ static int pim_vrf_new(struct vrf *vrf)
 {
        struct pim_instance *pim = pim_instance_init(vrf);
 
-       zlog_debug("VRF Created: %s(%d)", vrf->name, vrf->vrf_id);
+       zlog_debug("VRF Created: %s(%u)", vrf->name, vrf->vrf_id);
        if (pim == NULL) {
                zlog_err("%s %s: pim class init failure ", __FILE__,
                         __PRETTY_FUNCTION__);
@@ -159,7 +159,7 @@ static int pim_vrf_delete(struct vrf *vrf)
 {
        struct pim_instance *pim = vrf->info;
 
-       zlog_debug("VRF Deletion: %s(%d)", vrf->name, vrf->vrf_id);
+       zlog_debug("VRF Deletion: %s(%u)", vrf->name, vrf->vrf_id);
 
        pim_ssmpingd_destroy(pim);
        pim_instance_terminate(pim);

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index e2984e1d131233292657c09d6b521065de395699..089639c77e725126e25c7cfa8df24627a37ba5c9 100644 (file)
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -811,7 +811,7 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
                char buf[PREFIX2STR_BUFFER];
                prefix2str(&p, buf, sizeof(buf));
                zlog_debug(
-                       "%s: NHT Update for %s(%s) num_nh %d num_pim_nh %d vrf:%d up %ld rp %d",
+                       "%s: NHT Update for %s(%s) num_nh %d num_pim_nh %d vrf:%u up %ld rp %d",
                        __PRETTY_FUNCTION__, buf, pim->vrf->name, nexthop_num,
                        pnc->nexthop_num, vrf_id, pnc->upstream_hash->count,
                        listcount(pnc->rp_list));

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 689e9a744987341ad4a968c073b9c4aeec4218f4..6e825587664553664dea2d3dab4463b8b28e9762 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -80,7 +80,7 @@ static int pim_zebra_if_add(int command, struct zclient *zclient,
 
        if (PIM_DEBUG_ZEBRA) {
                zlog_debug(
-                       "%s: %s index %d(%d) flags %ld metric %d mtu %d operative %d",
+                       "%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
                        __PRETTY_FUNCTION__, ifp->name, ifp->ifindex, vrf_id,
                        (long)ifp->flags, ifp->metric, ifp->mtu,
                        if_is_operative(ifp));
@@ -130,7 +130,7 @@ static int pim_zebra_if_del(int command, struct zclient *zclient,
 
        if (PIM_DEBUG_ZEBRA) {
                zlog_debug(
-                       "%s: %s index %d(%d) flags %ld metric %d mtu %d operative %d",
+                       "%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
                        __PRETTY_FUNCTION__, ifp->name, ifp->ifindex, vrf_id,
                        (long)ifp->flags, ifp->metric, ifp->mtu,
                        if_is_operative(ifp));
@@ -158,7 +158,7 @@ static int pim_zebra_if_state_up(int command, struct zclient *zclient,
 
        if (PIM_DEBUG_ZEBRA) {
                zlog_debug(
-                       "%s: %s index %d(%d) flags %ld metric %d mtu %d operative %d",
+                       "%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
                        __PRETTY_FUNCTION__, ifp->name, ifp->ifindex, vrf_id,
                        (long)ifp->flags, ifp->metric, ifp->mtu,
                        if_is_operative(ifp));
@@ -213,7 +213,7 @@ static int pim_zebra_if_state_down(int command, struct zclient *zclient,
 
        if (PIM_DEBUG_ZEBRA) {
                zlog_debug(
-                       "%s: %s index %d(%d) flags %ld metric %d mtu %d operative %d",
+                       "%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
                        __PRETTY_FUNCTION__, ifp->name, ifp->ifindex, vrf_id,
                        (long)ifp->flags, ifp->metric, ifp->mtu,
                        if_is_operative(ifp));
@@ -293,7 +293,7 @@ static int pim_zebra_if_address_add(int command, struct zclient *zclient,
        if (PIM_DEBUG_ZEBRA) {
                char buf[BUFSIZ];
                prefix2str(p, buf, BUFSIZ);
-               zlog_debug("%s: %s(%d) connected IP address %s flags %u %s",
+               zlog_debug("%s: %s(%u) connected IP address %s flags %u %s",
                           __PRETTY_FUNCTION__, c->ifp->name, vrf_id, buf,
                           c->flags, CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)
                                             ? "secondary"
@@ -372,7 +372,7 @@ static int pim_zebra_if_address_del(int command, struct zclient *client,
                        char buf[BUFSIZ];
                        prefix2str(p, buf, BUFSIZ);
                        zlog_debug(
-                               "%s: %s(%d) disconnected IP address %s flags %u %s",
+                               "%s: %s(%u) disconnected IP address %s flags %u %s",
                                __PRETTY_FUNCTION__, c->ifp->name, vrf_id, buf,
                                c->flags,
                                CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)