*: fix printf extension types

Some mistakes have crept in again.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 9547de2869eed36e067183643e465f1cf8ad491c..c554332255df9f588b05b50db1d1cb5d02b988b9 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -2864,7 +2864,7 @@ static int bgp_zebra_process_local_macip(ZAPI_CALLBACK_ARGS)
 
        if (BGP_DEBUG(zebra, ZEBRA))
                zlog_debug(
-                       "%u:Recv MACIP %s f 0x%x MAC %pEA IP %pI4 VNI %u seq %u state %d ESI %s",
+                       "%u:Recv MACIP %s f 0x%x MAC %pEA IP %pIA VNI %u seq %u state %d ESI %s",
                        vrf_id, (cmd == ZEBRA_MACIP_ADD) ? "Add" : "Del", flags,
                        &mac, &ip, vni, seqnum, state,
                        esi_to_str(&esi, buf2, sizeof(buf2)));

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 8c0c85907d82ac9313a1185b7aaecb4813024a4c..7eee2546270c282a36bd53a5b3245b55757fc33d 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -574,8 +574,8 @@ int eigrp_read(struct thread *thread)
        if (eigrp_if_is_passive(ei)) {
                if (IS_DEBUG_EIGRP_TRANSMIT(0, RECV))
                        zlog_debug(
-                               "ignoring packet from router %pI4 sent to %pI4, received on a passive interface, %pI4",
-                               &eigrph->vrid, &iph->ip_dst,
+                               "ignoring packet from router %u sent to %pI4, received on a passive interface, %pI4",
+                               ntohs(eigrph->vrid), &iph->ip_dst,
                                &ei->address.u.prefix4);
 
                if (iph->ip_dst.s_addr == htonl(EIGRP_MULTICAST_ADDRESS)) {

diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index 6f6e2e1589c7e77c47c893a9e113057477160042..160f012d780a4ec54764f9997d6ea0fffff73b00 100644 (file)
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -116,7 +116,7 @@ void ospf6_hello_print(struct ospf6_header *oh)
        for (p = (char *)((caddr_t)hello + sizeof(struct ospf6_hello));
             p + sizeof(uint32_t) <= OSPF6_MESSAGE_END(oh);
             p += sizeof(uint32_t))
-               zlog_debug("    Neighbor: %pI4", p);
+               zlog_debug("    Neighbor: %pI4", (in_addr_t *)p);
 
        assert(p == OSPF6_MESSAGE_END(oh));
 }
@@ -1578,8 +1578,8 @@ int ospf6_receive(struct thread *thread)
                zlog_debug("%s received on %s",
                           lookup_msg(ospf6_message_type_str, oh->type, NULL),
                           oi->interface->name);
-               zlog_debug("    src: %pI4", &src);
-               zlog_debug("    dst: %pI4", &dst);
+               zlog_debug("    src: %pI6", &src);
+               zlog_debug("    dst: %pI6", &dst);
 
                switch (oh->type) {
                case OSPF6_MESSAGE_TYPE_HELLO:
@@ -1663,7 +1663,7 @@ static void ospf6_send(struct in6_addr *src, struct in6_addr *dst,
                           lookup_msg(ospf6_message_type_str, oh->type, NULL),
                           oi->interface->name);
                zlog_debug("    src: %s", srcname);
-               zlog_debug("    dst: %pI4", dst);
+               zlog_debug("    dst: %pI6", dst);
 
                switch (oh->type) {
                case OSPF6_MESSAGE_TYPE_HELLO:

diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c
index a562f3ce9299a95de537f290a672fd9c76154e43..5223fcf311a55b46588a1ce9d6e6e195957ffd31 100644 (file)
--- a/pimd/pim_igmp_mtrace.c
+++ b/pimd/pim_igmp_mtrace.c
@@ -82,7 +82,7 @@ static bool mtrace_fwd_info_weak(struct pim_instance *pim,
 
        if (PIM_DEBUG_MTRACE)
                zlog_debug("mtrace next_hop=%pI4",
-                          &nexthop.mrib_nexthop_addr.u.prefix);
+                          &nexthop.mrib_nexthop_addr.u.prefix4);
 
        if (nexthop.mrib_nexthop_addr.family == AF_INET)
                nh_addr = nexthop.mrib_nexthop_addr.u.prefix4;