Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9343e79a authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6]: Preserve procfs IPV6 address output format 



Procfs always output IPV6 addresses without the colon
characters, and we cannot change that.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2664b250

include/linux/kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ extern void dump_stack(void); 
	ntohs((addr).s6_addr16[6]), \

	ntohs((addr).s6_addr16[7])

#define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"

#define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x"



#if defined(__LITTLE_ENDIAN)

#define HIPQUAD(addr) \

net/ipv6/addrconf.c

+1 −1
Original line number Diff line number Diff line
@@ -2644,7 +2644,7 @@ static int if6_seq_show(struct seq_file *seq, void *v) 
{

	struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;

	seq_printf(seq,

		   NIP6_FMT " %02x %02x %02x %02x %8s\n",

		   NIP6_SEQFMT " %02x %02x %02x %02x %8s\n",

		   NIP6(ifp->addr),

		   ifp->idev->dev->ifindex,

		   ifp->prefix_len,

net/ipv6/anycast.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static int ac6_seq_show(struct seq_file *seq, void *v) 
	struct ac6_iter_state *state = ac6_seq_private(seq);



	seq_printf(seq,

		   "%-4d %-15s " NIP6_FMT " %5d\n",

		   "%-4d %-15s " NIP6_SEQFMT " %5d\n",

		   state->dev->ifindex, state->dev->name,

		   NIP6(im->aca_addr),

		   im->aca_users);

net/ipv6/ip6_flowlabel.c

+2 −2
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static void ip6fl_fl_seq_show(struct seq_file *seq, struct ip6_flowlabel *fl) 
{

	while(fl) {

		seq_printf(seq,

			   "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_FMT " %-4d\n",

			   "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_SEQFMT " %-4d\n",

			   (unsigned)ntohl(fl->label),

			   fl->share,

			   (unsigned)fl->owner,
@@ -645,7 +645,7 @@ static void ip6fl_fl_seq_show(struct seq_file *seq, struct ip6_flowlabel *fl) 
static int ip6fl_seq_show(struct seq_file *seq, void *v)

{

	if (v == SEQ_START_TOKEN)

		seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-39s %s\n",

		seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-32s %s\n",

			   "Label", "S", "Owner", "Users", "Linger", "Expires", "Dst", "Opt");

	else

		ip6fl_fl_seq_show(seq, v);

net/ipv6/mcast.c

+3 −3
Original line number Diff line number Diff line
@@ -2373,7 +2373,7 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v) 
	struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);



	seq_printf(seq,

		   "%-4d %-15s " NIP6_FMT " %5d %08X %ld\n", 

		   "%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n", 

		   state->dev->ifindex, state->dev->name,

		   NIP6(im->mca_addr),

		   im->mca_users, im->mca_flags,
@@ -2542,12 +2542,12 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v) 
	if (v == SEQ_START_TOKEN) {

		seq_printf(seq, 

			   "%3s %6s "

			   "%39s %39s %6s %6s\n", "Idx",

			   "%32s %32s %6s %6s\n", "Idx",

			   "Device", "Multicast Address",

			   "Source Address", "INC", "EXC");

	} else {

		seq_printf(seq,

			   "%3d %6.6s " NIP6_FMT " " NIP6_FMT " %6lu %6lu\n",

			   "%3d %6.6s " NIP6_SEQFMT " " NIP6_SEQFMT " %6lu %6lu\n",

			   state->dev->ifindex, state->dev->name,

			   NIP6(state->im->mca_addr),

			   NIP6(psf->sf_addr),