improved logging: if session's interface is empty log ctrl's interface

5 files changed, 9 insertions, 5 deletions

diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
index 3edf7f0..e64e19a 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.c
+++ b/accel-pppd/ctrl/ipoe/ipoe.c
@@ -1169,7 +1169,7 @@ static struct ipoe_session *ipoe_session_create_dhcpv4(struct ipoe_serv *serv, s
 	int dlen = 0;
 	uint8_t *ptr = NULL;
 
-	ses = ipoe_session_alloc();
+	ses = ipoe_session_alloc(serv->ifname);
 	if (!ses)
 		return NULL;
 
@@ -1780,7 +1780,7 @@ static struct ipoe_session *ipoe_session_create_up(struct ipoe_serv *serv, struc
 	if (l4_redirect_list_check(saddr))
 		return NULL;
 
-	ses = ipoe_session_alloc();
+	ses = ipoe_session_alloc(serv->ifname);
 	if (!ses)
 		return NULL;
 
@@ -1843,7 +1843,7 @@ static void ipoe_session_create_auto(struct ipoe_serv *serv)
 	if (ap_shutdown)
 		return;
 
-	ses = ipoe_session_alloc();
+	ses = ipoe_session_alloc(serv->ifname);
 	if (!ses)
 		return;
 
@@ -1870,7 +1870,7 @@ static void ipoe_session_create_auto(struct ipoe_serv *serv)
 	triton_context_wakeup(&ses->ctx);
 }
 
-struct ipoe_session *ipoe_session_alloc(void)
+struct ipoe_session *ipoe_session_alloc(const char *ifname)
 {
 	struct ipoe_session *ses;
 
@@ -1894,6 +1894,7 @@ struct ipoe_session *ipoe_session_alloc(void)
 	ses->ctrl.terminate = ipoe_session_terminate;
 	ses->ctrl.type = CTRL_TYPE_IPOE;
 	ses->ctrl.name = "ipoe";
+	ses->ctrl.ifname = ifname;
 	ses->l4_redirect_table = conf_l4_redirect_table;
 
 	ses->ses.ctrl = &ses->ctrl;
diff --git a/accel-pppd/ctrl/ipoe/ipoe.h b/accel-pppd/ctrl/ipoe/ipoe.h
index 33bd6df..e398648 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.h
+++ b/accel-pppd/ctrl/ipoe/ipoe.h
@@ -130,7 +130,7 @@ struct ethhdr;
 
 void ipoe_recv_up(int ifindex, struct ethhdr *eth, struct iphdr *iph, struct _arphdr *arph);
 
-struct ipoe_session *ipoe_session_alloc(void);
+struct ipoe_session *ipoe_session_alloc(const char *ifname);
 
 struct ipoe_serv *ipoe_find_serv(const char *ifname);
 
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index 6350e8e..72264aa 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -1754,6 +1754,7 @@ static int l2tp_session_start_data_channel(struct l2tp_sess_t *sess)
 	sess->ctrl.type = CTRL_TYPE_L2TP;
 	sess->ctrl.ppp = 1;
 	sess->ctrl.name = "l2tp";
+	sess->ctrl.ifname = "";
 	sess->ctrl.started = apses_started;
 	sess->ctrl.finished = apses_finished;
 	sess->ctrl.terminate = ppp_terminate;
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 87c5b06..a4d1ca9 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -344,6 +344,7 @@ static struct pppoe_conn_t *allocate_channel(struct pppoe_serv_t *serv, const ui
 	conn->ctrl.type = CTRL_TYPE_PPPOE;
 	conn->ctrl.ppp = 1;
 	conn->ctrl.name = "pppoe";
+	conn->ctrl.ifname = serv->ifname;
 	conn->ctrl.mppe = conf_mppe;
 
 	if (ppp_max_payload > ETH_DATA_LEN - 8)
diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c
index 746badc..0a0afa4 100644
--- a/accel-pppd/ctrl/pptp/pptp.c
+++ b/accel-pppd/ctrl/pptp/pptp.c
@@ -683,6 +683,7 @@ static int pptp_connect(struct triton_md_handler_t *h)
 		conn->ctrl.type = CTRL_TYPE_PPTP;
 		conn->ctrl.ppp = 1;
 		conn->ctrl.name = "pptp";
+		conn->ctrl.ifname = "";
 		conn->ctrl.mppe = conf_mppe;
 
 		conn->ctrl.calling_station_id = _malloc(17);