lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: replace uses of NIP6_FMT with %p6

Browse Source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harvey Harrison
2008-10-28 16:09:23 -07:00
committed by David S. Miller
parent 38ff4fa49b
commit 0c6ce78abf
17 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sunrpc/svc_xprt.h
View File

@@ -145,8 +145,8 @@ static inline char *__svc_print_addr(struct sockaddr *addr,
break; break;
case AF_INET6: case AF_INET6:
snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u", snprintf(buf, len, "%p6, port=%u",
NIP6(((struct sockaddr_in6 *) addr)->sin6_addr), &((struct sockaddr_in6 *)addr)->sin6_addr,
ntohs(((struct sockaddr_in6 *) addr)->sin6_port)); ntohs(((struct sockaddr_in6 *) addr)->sin6_port));
break; break;

4
include/net/ip_vs.h
View File

@@ -87,8 +87,8 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
int len; int len;
#ifdef CONFIG_IP_VS_IPV6 #ifdef CONFIG_IP_VS_IPV6
if (af == AF_INET6) if (af == AF_INET6)
len = snprintf(&buf[*idx], buf_len - *idx, "[" NIP6_FMT "]", len = snprintf(&buf[*idx], buf_len - *idx, "[%p6]",
NIP6(addr->in6)) + 1; &addr->in6) + 1;
else else
#endif #endif
len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT, len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT,

6
include/net/netfilter/nf_conntrack_tuple.h
View File

@@ -122,10 +122,10 @@ static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
static inline void nf_ct_dump_tuple_ipv6(const struct nf_conntrack_tuple *t) static inline void nf_ct_dump_tuple_ipv6(const struct nf_conntrack_tuple *t)
{ {
#ifdef DEBUG #ifdef DEBUG
printk("tuple %p: %u " NIP6_FMT " %hu -> " NIP6_FMT " %hu\n", printk("tuple %p: %u %p6 %hu -> %p6 %hu\n",
t, t->dst.protonum, t, t->dst.protonum,
NIP6(*(struct in6_addr *)t->src.u3.all), ntohs(t->src.u.all), t->src.u3.all, ntohs(t->src.u.all),
NIP6(*(struct in6_addr *)t->dst.u3.all), ntohs(t->dst.u.all)); t->dst.u3.all, ntohs(t->dst.u.all));
#endif #endif
} }

4
include/net/sctp/sctp.h
View File

