X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/e48cb2390b22683deb1a0fab8c01e79d3fa908ba..3b6cfeb9a24f60d0cbfd83456124142594f3414a:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 5385955..9861e88 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -1413,7 +1413,7 @@ void processipout(uint8_t *buf, int len)
 	groupidt g;
 	sessiont *sp;
 	tunnelidt t;
-	in_addr_t ip;
+	in_addr_t ip, ip_src;
 
 	uint8_t *data = buf;	// Keep a copy of the originals.
 	int size = len;
@@ -1446,10 +1446,11 @@ void processipout(uint8_t *buf, int len)
 		return;
 	}
 
+	ip_src = *(uint32_t *)(buf + 12);
 	ip = *(uint32_t *)(buf + 16);
 	if ((g = grp_groupbyip(ip)))
 	{
-		s = grp_getnextsession(g, ip);
+		s = grp_getnextsession(g, ip, ip_src);
 		if (!s)
 		{
 			// Is this a packet for a session that doesn't exist?
@@ -3248,7 +3249,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexu
 
 					// Set multilink options before sending initial LCP packet
 					sess_local[s].mp_mrru = 1614;
-					sess_local[s].mp_epdis = ntohl(config->iftun_n_address[tunnel[t].indexudp] ? config->iftun_n_address[tunnel[t].indexudp] : my_address);
+					sess_local[s].mp_epdis = ntohl(config->iftun_address ? config->iftun_address : my_address);
 
 					sendlcp(s, t);
 					change_state(s, lcp, RequestSent);