From 947076a2d9cd9b338c70b43d30e277974046525b Mon Sep 17 00:00:00 2001
From: Guillaume Nault <g.nault@alphalink.fr>
Date: Mon, 11 Feb 2013 21:03:11 +0100
Subject: l2tp: Replace the lns_addr tunnel field by host_addr

Rename field lns_addr, as it identifies the host address, whether it be
a LAC or a LNS.

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
---
 accel-pppd/ctrl/l2tp/l2tp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'accel-pppd/ctrl')

diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index 0fde716..adc9e44 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -95,7 +95,7 @@ struct l2tp_conn_t
 	int tunnel_fd;
 
 	struct sockaddr_in peer_addr;
-	struct sockaddr_in lns_addr;
+	struct sockaddr_in host_addr;
 	uint16_t tid;
 	uint16_t peer_tid;
 	uint32_t framing_cap;
@@ -749,7 +749,7 @@ static struct l2tp_sess_t *l2tp_tunnel_alloc_session(struct l2tp_conn_t *conn)
 	sess->ctrl.called_station_id = _malloc(17);
 	u_inet_ntoa(conn->peer_addr.sin_addr.s_addr,
 		    sess->ctrl.calling_station_id);
-	u_inet_ntoa(conn->lns_addr.sin_addr.s_addr,
+	u_inet_ntoa(conn->host_addr.sin_addr.s_addr,
 		    sess->ctrl.called_station_id);
 	sess->timeout_timer.expire = l2tp_session_timeout;
 	sess->timeout_timer.period = conf_timeout * 1000;
@@ -822,7 +822,7 @@ static struct l2tp_conn_t *l2tp_tunnel_alloc(const struct sockaddr_in *peer,
 					     int lns_mode)
 {
 	struct l2tp_conn_t *conn;
-	socklen_t lnsaddrlen = sizeof(conn->lns_addr);
+	socklen_t hostaddrlen = sizeof(conn->host_addr);
 	uint16_t tid;
 	int flag;
 
@@ -901,13 +901,13 @@ static struct l2tp_conn_t *l2tp_tunnel_alloc(const struct sockaddr_in *peer,
 		goto out_err;
 	}
 
-	if (getsockname(conn->hnd.fd, &conn->lns_addr, &lnsaddrlen) < 0) {
+	if (getsockname(conn->hnd.fd, &conn->host_addr, &hostaddrlen) < 0) {
 		log_error("l2tp: getsockname: %s\n", strerror(errno));
 		goto out_err;
 	}
-	if (lnsaddrlen != sizeof(conn->lns_addr)) {
+	if (hostaddrlen != sizeof(conn->host_addr)) {
 		log_error("l2tp: getsockname: invalid address length: %i\n",
-			  lnsaddrlen);
+			  hostaddrlen);
 		goto out_err;
 	}
 
-- 
cgit v1.2.3