netfilter: xt_osf: change %pi4 to %pI4

commit 8a27f7c90ffcb791eed7574922b51fb60b08fc89
changed the output style of %pi4 to use fixed
width leading zero IP addresses "001.002.003.004".

It's useful when printing multiple lines of
addresses, but was a change in output style for
some existing uses.

Using %pI4 restores the previous output style.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/net/netfilter/xt_osf.c b/net/netfilter/xt_osf.c
index 4d1a41b..4169e20 100644 (file)
--- a/net/netfilter/xt_osf.c
+++ b/net/netfilter/xt_osf.c
@@ -334,7 +334,7 @@ static bool xt_osf_match_packet(const struct sk_buff *skb,
                        if (info->flags & XT_OSF_LOG)
                                nf_log_packet(p->family, p->hooknum, skb,
                                        p->in, p->out, NULL,
                        if (info->flags & XT_OSF_LOG)
                                nf_log_packet(p->family, p->hooknum, skb,
                                        p->in, p->out, NULL,

-                                       "%s [%s:%s] : %pi4:%d -> %pi4:%d hops=%d\n",
+                                       "%s [%s:%s] : %pI4:%d -> %pI4:%d hops=%d\n",

                                        f->genre, f->version, f->subtype,
                                        &ip->saddr, ntohs(tcp->source),
                                        &ip->daddr, ntohs(tcp->dest),
                                        f->genre, f->version, f->subtype,
                                        &ip->saddr, ntohs(tcp->source),
                                        &ip->daddr, ntohs(tcp->dest),


@@ -349,7 +349,7 @@ static bool xt_osf_match_packet(const struct sk_buff *skb,
 
        if (!fcount && (info->flags & XT_OSF_LOG))
                nf_log_packet(p->family, p->hooknum, skb, p->in, p->out, NULL,
 
        if (!fcount && (info->flags & XT_OSF_LOG))
                nf_log_packet(p->family, p->hooknum, skb, p->in, p->out, NULL,

-                       "Remote OS is not known: %pi4:%u -> %pi4:%u\n",
+                       "Remote OS is not known: %pI4:%u -> %pI4:%u\n",

                                &ip->saddr, ntohs(tcp->source),
                                &ip->daddr, ntohs(tcp->dest));
 
                                &ip->saddr, ntohs(tcp->source),
                                &ip->daddr, ntohs(tcp->dest));