@@ -285,9 +285,9 @@ extern int sctp_debug_flag;
if (sctp_debug_flag) { \ if (sctp_debug_flag) { \
if (saddr->sa.sa_family == AF_INET6) { \ if (saddr->sa.sa_family == AF_INET6) { \
printk(KERN_DEBUG \ printk(KERN_DEBUG \
lead NIP6_FMT trail, \ lead "%p6" trail, \
leadparm, \ leadparm, \
NIP6(saddr->v6.sin6_addr), \ &saddr->v6.sin6_addr, \
otherparms); \ otherparms); \
} else { \ } else { \
printk(KERN_DEBUG \ printk(KERN_DEBUG \

4
net/ipv4/tcp_input.c
View File

@@ -2346,9 +2346,9 @@ static void DBGUNDO(struct sock *sk, const char *msg)
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
else if (sk->sk_family == AF_INET6) { else if (sk->sk_family == AF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
printk(KERN_DEBUG "Undo %s " NIP6_FMT "/%u c%u l%u ss%u/%u p%u\n", printk(KERN_DEBUG "Undo %s %p6/%u c%u l%u ss%u/%u p%u\n",
msg, msg,
NIP6(np->daddr), ntohs(inet->dport), &np->daddr, ntohs(inet->dport),
tp->snd_cwnd, tcp_left_out(tp), tp->snd_cwnd, tcp_left_out(tp),
tp->snd_ssthresh, tp->prior_ssthresh, tp->snd_ssthresh, tp->prior_ssthresh,
tp->packets_out); tp->packets_out);

4
net/ipv4/tcp_timer.c
View File

@@ -306,8 +306,8 @@ static void tcp_retransmit_timer(struct sock *sk)
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
else if (sk->sk_family == AF_INET6) { else if (sk->sk_family == AF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer " NIP6_FMT ":%u/%u shrinks window %u:%u. Repaired.\n", LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer %p6:%u/%u shrinks window %u:%u. Repaired.\n",
NIP6(np->daddr), ntohs(inet->dport), &np->daddr, ntohs(inet->dport),
inet->num, tp->snd_una, tp->snd_nxt); inet->num, tp->snd_una, tp->snd_nxt);
} }
#endif #endif

34
net/ipv6/addrlabel.c
View File

@@ -186,10 +186,8 @@ u32 ipv6_addr_label(struct net *net,
label = p ? p->label : IPV6_ADDR_LABEL_DEFAULT; label = p ? p->label : IPV6_ADDR_LABEL_DEFAULT;
rcu_read_unlock(); rcu_read_unlock();
ADDRLABEL(KERN_DEBUG "%s(addr=" NIP6_FMT ", type=%d, ifindex=%d) => %08x\n", ADDRLABEL(KERN_DEBUG "%s(addr=%p6, type=%d, ifindex=%d) => %08x\n",
__func__, __func__, addr, type, ifindex, label);
NIP6(*addr), type, ifindex,
label);
return label; return label;
} }
@@ -203,11 +201,8 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
struct ip6addrlbl_entry *newp; struct ip6addrlbl_entry *newp;
int addrtype; int addrtype;
ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d, label=%u)\n", ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d, label=%u)\n",
__func__, __func__, prefix, prefixlen, ifindex, (unsigned int)label);
NIP6(*prefix), prefixlen,
ifindex,
(unsigned int)label);
addrtype = ipv6_addr_type(prefix) & (IPV6_ADDR_MAPPED | IPV6_ADDR_COMPATv4 | IPV6_ADDR_LOOPBACK); addrtype = ipv6_addr_type(prefix) & (IPV6_ADDR_MAPPED | IPV6_ADDR_COMPATv4 | IPV6_ADDR_LOOPBACK);
@@ -294,12 +289,9 @@ static int ip6addrlbl_add(struct net *net,
struct ip6addrlbl_entry *newp; struct ip6addrlbl_entry *newp;
int ret = 0; int ret = 0;
ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n", ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n",
__func__, __func__, prefix, prefixlen, ifindex, (unsigned int)label,
NIP6(*prefix), prefixlen, replace);
ifindex,
(unsigned int)label,
replace);
newp = ip6addrlbl_alloc(net, prefix, prefixlen, ifindex, label); newp = ip6addrlbl_alloc(net, prefix, prefixlen, ifindex, label);
if (IS_ERR(newp)) if (IS_ERR(newp))
@@ -321,10 +313,8 @@ static int __ip6addrlbl_del(struct net *net,
struct hlist_node *pos, *n; struct hlist_node *pos, *n;
int ret = -ESRCH; int ret = -ESRCH;
ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d)\n", ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d)\n",
__func__, __func__, prefix, prefixlen, ifindex);
NIP6(*prefix), prefixlen,
ifindex);
hlist_for_each_entry_safe(p, pos, n, &ip6addrlbl_table.head, list) { hlist_for_each_entry_safe(p, pos, n, &ip6addrlbl_table.head, list) {
if (p->prefixlen == prefixlen && if (p->prefixlen == prefixlen &&
@@ -347,10 +337,8 @@ static int ip6addrlbl_del(struct net *net,
struct in6_addr prefix_buf; struct in6_addr prefix_buf;
int ret; int ret;
ADDRLABEL(KERN_DEBUG "%s(prefix=" NIP6_FMT ", prefixlen=%d, ifindex=%d)\n", ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d)\n",
__func__, __func__, prefix, prefixlen, ifindex);
NIP6(*prefix), prefixlen,
ifindex);
ipv6_addr_prefix(&prefix_buf, prefix, prefixlen); ipv6_addr_prefix(&prefix_buf, prefix, prefixlen);
spin_lock(&ip6addrlbl_table.lock); spin_lock(&ip6addrlbl_table.lock);

4
net/ipv6/ah6.c
View File

@@ -419,8 +419,8 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
if (!x) if (!x)
return; return;
NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/" NIP6_FMT "\n", NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/%p6\n",
ntohl(ah->spi), NIP6(iph->daddr)); ntohl(ah->spi), &iph->daddr);
xfrm_state_put(x); xfrm_state_put(x);
} }

4
net/ipv6/esp6.c
View File

@@ -367,8 +367,8 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6); x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
if (!x) if (!x)
return; return;
printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/" NIP6_FMT "\n", printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%p6\n",
ntohl(esph->spi), NIP6(iph->daddr)); ntohl(esph->spi), &iph->daddr);
xfrm_state_put(x); xfrm_state_put(x);
} }

2
net/ipv6/exthdrs.c
View File

@@ -219,7 +219,7 @@ static int ipv6_dest_hao(struct sk_buff *skb, int optoff)
if (!(ipv6_addr_type(&hao->addr) & IPV6_ADDR_UNICAST)) { if (!(ipv6_addr_type(&hao->addr) & IPV6_ADDR_UNICAST)) {
LIMIT_NETDEBUG( LIMIT_NETDEBUG(
KERN_DEBUG "hao is not an unicast addr: " NIP6_FMT "\n", NIP6(hao->addr)); KERN_DEBUG "hao is not an unicast addr: %p6\n", &hao->addr);
goto discard; goto discard;
} }

4
net/ipv6/icmp.c
View File

@@ -681,8 +681,8 @@ static int icmpv6_rcv(struct sk_buff *skb)
skb->csum = ~csum_unfold(csum_ipv6_magic(saddr, daddr, skb->len, skb->csum = ~csum_unfold(csum_ipv6_magic(saddr, daddr, skb->len,
IPPROTO_ICMPV6, 0)); IPPROTO_ICMPV6, 0));
if (__skb_checksum_complete(skb)) { if (__skb_checksum_complete(skb)) {
LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [" NIP6_FMT " > " NIP6_FMT "]\n", LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [%p6 > %p6]\n",
NIP6(*saddr), NIP6(*daddr)); saddr, daddr);
goto discard_it; goto discard_it;
} }
} }

