From: James Chapman <jchapman@katalix•com>
To: netdev@vger•kernel.org
Subject: [PATCH v3 04/12] l2tp: Add ppp device name to L2TP ppp session data
Date: Tue, 30 Mar 2010 17:17:46 +0100 [thread overview]
Message-ID: <20100330161746.9628.40723.stgit@bert.katalix.com> (raw)
In-Reply-To: <20100330161725.9628.69994.stgit@bert.katalix.com>
When dumping L2TP PPP sessions using /proc/net/l2tp, get
the assigned PPP device name from PPP using ppp_dev_name().
Signed-off-by: James Chapman <jchapman@katalix•com>
Reviewed-by: Randy Dunlap <randy.dunlap@oracle•com>
---
net/l2tp/l2tp_ppp.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 03195ab..8f78c27 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -608,6 +608,20 @@ out:
return error;
}
+#ifdef CONFIG_PROC_FS
+static void pppol2tp_show(struct seq_file *m, void *arg)
+{
+ struct l2tp_session *session = arg;
+ struct pppol2tp_session *ps = l2tp_session_priv(session);
+
+ if (ps) {
+ struct pppox_sock *po = pppox_sk(ps->sock);
+ if (po)
+ seq_printf(m, " interface %s\n", ppp_dev_name(&po->chan));
+ }
+}
+#endif
+
/* connect() handler. Attach a PPPoX socket to a tunnel UDP socket
*/
static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
@@ -697,6 +711,9 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
session->recv_skb = pppol2tp_recv;
session->session_close = pppol2tp_session_close;
+#ifdef CONFIG_PROC_FS
+ session->show = pppol2tp_show;
+#endif
/* We need to know each time a skb is dropped from the reorder
* queue.
next prev parent reply other threads:[~2010-03-30 16:17 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-30 16:17 [PATCH v3 00/12] l2tp: Introduce L2TPv3 support James Chapman
2010-03-30 16:17 ` [PATCH v3 01/12] l2tp: Relocate pppol2tp driver to new net/l2tp directory James Chapman
2010-03-30 16:17 ` [PATCH v3 02/12] l2tp: Split pppol2tp patch into separate l2tp and ppp parts James Chapman
2010-03-30 16:17 ` [PATCH v3 03/12] ppp: Add ppp_dev_name() exported function James Chapman
2010-03-30 16:17 ` James Chapman [this message]
2010-03-30 16:29 ` [PATCH v3 04/12] l2tp: Add ppp device name to L2TP ppp session data Stephen Hemminger
2010-03-31 7:43 ` James Chapman
2010-03-31 8:46 ` David Miller
2010-03-31 23:08 ` Stephen Hemminger
2010-04-01 7:19 ` James Chapman
2010-04-01 7:30 ` Eric Dumazet
2010-04-01 8:55 ` James Chapman
2010-04-01 7:34 ` David Miller
2010-04-01 8:59 ` James Chapman
2010-04-01 9:04 ` David Miller
2010-03-30 16:17 ` [PATCH v3 05/12] l2tp: Add L2TPv3 protocol support James Chapman
2010-03-30 16:17 ` [PATCH v3 06/12] l2tp: Update PPP-over-L2TP driver to work over L2TPv3 James Chapman
2010-03-30 16:18 ` [PATCH v3 07/12] l2tp: Add L2TPv3 IP encapsulation (no UDP) support James Chapman
2010-03-30 16:18 ` [PATCH v3 08/12] netlink: Export genl_lock() API for use by modules James Chapman
2010-03-30 16:18 ` [PATCH v3 09/12] l2tp: Add netlink control API for L2TP James Chapman
2010-03-31 8:59 ` Patrick McHardy
2010-03-30 16:18 ` [PATCH v3 10/12] l2tp: Add L2TP ethernet pseudowire support James Chapman
2010-03-30 16:30 ` Stephen Hemminger
2010-03-30 16:30 ` Stephen Hemminger
2010-03-30 16:32 ` Stephen Hemminger
2010-03-31 9:35 ` James Chapman
2010-03-31 17:38 ` Paul E. McKenney
2010-04-02 15:24 ` Paul E. McKenney
2010-04-02 15:58 ` Eric Dumazet
2010-04-02 16:21 ` Paul E. McKenney
2010-03-30 16:18 ` [PATCH v3 11/12] l2tp: Add support for static unmanaged L2TPv3 tunnels James Chapman
2010-03-30 16:18 ` [PATCH v3 12/12] l2tp: Update documentation James Chapman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100330161746.9628.40723.stgit@bert.katalix.com \
--to=jchapman@katalix$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox