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

Commit 2121c3f5 authored by Chris Elston's avatar Chris Elston Committed by David S. Miller
Browse files

l2tp: show IPv6 addresses in l2tp debugfs file 



If an L2TP tunnel uses IPv6, make sure the l2tp debugfs file shows the
IPv6 address correctly.

Signed-off-by: default avatarChris Elston <celston@katalix.com>
Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b79585f5

net/l2tp/l2tp_debugfs.c

+8 −0
Original line number Diff line number Diff line
@@ -122,6 +122,14 @@ static void l2tp_dfs_seq_tunnel_show(struct seq_file *m, void *v) 
	seq_printf(m, "\nTUNNEL %u peer %u", tunnel->tunnel_id, tunnel->peer_tunnel_id);

	if (tunnel->sock) {

		struct inet_sock *inet = inet_sk(tunnel->sock);



#if IS_ENABLED(CONFIG_IPV6)

		if (tunnel->sock->sk_family == AF_INET6) {

			struct ipv6_pinfo *np = inet6_sk(tunnel->sock);

			seq_printf(m, " from %pI6c to %pI6c\n",

				&np->saddr, &np->daddr);

		} else

#endif

		seq_printf(m, " from %pI4 to %pI4\n",

			   &inet->inet_saddr, &inet->inet_daddr);

		if (tunnel->encap == L2TP_ENCAPTYPE_UDP)