AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

netfilter: 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:08:13 -07:00 committed by David S. Miller
parent 1afa67f5e7
commit 38ff4fa49b
10 changed files with 45 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/netfilter/ipvs/ip_vs_conn.c
View File

@ -820,13 +820,11 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v)
#ifdef CONFIG_IP_VS_IPV6 #ifdef CONFIG_IP_VS_IPV6
if (cp->af == AF_INET6) if (cp->af == AF_INET6)
seq_printf(seq, seq_printf(seq, "%-3s %p6 %04X %p6 %04X %p6 %04X %-11s %7lu\n",
"%-3s " NIP6_FMT " %04X " NIP6_FMT
" %04X " NIP6_FMT " %04X %-11s %7lu\n",
ip_vs_proto_name(cp->protocol), ip_vs_proto_name(cp->protocol),
NIP6(cp->caddr.in6), ntohs(cp->cport), &cp->caddr.in6, ntohs(cp->cport),
NIP6(cp->vaddr.in6), ntohs(cp->vport), &cp->vaddr.in6, ntohs(cp->vport),
NIP6(cp->daddr.in6), ntohs(cp->dport), &cp->daddr.in6, ntohs(cp->dport),
ip_vs_state_name(cp->protocol, cp->state), ip_vs_state_name(cp->protocol, cp->state),
(cp->timer.expires-jiffies)/HZ); (cp->timer.expires-jiffies)/HZ);
else else
@ -883,13 +881,11 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v)
#ifdef CONFIG_IP_VS_IPV6 #ifdef CONFIG_IP_VS_IPV6
if (cp->af == AF_INET6) if (cp->af == AF_INET6)
seq_printf(seq, seq_printf(seq, "%-3s %p6 %04X %p6 %04X %p6 %04X %-11s %-6s %7lu\n",
"%-3s " NIP6_FMT " %04X " NIP6_FMT
" %04X " NIP6_FMT " %04X %-11s %-6s %7lu\n",
ip_vs_proto_name(cp->protocol), ip_vs_proto_name(cp->protocol),
NIP6(cp->caddr.in6), ntohs(cp->cport), &cp->caddr.in6, ntohs(cp->cport),
NIP6(cp->vaddr.in6), ntohs(cp->vport), &cp->vaddr.in6, ntohs(cp->vport),
NIP6(cp->daddr.in6), ntohs(cp->dport), &cp->daddr.in6, ntohs(cp->dport),
ip_vs_state_name(cp->protocol, cp->state), ip_vs_state_name(cp->protocol, cp->state),
ip_vs_origin_name(cp->flags), ip_vs_origin_name(cp->flags),
(cp->timer.expires-jiffies)/HZ); (cp->timer.expires-jiffies)/HZ);

8
net/netfilter/ipvs/ip_vs_core.c
View File

