Merge branch 'master' into samesversion

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 77c302c..9ac6bfd 100644 (file)
--- 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;
 
                                        // 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);
 
                                        sendlcp(s, t);
                                        change_state(s, lcp, RequestSent);


@@ -5491,7 +5491,7 @@ static void update_config()
 
                while (*shost && (shost < e))
                {
 
                while (*shost && (shost < e))
                {

-                       while ((n < e) && (*n == ' ' || *n == '\t')) n++;
+                       while ((n < e) && (*n == ' ' || *n == ',' || *n == '\t')) n++;

 
                        i = 0;
                        while (n < e && (*n != ',') && (*n != '\t'))
 
                        i = 0;
                        while (n < e && (*n != ',') && (*n != '\t'))


@@ -5499,6 +5499,7 @@ static void update_config()
                                config->multi_n_hostname[config->nbmultihostname][i] = *n;
                                n++;i++;
                        }
                                config->multi_n_hostname[config->nbmultihostname][i] = *n;
                                n++;i++;
                        }

+

                        if (i > 0)
                        {
                                config->multi_n_hostname[config->nbmultihostname][i] = 0;
                        if (i > 0)
                        {
                                config->multi_n_hostname[config->nbmultihostname][i] = 0;