tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[NET]: Use NIP6_FMT in kernel.h

There are errors and inconsistency in the display of NIP6 strings.
ie: net/ipv6/ip6_flowlabel.c

There are errors and inconsistency in the display of NIPQUAD strings too.
ie: net/netfilter/nf_conntrack_ftp.c

This patch:
adds NIP6_FMT to kernel.h
changes all code to use NIP6_FMT
fixes net/ipv6/ip6_flowlabel.c
adds NIPQUAD_FMT to kernel.h
fixes net/netfilter/nf_conntrack_ftp.c
changes a few uses of "%u.%u.%u.%u" to NIPQUAD_FMT for symmetry to NIP6_FMT

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Joe Perches and committed by David S. Miller 46b86a2d 23b0ca5b

+39 -57
unified split
+2
include/linux/kernel.h
··· 216 ((unsigned char *)&addr)[1], \ 217 ((unsigned char *)&addr)[2], \ 218 ((unsigned char *)&addr)[3] 219 220 #define NIP6(addr) \ 221 ntohs((addr).s6_addr16[0]), \ ··· 227 ntohs((addr).s6_addr16[5]), \ 228 ntohs((addr).s6_addr16[6]), \ 229 ntohs((addr).s6_addr16[7]) 230 231 #if defined(__LITTLE_ENDIAN) 232 #define HIPQUAD(addr) \
··· 216 ((unsigned char *)&addr)[1], \ 217 ((unsigned char *)&addr)[2], \ 218 ((unsigned char *)&addr)[3] 219 + #define NIPQUAD_FMT "%u.%u.%u.%u" 220 221 #define NIP6(addr) \ 222 ntohs((addr).s6_addr16[0]), \ ··· 226 ntohs((addr).s6_addr16[5]), \ 227 ntohs((addr).s6_addr16[6]), \ 228 ntohs((addr).s6_addr16[7]) 229 + #define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" 230 231 #if defined(__LITTLE_ENDIAN) 232 #define HIPQUAD(addr) \
+1 -1
include/net/netfilter/nf_conntrack_tuple.h
··· 111 #ifdef __KERNEL__ 112 113 #define NF_CT_DUMP_TUPLE(tp) \ 114 - DEBUGP("tuple %p: %u %u %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x %hu -> %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x %hu\n", \ 115 (tp), (tp)->src.l3num, (tp)->dst.protonum, \ 116 NIP6(*(struct in6_addr *)(tp)->src.u3.all), ntohs((tp)->src.u.all), \ 117 NIP6(*(struct in6_addr *)(tp)->dst.u3.all), ntohs((tp)->dst.u.all))
··· 111 #ifdef __KERNEL__ 112 113 #define NF_CT_DUMP_TUPLE(tp) \ 114 + DEBUGP("tuple %p: %u %u " NIP6_FMT " %hu -> " NIP6_FMT " %hu\n", \ 115 (tp), (tp)->src.l3num, (tp)->dst.protonum, \ 116 NIP6(*(struct in6_addr *)(tp)->src.u3.all), ntohs((tp)->src.u.all), \ 117 NIP6(*(struct in6_addr *)(tp)->dst.u3.all), ntohs((tp)->dst.u.all))
+2 -2
include/net/sctp/sctp.h
··· 225 if (sctp_debug_flag) { \ 226 if (saddr->sa.sa_family == AF_INET6) { \ 227 printk(KERN_DEBUG \ 228 - lead "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" trail, \ 229 leadparm, \ 230 NIP6(saddr->v6.sin6_addr), \ 231 otherparms); \ 232 } else { \ 233 printk(KERN_DEBUG \ 234 - lead "%u.%u.%u.%u" trail, \ 235 leadparm, \ 236 NIPQUAD(saddr->v4.sin_addr.s_addr), \ 237 otherparms); \
··· 225 if (sctp_debug_flag) { \ 226 if (saddr->sa.sa_family == AF_INET6) { \ 227 printk(KERN_DEBUG \ 228 + lead NIP6_FMT trail, \ 229 leadparm, \ 230 NIP6(saddr->v6.sin6_addr), \ 231 otherparms); \ 232 } else { \ 233 printk(KERN_DEBUG \ 234 + lead NIPQUAD_FMT trail, \ 235 leadparm, \ 236 NIPQUAD(saddr->v4.sin_addr.s_addr), \ 237 otherparms); \
+1 -1
net/ipv6/addrconf.c
··· 2644 { 2645 struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; 2646 seq_printf(seq, 2647 - "%04x%04x%04x%04x%04x%04x%04x%04x %02x %02x %02x %02x %8s\n", 2648 NIP6(ifp->addr), 2649 ifp->idev->dev->ifindex, 2650 ifp->prefix_len,
··· 2644 { 2645 struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; 2646 seq_printf(seq, 2647 + NIP6_FMT " %02x %02x %02x %02x %8s\n", 2648 NIP6(ifp->addr), 2649 ifp->idev->dev->ifindex, 2650 ifp->prefix_len,
+1 -2
net/ipv6/ah6.c
··· 332 if (!x) 333 return; 334 335 - NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/" 336 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 337 ntohl(ah->spi), NIP6(iph->daddr)); 338 339 xfrm_state_put(x);
··· 332 if (!x) 333 return; 334 335 + NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/" NIP6_FMT "\n", 336 ntohl(ah->spi), NIP6(iph->daddr)); 337 338 xfrm_state_put(x);
+1 -3
net/ipv6/anycast.c
··· 532 struct ac6_iter_state *state = ac6_seq_private(seq); 533 534 seq_printf(seq, 535 - "%-4d %-15s " 536 - "%04x%04x%04x%04x%04x%04x%04x%04x " 537 - "%5d\n", 538 state->dev->ifindex, state->dev->name, 539 NIP6(im->aca_addr), 540 im->aca_users);
··· 532 struct ac6_iter_state *state = ac6_seq_private(seq); 533 534 seq_printf(seq, 535 + "%-4d %-15s " NIP6_FMT " %5d\n", 536 state->dev->ifindex, state->dev->name, 537 NIP6(im->aca_addr), 538 im->aca_users);
+1 -2
net/ipv6/esp6.c
··· 266 x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6); 267 if (!x) 268 return; 269 - printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/" 270 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 271 ntohl(esph->spi), NIP6(iph->daddr)); 272 xfrm_state_put(x); 273 }
··· 266 x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6); 267 if (!x) 268 return; 269 + printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/" NIP6_FMT "\n", 270 ntohl(esph->spi), NIP6(iph->daddr)); 271 xfrm_state_put(x); 272 }
+1 -1
net/ipv6/icmp.c
··· 607 skb->csum = ~csum_ipv6_magic(saddr, daddr, skb->len, 608 IPPROTO_ICMPV6, 0); 609 if (__skb_checksum_complete(skb)) { 610 - LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x > %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]\n", 611 NIP6(*saddr), NIP6(*daddr)); 612 goto discard_it; 613 }
··· 607 skb->csum = ~csum_ipv6_magic(saddr, daddr, skb->len, 608 IPPROTO_ICMPV6, 0); 609 if (__skb_checksum_complete(skb)) { 610 + LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [" NIP6_FMT " > " NIP6_FMT "]\n", 611 NIP6(*saddr), NIP6(*daddr)); 612 goto discard_it; 613 }
+3 -5
net/ipv6/ip6_flowlabel.c
··· 629 { 630 while(fl) { 631 seq_printf(seq, 632 - "%05X %-1d %-6d %-6d %-6ld %-8ld " 633 - "%02x%02x%02x%02x%02x%02x%02x%02x " 634 - "%-4d\n", 635 (unsigned)ntohl(fl->label), 636 fl->share, 637 (unsigned)fl->owner, ··· 645 static int ip6fl_seq_show(struct seq_file *seq, void *v) 646 { 647 if (v == SEQ_START_TOKEN) 648 - seq_puts(seq, "Label S Owner Users Linger Expires " 649 - "Dst Opt\n"); 650 else 651 ip6fl_fl_seq_show(seq, v); 652 return 0;
··· 629 { 630 while(fl) { 631 seq_printf(seq, 632 + "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_FMT " %-4d\n", 633 (unsigned)ntohl(fl->label), 634 fl->share, 635 (unsigned)fl->owner, ··· 647 static int ip6fl_seq_show(struct seq_file *seq, void *v) 648 { 649 if (v == SEQ_START_TOKEN) 650 + seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-39s %s\n", 651 + "Label", "S", "Owner", "Users", "Linger", "Expires", "Dst", "Opt"); 652 else 653 ip6fl_fl_seq_show(seq, v); 654 return 0;
+1 -2
net/ipv6/ipcomp6.c
··· 212 if (!x) 213 return; 214 215 - printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/" 216 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 217 spi, NIP6(iph->daddr)); 218 xfrm_state_put(x); 219 }
··· 212 if (!x) 213 return; 214 215 + printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/" NIP6_FMT "\n", 216 spi, NIP6(iph->daddr)); 217 xfrm_state_put(x); 218 }
+3 -6
net/ipv6/mcast.c
··· 2373 struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq); 2374 2375 seq_printf(seq, 2376 - "%-4d %-15s %04x%04x%04x%04x%04x%04x%04x%04x %5d %08X %ld\n", 2377 state->dev->ifindex, state->dev->name, 2378 NIP6(im->mca_addr), 2379 im->mca_users, im->mca_flags, ··· 2542 if (v == SEQ_START_TOKEN) { 2543 seq_printf(seq, 2544 "%3s %6s " 2545 - "%32s %32s %6s %6s\n", "Idx", 2546 "Device", "Multicast Address", 2547 "Source Address", "INC", "EXC"); 2548 } else { 2549 seq_printf(seq, 2550 - "%3d %6.6s " 2551 - "%04x%04x%04x%04x%04x%04x%04x%04x " 2552 - "%04x%04x%04x%04x%04x%04x%04x%04x " 2553 - "%6lu %6lu\n", 2554 state->dev->ifindex, state->dev->name, 2555 NIP6(state->im->mca_addr), 2556 NIP6(psf->sf_addr),
··· 2373 struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq); 2374 2375 seq_printf(seq, 2376 + "%-4d %-15s " NIP6_FMT " %5d %08X %ld\n", 2377 state->dev->ifindex, state->dev->name, 2378 NIP6(im->mca_addr), 2379 im->mca_users, im->mca_flags, ··· 2542 if (v == SEQ_START_TOKEN) { 2543 seq_printf(seq, 2544 "%3s %6s " 2545 + "%39s %39s %6s %6s\n", "Idx", 2546 "Device", "Multicast Address", 2547 "Source Address", "INC", "EXC"); 2548 } else { 2549 seq_printf(seq, 2550 + "%3d %6.6s " NIP6_FMT " " NIP6_FMT " %6lu %6lu\n", 2551 state->dev->ifindex, state->dev->name, 2552 NIP6(state->im->mca_addr), 2553 NIP6(psf->sf_addr),
+1 -1
net/ipv6/ndisc.c
··· 692 if (!(neigh->nud_state & NUD_VALID)) { 693 ND_PRINTK1(KERN_DEBUG 694 "%s(): trying to ucast probe in NUD_INVALID: " 695 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 696 __FUNCTION__, 697 NIP6(*target)); 698 }
··· 692 if (!(neigh->nud_state & NUD_VALID)) { 693 ND_PRINTK1(KERN_DEBUG 694 "%s(): trying to ucast probe in NUD_INVALID: " 695 + NIP6_FMT "\n", 696 __FUNCTION__, 697 NIP6(*target)); 698 }
+2 -3
net/ipv6/netfilter/ip6t_LOG.c
··· 63 return; 64 } 65 66 - /* Max length: 88 "SRC=0000.0000.0000.0000.0000.0000.0000.0000 DST=0000.0000.0000.0000.0000.0000.0000.0000" */ 67 - printk("SRC=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ", NIP6(ih->saddr)); 68 - printk("DST=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ", NIP6(ih->daddr)); 69 70 /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */ 71 printk("LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
··· 63 return; 64 } 65 66 + /* Max length: 88 "SRC=0000.0000.0000.0000.0000.0000.0000.0000 DST=0000.0000.0000.0000.0000.0000.0000.0000 " */ 67 + printk("SRC=" NIP6_FMT " DST=" NIP6_FMT " ", NIP6(ih->saddr), NIP6(ih->daddr)); 68 69 /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */ 70 printk("LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
+1 -1
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
··· 74 static int ipv6_print_tuple(struct seq_file *s, 75 const struct nf_conntrack_tuple *tuple) 76 { 77 - return seq_printf(s, "src=%x:%x:%x:%x:%x:%x:%x:%x dst=%x:%x:%x:%x:%x:%x:%x:%x ", 78 NIP6(*((struct in6_addr *)tuple->src.u3.ip6)), 79 NIP6(*((struct in6_addr *)tuple->dst.u3.ip6))); 80 }
··· 74 static int ipv6_print_tuple(struct seq_file *s, 75 const struct nf_conntrack_tuple *tuple) 76 { 77 + return seq_printf(s, "src=" NIP6_FMT " dst=" NIP6_FMT " ", 78 NIP6(*((struct in6_addr *)tuple->src.u3.ip6)), 79 NIP6(*((struct in6_addr *)tuple->dst.u3.ip6))); 80 }
+3 -5
net/ipv6/xfrm6_tunnel.c
··· 259 spi = 0; 260 goto out; 261 alloc_spi: 262 - X6TPRINTK3(KERN_DEBUG "%s(): allocate new spi for " 263 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 264 __FUNCTION__, 265 NIP6(*(struct in6_addr *)saddr)); 266 x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC); ··· 322 list_byaddr) 323 { 324 if (memcmp(&x6spi->addr, saddr, sizeof(x6spi->addr)) == 0) { 325 - X6TPRINTK3(KERN_DEBUG "%s(): x6spi object " 326 - "for %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x " 327 - "found at %p\n", 328 __FUNCTION__, 329 NIP6(*(struct in6_addr *)saddr), 330 x6spi);
··· 259 spi = 0; 260 goto out; 261 alloc_spi: 262 + X6TPRINTK3(KERN_DEBUG "%s(): allocate new spi for " NIP6_FMT "\n", 263 __FUNCTION__, 264 NIP6(*(struct in6_addr *)saddr)); 265 x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, SLAB_ATOMIC); ··· 323 list_byaddr) 324 { 325 if (memcmp(&x6spi->addr, saddr, sizeof(x6spi->addr)) == 0) { 326 + X6TPRINTK3(KERN_DEBUG "%s(): x6spi object for " NIP6_FMT 327 + " found at %p\n", 328 __FUNCTION__, 329 NIP6(*(struct in6_addr *)saddr), 330 x6spi);
+2 -2
net/netfilter/nf_conntrack_ftp.c
··· 545 different IP address. Simply don't record it for 546 NAT. */ 547 if (cmd.l3num == PF_INET) { 548 - DEBUGP("conntrack_ftp: NOT RECORDING: %u,%u,%u,%u != %u.%u.%u.%u\n", 549 NIPQUAD(cmd.u3.ip), 550 NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip)); 551 } else { 552 - DEBUGP("conntrack_ftp: NOT RECORDING: %x:%x:%x:%x:%x:%x:%x:%x != %x:%x:%x:%x:%x:%x:%x:%x\n", 553 NIP6(*((struct in6_addr *)cmd.u3.ip6)), 554 NIP6(*((struct in6_addr *)ct->tuplehash[dir] 555 .tuple.src.u3.ip6)));
··· 545 different IP address. Simply don't record it for 546 NAT. */ 547 if (cmd.l3num == PF_INET) { 548 + DEBUGP("conntrack_ftp: NOT RECORDING: " NIPQUAD_FMT " != " NIPQUAD_FMT "\n", 549 NIPQUAD(cmd.u3.ip), 550 NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip)); 551 } else { 552 + DEBUGP("conntrack_ftp: NOT RECORDING: " NIP6_FMT " != " NIP6_FMT "\n", 553 NIP6(*((struct in6_addr *)cmd.u3.ip6)), 554 NIP6(*((struct in6_addr *)ct->tuplehash[dir] 555 .tuple.src.u3.ip6)));
+9 -15
net/sctp/ipv6.c
··· 180 } 181 182 SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, " 183 - "src:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x " 184 - "dst:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 185 __FUNCTION__, skb, skb->len, 186 NIP6(fl.fl6_src), NIP6(fl.fl6_dst)); 187 ··· 205 fl.oif = daddr->v6.sin6_scope_id; 206 207 208 - SCTP_DEBUG_PRINTK("%s: DST=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ", 209 __FUNCTION__, NIP6(fl.fl6_dst)); 210 211 if (saddr) { 212 ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr); 213 SCTP_DEBUG_PRINTK( 214 - "SRC=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x - ", 215 NIP6(fl.fl6_src)); 216 } 217 ··· 220 struct rt6_info *rt; 221 rt = (struct rt6_info *)dst; 222 SCTP_DEBUG_PRINTK( 223 - "rt6_dst:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x " 224 - "rt6_src:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 225 NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr)); 226 } else { 227 SCTP_DEBUG_PRINTK("NO ROUTE\n"); ··· 269 __u8 bmatchlen; 270 271 SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p " 272 - "daddr:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ", 273 __FUNCTION__, asoc, dst, NIP6(daddr->v6.sin6_addr)); 274 275 if (!asoc) { 276 ipv6_get_saddr(dst, &daddr->v6.sin6_addr,&saddr->v6.sin6_addr); 277 - SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " 278 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 279 NIP6(saddr->v6.sin6_addr)); 280 return; 281 } ··· 302 303 if (baddr) { 304 memcpy(saddr, baddr, sizeof(union sctp_addr)); 305 - SCTP_DEBUG_PRINTK("saddr: " 306 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 307 NIP6(saddr->v6.sin6_addr)); 308 } else { 309 printk(KERN_ERR "%s: asoc:%p Could not find a valid source " 310 - "address for the " 311 - "dest:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 312 __FUNCTION__, asoc, NIP6(daddr->v6.sin6_addr)); 313 } 314 ··· 670 /* Dump the v6 addr to the seq file. */ 671 static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) 672 { 673 - seq_printf(seq, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ", 674 - NIP6(addr->v6.sin6_addr)); 675 } 676 677 /* Initialize a PF_INET6 socket msg_name. */
··· 180 } 181 182 SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, " 183 + "src:" NIP6_FMT " dst:" NIP6_FMT "\n", 184 __FUNCTION__, skb, skb->len, 185 NIP6(fl.fl6_src), NIP6(fl.fl6_dst)); 186 ··· 206 fl.oif = daddr->v6.sin6_scope_id; 207 208 209 + SCTP_DEBUG_PRINTK("%s: DST=" NIP6_FMT " ", 210 __FUNCTION__, NIP6(fl.fl6_dst)); 211 212 if (saddr) { 213 ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr); 214 SCTP_DEBUG_PRINTK( 215 + "SRC=" NIP6_FMT " - ", 216 NIP6(fl.fl6_src)); 217 } 218 ··· 221 struct rt6_info *rt; 222 rt = (struct rt6_info *)dst; 223 SCTP_DEBUG_PRINTK( 224 + "rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n", 225 NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr)); 226 } else { 227 SCTP_DEBUG_PRINTK("NO ROUTE\n"); ··· 271 __u8 bmatchlen; 272 273 SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p " 274 + "daddr:" NIP6_FMT " ", 275 __FUNCTION__, asoc, dst, NIP6(daddr->v6.sin6_addr)); 276 277 if (!asoc) { 278 ipv6_get_saddr(dst, &daddr->v6.sin6_addr,&saddr->v6.sin6_addr); 279 + SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n", 280 NIP6(saddr->v6.sin6_addr)); 281 return; 282 } ··· 305 306 if (baddr) { 307 memcpy(saddr, baddr, sizeof(union sctp_addr)); 308 + SCTP_DEBUG_PRINTK("saddr: " NIP6_FMT "\n", 309 NIP6(saddr->v6.sin6_addr)); 310 } else { 311 printk(KERN_ERR "%s: asoc:%p Could not find a valid source " 312 + "address for the dest:" NIP6_FMT "\n", 313 __FUNCTION__, asoc, NIP6(daddr->v6.sin6_addr)); 314 } 315 ··· 675 /* Dump the v6 addr to the seq file. */ 676 static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) 677 { 678 + seq_printf(seq, NIP6_FMT " ", NIP6(addr->v6.sin6_addr)); 679 } 680 681 /* Initialize a PF_INET6 socket msg_name. */
+2 -2
net/sctp/sm_statefuns.c
··· 1036 if (from_addr.sa.sa_family == AF_INET6) { 1037 printk(KERN_WARNING 1038 "%s association %p could not find address " 1039 - "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", 1040 __FUNCTION__, 1041 asoc, 1042 NIP6(from_addr.v6.sin6_addr)); 1043 } else { 1044 printk(KERN_WARNING 1045 "%s association %p could not find address " 1046 - "%u.%u.%u.%u\n", 1047 __FUNCTION__, 1048 asoc, 1049 NIPQUAD(from_addr.v4.sin_addr.s_addr));
··· 1036 if (from_addr.sa.sa_family == AF_INET6) { 1037 printk(KERN_WARNING 1038 "%s association %p could not find address " 1039 + NIP6_FMT "\n", 1040 __FUNCTION__, 1041 asoc, 1042 NIP6(from_addr.v6.sin6_addr)); 1043 } else { 1044 printk(KERN_WARNING 1045 "%s association %p could not find address " 1046 + NIPQUAD_FMT "\n", 1047 __FUNCTION__, 1048 asoc, 1049 NIPQUAD(from_addr.v4.sin_addr.s_addr));
+2 -3
security/selinux/avc.c
··· 494 char *name1, char *name2) 495 { 496 if (!ipv6_addr_any(addr)) 497 - audit_log_format(ab, " %s=%04x:%04x:%04x:%04x:%04x:" 498 - "%04x:%04x:%04x", name1, NIP6(*addr)); 499 if (port) 500 audit_log_format(ab, " %s=%d", name2, ntohs(port)); 501 } ··· 503 __be16 port, char *name1, char *name2) 504 { 505 if (addr) 506 - audit_log_format(ab, " %s=%d.%d.%d.%d", name1, NIPQUAD(addr)); 507 if (port) 508 audit_log_format(ab, " %s=%d", name2, ntohs(port)); 509 }
··· 494 char *name1, char *name2) 495 { 496 if (!ipv6_addr_any(addr)) 497 + audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr)); 498 if (port) 499 audit_log_format(ab, " %s=%d", name2, ntohs(port)); 500 } ··· 504 __be16 port, char *name1, char *name2) 505 { 506 if (addr) 507 + audit_log_format(ab, " %s=" NIPQUAD_FMT, name1, NIPQUAD(addr)); 508 if (port) 509 audit_log_format(ab, " %s=%d", name2, ntohs(port)); 510 }