@ -805,9 +805,9 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related)
if (ic == NULL) if (ic == NULL)
return NF_DROP; return NF_DROP;
IP_VS_DBG(12, "Outgoing ICMPv6 (%d,%d) " NIP6_FMT "->" NIP6_FMT "\n", IP_VS_DBG(12, "Outgoing ICMPv6 (%d,%d) %p6->%p6\n",
ic->icmp6_type, ntohs(icmpv6_id(ic)), ic->icmp6_type, ntohs(icmpv6_id(ic)),
NIP6(iph->saddr), NIP6(iph->daddr)); &iph->saddr, &iph->daddr);
/* /*
* Work through seeing if this is for us. * Work through seeing if this is for us.
@ -1175,9 +1175,9 @@ ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum)
if (ic == NULL) if (ic == NULL)
return NF_DROP; return NF_DROP;
IP_VS_DBG(12, "Incoming ICMPv6 (%d,%d) " NIP6_FMT "->" NIP6_FMT "\n", IP_VS_DBG(12, "Incoming ICMPv6 (%d,%d) %p6->%p6\n",
ic->icmp6_type, ntohs(icmpv6_id(ic)), ic->icmp6_type, ntohs(icmpv6_id(ic)),
NIP6(iph->saddr), NIP6(iph->daddr)); &iph->saddr, &iph->daddr);
/* /*
* Work through seeing if this is for us. * Work through seeing if this is for us.

8
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -1867,9 +1867,9 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
if (iter->table == ip_vs_svc_table) { if (iter->table == ip_vs_svc_table) {
#ifdef CONFIG_IP_VS_IPV6 #ifdef CONFIG_IP_VS_IPV6
if (svc->af == AF_INET6) if (svc->af == AF_INET6)
seq_printf(seq, "%s [" NIP6_FMT "]:%04X %s ", seq_printf(seq, "%s [%p6]:%04X %s ",
ip_vs_proto_name(svc->protocol), ip_vs_proto_name(svc->protocol),
NIP6(svc->addr.in6), &svc->addr.in6,
ntohs(svc->port), ntohs(svc->port),
svc->scheduler->name); svc->scheduler->name);
else else
@ -1895,9 +1895,9 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
#ifdef CONFIG_IP_VS_IPV6 #ifdef CONFIG_IP_VS_IPV6
if (dest->af == AF_INET6) if (dest->af == AF_INET6)
seq_printf(seq, seq_printf(seq,
" -> [" NIP6_FMT "]:%04X" " -> [%p6]:%04X"
" %-7s %-6d %-10d %-10d\n", " %-7s %-6d %-10d %-10d\n",
NIP6(dest->addr.in6), &dest->addr.in6,
ntohs(dest->port), ntohs(dest->port),
ip_vs_fwd_name(atomic_read(&dest->conn_flags)), ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
atomic_read(&dest->weight), atomic_read(&dest->weight),

19
net/netfilter/ipvs/ip_vs_proto.c
View File

@ -203,26 +203,21 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp,
if (ih == NULL) if (ih == NULL)
sprintf(buf, "%s TRUNCATED", pp->name); sprintf(buf, "%s TRUNCATED", pp->name);
else if (ih->nexthdr == IPPROTO_FRAGMENT) else if (ih->nexthdr == IPPROTO_FRAGMENT)
sprintf(buf, "%s " NIP6_FMT "->" NIP6_FMT " frag", sprintf(buf, "%s %p6->%p6 frag",
pp->name, NIP6(ih->saddr), pp->name, &ih->saddr, &ih->daddr);
NIP6(ih->daddr));
else { else {
__be16 _ports[2], *pptr; __be16 _ports[2], *pptr;
pptr = skb_header_pointer(skb, offset + sizeof(struct ipv6hdr), pptr = skb_header_pointer(skb, offset + sizeof(struct ipv6hdr),
sizeof(_ports), _ports); sizeof(_ports), _ports);
if (pptr == NULL) if (pptr == NULL)
sprintf(buf, "%s TRUNCATED " NIP6_FMT "->" NIP6_FMT, sprintf(buf, "%s TRUNCATED %p6->%p6",
pp->name, pp->name, &ih->saddr, &ih->daddr);
NIP6(ih->saddr),
NIP6(ih->daddr));
else else
sprintf(buf, "%s " NIP6_FMT ":%u->" NIP6_FMT ":%u", sprintf(buf, "%s %p6:%u->%p6:%u",
pp->name, pp->name,
NIP6(ih->saddr), &ih->saddr, ntohs(pptr[0]),
ntohs(pptr[0]), &ih->daddr, ntohs(pptr[1]));
NIP6(ih->daddr),
ntohs(pptr[1]));
} }
printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);

5
net/netfilter/ipvs/ip_vs_proto_ah_esp.c
View File

@ -154,9 +154,8 @@ ah_esp_debug_packet_v6(struct ip_vs_protocol *pp, const struct sk_buff *skb,
if (ih == NULL) if (ih == NULL)
sprintf(buf, "%s TRUNCATED", pp->name); sprintf(buf, "%s TRUNCATED", pp->name);
else else
sprintf(buf, "%s " NIP6_FMT "->" NIP6_FMT, sprintf(buf, "%s %p6->%p6",
pp->name, NIP6(ih->saddr), pp->name, &ih->saddr, &ih->daddr);
NIP6(ih->daddr));
printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
} }

17
net/netfilter/ipvs/ip_vs_xmit.c
View File

@ -141,14 +141,13 @@ __ip_vs_get_out_rt_v6(struct ip_vs_conn *cp)
NULL, &fl); NULL, &fl);
if (!rt) { if (!rt) {
spin_unlock(&dest->dst_lock); spin_unlock(&dest->dst_lock);
IP_VS_DBG_RL("ip6_route_output error, " IP_VS_DBG_RL("ip6_route_output error, dest: %p6\n",
"dest: " NIP6_FMT "\n", &dest->addr.in6);
NIP6(dest->addr.in6));
return NULL; return NULL;
} }
__ip_vs_dst_set(dest, 0, dst_clone(&rt->u.dst)); __ip_vs_dst_set(dest, 0, dst_clone(&rt->u.dst));
IP_VS_DBG(10, "new dst " NIP6_FMT ", refcnt=%d\n", IP_VS_DBG(10, "new dst %p6, refcnt=%d\n",
NIP6(dest->addr.in6), &dest->addr.in6,
atomic_read(&rt->u.dst.__refcnt)); atomic_read(&rt->u.dst.__refcnt));
} }
spin_unlock(&dest->dst_lock); spin_unlock(&dest->dst_lock);
@ -167,8 +166,8 @@ __ip_vs_get_out_rt_v6(struct ip_vs_conn *cp)
rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl); rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl);
if (!rt) { if (!rt) {
IP_VS_DBG_RL("ip6_route_output error, dest: " IP_VS_DBG_RL("ip6_route_output error, dest: %p6\n",
NIP6_FMT "\n", NIP6(cp->daddr.in6)); &cp->daddr.in6);
return NULL; return NULL;
} }
} }
@ -301,8 +300,8 @@ ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl); rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl);
if (!rt) { if (!rt) {
IP_VS_DBG_RL("ip_vs_bypass_xmit_v6(): ip6_route_output error, " IP_VS_DBG_RL("ip_vs_bypass_xmit_v6(): ip6_route_output error, dest: %p6\n",
"dest: " NIP6_FMT "\n", NIP6(iph->daddr)); &iph->daddr);
goto tx_error_icmp; goto tx_error_icmp;
} }

8
net/netfilter/nf_conntrack_ftp.c
View File

@ -467,11 +467,9 @@ static int help(struct sk_buff *skb,
NIPQUAD(cmd.u3.ip), NIPQUAD(cmd.u3.ip),
NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip)); NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip));
} else { } else {
pr_debug("conntrack_ftp: NOT RECORDING: " NIP6_FMT pr_debug("conntrack_ftp: NOT RECORDING: %p6 != %p6\n",
" != " NIP6_FMT "\n", cmd.u3.ip6,
NIP6(*((struct in6_addr *)cmd.u3.ip6)), ct->tuplehash[dir].tuple.src.u3.ip6);
NIP6(*((struct in6_addr *)
ct->tuplehash[dir].tuple.src.u3.ip6)));
} }
/* Thanks to Cristiano Lincoln Mattos /* Thanks to Cristiano Lincoln Mattos

12
net/netfilter/nf_conntrack_h323_main.c
View File

@ -850,10 +850,8 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct,
get_h225_addr(ct, *data, &setup->destCallSignalAddress, get_h225_addr(ct, *data, &setup->destCallSignalAddress,
&addr, &port) && &addr, &port) &&
memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) { memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) {
pr_debug("nf_ct_q931: set destCallSignalAddress " pr_debug("nf_ct_q931: set destCallSignalAddress %p6:%hu->%p6:%hu\n",
NIP6_FMT ":%hu->" NIP6_FMT ":%hu\n", &addr, ntohs(port), &ct->tuplehash[!dir].tuple.src.u3,
NIP6(*(struct in6_addr *)&addr), ntohs(port),
NIP6(*(struct in6_addr *)&ct->tuplehash[!dir].tuple.src.u3),
ntohs(ct->tuplehash[!dir].tuple.src.u.tcp.port)); ntohs(ct->tuplehash[!dir].tuple.src.u.tcp.port));
ret = set_h225_addr(skb, data, dataoff, ret = set_h225_addr(skb, data, dataoff,
&setup->destCallSignalAddress, &setup->destCallSignalAddress,
@ -868,10 +866,8 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct,
get_h225_addr(ct, *data, &setup->sourceCallSignalAddress, get_h225_addr(ct, *data, &setup->sourceCallSignalAddress,
&addr, &port) && &addr, &port) &&
memcmp(&addr, &ct->tuplehash[!dir].tuple.dst.u3, sizeof(addr))) { memcmp(&addr, &ct->tuplehash[!dir].tuple.dst.u3, sizeof(addr))) {
pr_debug("nf_ct_q931: set sourceCallSignalAddress " pr_debug("nf_ct_q931: set sourceCallSignalAddress %p6:%hu->%p6:%hu\n",
NIP6_FMT ":%hu->" NIP6_FMT ":%hu\n", &addr, ntohs(port), &ct->tuplehash[!dir].tuple.dst.u3,
NIP6(*(struct in6_addr *)&addr), ntohs(port),
NIP6(*(struct in6_addr *)&ct->tuplehash[!dir].tuple.dst.u3),
ntohs(ct->tuplehash[!dir].tuple.dst.u.tcp.port)); ntohs(ct->tuplehash[!dir].tuple.dst.u.tcp.port));
ret = set_h225_addr(skb, data, dataoff, ret = set_h225_addr(skb, data, dataoff,
&setup->sourceCallSignalAddress, &setup->sourceCallSignalAddress,

7
net/netfilter/xt_hashlimit.c
View File

@ -904,12 +904,11 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
ent->rateinfo.cost); ent->rateinfo.cost);
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
case NFPROTO_IPV6: case NFPROTO_IPV6:
return seq_printf(s, "%ld " NIP6_FMT ":%u->" return seq_printf(s, "%ld %p6:%u->%p6:%u %u %u %u\n",
NIP6_FMT ":%u %u %u %u\n",
(long)(ent->expires - jiffies)/HZ, (long)(ent->expires - jiffies)/HZ,
NIP6(*(struct in6_addr *)&ent->dst.ip6.src), &ent->dst.ip6.src,
ntohs(ent->dst.src_port), ntohs(ent->dst.src_port),
NIP6(*(struct in6_addr *)&ent->dst.ip6.dst), &ent->dst.ip6.dst,
ntohs(ent->dst.dst_port), ntohs(ent->dst.dst_port),
ent->rateinfo.credit, ent->rateinfo.credit_cap, ent->rateinfo.credit, ent->rateinfo.credit_cap,
ent->rateinfo.cost); ent->rateinfo.cost);

5
net/netfilter/xt_recent.c
View File

@ -426,9 +426,8 @@ static int recent_seq_show(struct seq_file *seq, void *v)
"oldest_pkt: %u", NIPQUAD(e->addr.ip), e->ttl, "oldest_pkt: %u", NIPQUAD(e->addr.ip), e->ttl,
e->stamps[i], e->index); e->stamps[i], e->index);
else else
seq_printf(seq, "src=" NIP6_FMT " ttl: %u last_seen: %lu " seq_printf(seq, "src=%p6 ttl: %u last_seen: %lu oldest_pkt: %u",
"oldest_pkt: %u", NIP6(e->addr.in6), e->ttl, &e->addr.in6, e->ttl, e->stamps[i], e->index);
e->stamps[i], e->index);
for (i = 0; i < e->nstamps; i++) for (i = 0; i < e->nstamps; i++)
seq_printf(seq, "%s %lu", i ? "," : "", e->stamps[i]); seq_printf(seq, "%s %lu", i ? "," : "", e->stamps[i]);
seq_printf(seq, "\n"); seq_printf(seq, "\n");