5
net/ipv6/ip6mr.c
View File

@@ -297,9 +297,8 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
const struct mfc6_cache *mfc = v; const struct mfc6_cache *mfc = v;
const struct ipmr_mfc_iter *it = seq->private; const struct ipmr_mfc_iter *it = seq->private;
seq_printf(seq, seq_printf(seq, "%p6 %p6 %-3d %8ld %8ld %8ld",
NIP6_FMT " " NIP6_FMT " %-3d %8ld %8ld %8ld", &mfc->mf6c_mcastgrp, &mfc->mf6c_origin,
NIP6(mfc->mf6c_mcastgrp), NIP6(mfc->mf6c_origin),
mfc->mf6c_parent, mfc->mf6c_parent,
mfc->mfc_un.res.pkt, mfc->mfc_un.res.pkt,
mfc->mfc_un.res.bytes, mfc->mfc_un.res.bytes,

4
net/ipv6/ipcomp6.c
View File

@@ -67,8 +67,8 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
if (!x) if (!x)
return; return;
printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/" NIP6_FMT "\n", printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%p6\n",
spi, NIP6(iph->daddr)); spi, &iph->daddr);
xfrm_state_put(x); xfrm_state_put(x);
} }

7
net/ipv6/ndisc.c
View File

@@ -647,11 +647,8 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
if ((probes -= neigh->parms->ucast_probes) < 0) { if ((probes -= neigh->parms->ucast_probes) < 0) {
if (!(neigh->nud_state & NUD_VALID)) { if (!(neigh->nud_state & NUD_VALID)) {
ND_PRINTK1(KERN_DEBUG ND_PRINTK1(KERN_DEBUG "%s(): trying to ucast probe in NUD_INVALID: %p6\n",
"%s(): trying to ucast probe in NUD_INVALID: " __func__, target);
NIP6_FMT "\n",
__func__,
NIP6(*target));
} }
ndisc_send_ns(dev, neigh, target, target, saddr); ndisc_send_ns(dev, neigh, target, target, saddr);
} else if ((probes -= neigh->parms->app_probes) < 0) { } else if ((probes -= neigh->parms->app_probes) < 0) {

2
net/ipv6/netfilter/ip6t_LOG.c
View File

@@ -61,7 +61,7 @@ static void dump_packet(const struct nf_loginfo *info,
} }
/* Max length: 88 "SRC=0000.0000.0000.0000.0000.0000.0000.0000 DST=0000.0000.0000.0000.0000.0000.0000.0000 " */ /* Max length: 88 "SRC=0000.0000.0000.0000.0000.0000.0000.0000 DST=0000.0000.0000.0000.0000.0000.0000.0000 " */
printk("SRC=" NIP6_FMT " DST=" NIP6_FMT " ", NIP6(ih->saddr), NIP6(ih->daddr)); printk("SRC=%p6 DST=%p6 ", &ih->saddr, &ih->daddr);
/* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */ /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
printk("LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ", printk("LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",

5
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View File

@@ -56,9 +56,8 @@ static bool ipv6_invert_tuple(struct nf_conntrack_tuple *tuple,
static int ipv6_print_tuple(struct seq_file *s, static int ipv6_print_tuple(struct seq_file *s,
const struct nf_conntrack_tuple *tuple) const struct nf_conntrack_tuple *tuple)
{ {
return seq_printf(s, "src=" NIP6_FMT " dst=" NIP6_FMT " ", return seq_printf(s, "src=%p6 dst=%p6 ",
NIP6(*((struct in6_addr *)tuple->src.u3.ip6)), tuple->src.u3.ip6, tuple->dst.u3.ip6);
NIP6(*((struct in6_addr *)tuple->dst.u3.ip6)));
} }
/* /*

8
net/ipv6/tcp_ipv6.c
View File

@@ -872,12 +872,10 @@ static int tcp_v6_inbound_md5_hash (struct sock *sk, struct sk_buff *skb)
if (genhash || memcmp(hash_location, newhash, 16) != 0) { if (genhash || memcmp(hash_location, newhash, 16) != 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_INFO "MD5 Hash %s for " printk(KERN_INFO "MD5 Hash %s for (%p6, %u)->(%p6, %u)\n",
"(" NIP6_FMT ", %u)->"
"(" NIP6_FMT ", %u)\n",
genhash ? "failed" : "mismatch", genhash ? "failed" : "mismatch",
NIP6(ip6h->saddr), ntohs(th->source), &ip6h->saddr, ntohs(th->source),
NIP6(ip6h->daddr), ntohs(th->dest)); &ip6h->daddr, ntohs(th->dest));
} }
return 1; return 1;
} }