From 183f9d6e5c8e8de8b28d13936bf603d3a225a3f2 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Mon, 5 Dec 2016 16:23:51 +0100
Subject: [PATCH] l2tpd: add name to traffic_channels to improve logging

---
 siu/l2tp/l2tpd.c      | 3 +++
 siu/l2tp/l2tpd.h      | 1 +
 siu/l2tp/l2tpd_lapd.c | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/siu/l2tp/l2tpd.c b/siu/l2tp/l2tpd.c
index a913f0a..f94541a 100644
--- a/siu/l2tp/l2tpd.c
+++ b/siu/l2tp/l2tpd.c
@@ -133,6 +133,9 @@ int main(int argc, char **argv)
 	if (rc < 0)
 		exit(1);
 
+	l2i->rsl_oml.name = "RSL/OML";
+	l2i->trau.name = "TRAU";
+	l2i->pgsl.name = "P/GSL";
 	l2tp_socket_init(&l2i->rsl_oml.state, l2i->cfg.rsl_oml_path, 100, DL2TP);
 	l2tp_socket_init(&l2i->trau.state, l2i->cfg.trau_path, 100, DL2TP);
 	l2tp_socket_init(&l2i->pgsl.state, l2i->cfg.pgsl_path, 100, DL2TP);
diff --git a/siu/l2tp/l2tpd.h b/siu/l2tp/l2tpd.h
index 146dc35..b7ad316 100644
--- a/siu/l2tp/l2tpd.h
+++ b/siu/l2tp/l2tpd.h
@@ -84,6 +84,7 @@ struct l2tpd_session {
 struct traffic_channel {
 	struct l2tp_socket_state state;
 	struct l2tpd_session *session;
+	const char *name;
 };
 
 struct l2tpd_instance {
diff --git a/siu/l2tp/l2tpd_lapd.c b/siu/l2tp/l2tpd_lapd.c
index 6d6f102..0a1524a 100644
--- a/siu/l2tp/l2tpd_lapd.c
+++ b/siu/l2tp/l2tpd_lapd.c
@@ -255,11 +255,11 @@ int unix_rsl_oml_cb(struct osmo_fd *fd)
 
 	rc = read(fd->fd, msg->data, msg->data_len);
 	if (rc < 0) {
-		LOGP(DL2TP, LOGL_ERROR, "read failed %s\n", strerror(errno));
+		LOGP(DL2TP, LOGL_ERROR, "%s: read failed %s\n", channel->name, strerror(errno));
 		msgb_free(msg);
 		return rc;
 	} else if (rc == 0) {
-		LOGP(DL2TP, LOGL_ERROR, "closing socket because read 0 bytes\n");
+		LOGP(DL2TP, LOGL_ERROR, "%s: closing socket because read 0 bytes\n", channel->name);
 		msgb_free(msg);
 		l2tp_sock_cleanup(fd);
 		return 0;
@@ -269,7 +269,7 @@ int unix_rsl_oml_cb(struct osmo_fd *fd)
 	msg->dst = channel->session;
 
 	if (!channel->session) {
-		LOGP(DL2TP, LOGL_NOTICE, "Drop packets.\n");
+		LOGP(DL2TP, LOGL_DEBUG, "%s: Drop incoming packet session is full\n", channel->name);
 		msgb_free(msg);
 		return 1;
 	}
@@ -282,7 +282,7 @@ int unix_rsl_oml_cb(struct osmo_fd *fd)
 
 	rc = lapd_lapd_to_ehdlc(l2i, msg);
 	if (rc) {
-		LOGP(DL2TP, LOGL_NOTICE, "lapd_to_ehlc returned != 0: %d.\n", rc);
+		LOGP(DL2TP, LOGL_NOTICE, "%s: lapd_to_ehlc returned != 0: %d.\n", channel->name, rc);
 	}
 
 	msgb_free(msg);