From: fendo <fendo@bi12info.com>
Date: Mon, 10 Jun 2013 13:04:43 +0000 (+0200)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.12~4
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/14031c41a5c8e4e2513c6bfd65d5019da7611156?hp=f6b5140de23dd17f9a9c28fcca0fcef58b161a78

Merge branch 'master' into samesversion
---

diff --git a/l2tpns.c b/l2tpns.c
index 5385955..9ac6bfd 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -3248,7 +3248,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);