Merge branch 'multibind'

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index e8c3b52..cb39db6 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -12,9 +12,7 @@
 #include "tbf.h"
 #include "cluster.h"
 
 #include "tbf.h"
 #include "cluster.h"
 

-#ifdef LAC

 #include "l2tplac.h"
 #include "l2tplac.h"

-#endif

 #include "pppoe.h"
 
 extern tunnelt *tunnel;
 #include "pppoe.h"
 
 extern tunnelt *tunnel;


@@ -105,13 +103,11 @@ void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                LOG(3, s, t, "PAP login %s/%s\n", user, pass);
        }
 
                LOG(3, s, t, "PAP login %s/%s\n", user, pass);
        }
 

-#ifdef LAC

        if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, user))
        {
                // Creating a tunnel/session has been started
                return;
        }
        if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, user))
        {
                // Creating a tunnel/session has been started
                return;
        }

-#endif

 
        if (session[s].ip || !(r = radiusnew(s)))
        {
 
        if (session[s].ip || !(r = radiusnew(s)))
        {


@@ -264,7 +260,6 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                packet.username = calloc(l + 1, 1);
                memcpy(packet.username, p, l);
 
                packet.username = calloc(l + 1, 1);
                memcpy(packet.username, p, l);
 

-#ifdef LAC

                if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, packet.username))
                {
                        free(packet.username);
                if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, packet.username))
                {
                        free(packet.username);


@@ -272,7 +267,6 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                        // Creating a tunnel/session has been started
                        return;
                }
                        // Creating a tunnel/session has been started
                        return;
                }

-#endif

 
                run_plugins(PLUGIN_PRE_AUTH, &packet);
                if (!packet.continue_auth)
 
                run_plugins(PLUGIN_PRE_AUTH, &packet);
                if (!packet.continue_auth)


@@ -1204,24 +1198,24 @@ static void setepdis(epdist *ep1, epdist ep2)
 
 static bundleidt new_bundle()
 {
 
 static bundleidt new_bundle()
 {

-        bundleidt i;
-        for (i = 1; i < MAXBUNDLE; i++)
-        {
-                if (bundle[i].state == BUNDLEFREE)
-                {
-                        LOG(4, 0, 0, "MPPP: Assigning bundle ID %d\n", i);
-                        bundle[i].num_of_links = 1;
-                        bundle[i].last_check = time_now;        // Initialize last_check value
-                        bundle[i].state = BUNDLEOPEN;
-                        bundle[i].current_ses = -1;     // This is to enforce the first session 0 to be used at first
+       bundleidt i;
+       for (i = 1; i < MAXBUNDLE; i++)
+       {
+               if (bundle[i].state == BUNDLEFREE)
+               {
+                       LOG(4, 0, 0, "MPPP: Assigning bundle ID %d\n", i);
+                       bundle[i].num_of_links = 1;
+                       bundle[i].last_check = time_now;        // Initialize last_check value
+                       bundle[i].state = BUNDLEOPEN;
+                       bundle[i].current_ses = -1;     // This is to enforce the first session 0 to be used at first

                        memset(&frag[i], 0, sizeof(fragmentationt));
                        memset(&frag[i], 0, sizeof(fragmentationt));

-                        if (i > config->cluster_highest_bundleid)
-                                config->cluster_highest_bundleid = i;
-                        return i;
-                }
-        }
-        LOG(0, 0, 0, "MPPP: Can't find a free bundle! There shouldn't be this many in use!\n");
-        return 0;
+                       if (i > config->cluster_highest_bundleid)
+                                       config->cluster_highest_bundleid = i;
+                       return i;
+               }
+       }
+       LOG(0, 0, 0, "MPPP: Can't find a free bundle! There shouldn't be this many in use!\n");
+       return 0;

 }
 
 static void ipcp_open(sessionidt s, tunnelidt t)
 }
 
 static void ipcp_open(sessionidt s, tunnelidt t)


@@ -1769,7 +1763,7 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (!session[s].bundle || bundle[session[s].bundle].num_of_links < 2) // FIXME: 
        {
                // no spoof (do sessionbyip to handled statically routed subnets)
        if (!session[s].bundle || bundle[session[s].bundle].num_of_links < 2) // FIXME: 
        {
                // no spoof (do sessionbyip to handled statically routed subnets)

-               if (ip != session[s].ip && sessionbyip(htonl(ip)) != s)
+               if (!config->disable_no_spoof && ip != session[s].ip && sessionbyip(htonl(ip)) != s)

                {
                        LOG(4, s, t, "Dropping packet with spoofed IP %s\n", fmtaddr(htonl(ip), 0));
                        return;
                {
                        LOG(4, s, t, "Dropping packet with spoofed IP %s\n", fmtaddr(htonl(ip), 0));
                        return;


@@ -1934,7 +1928,7 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        {
                // There have a long break of the link !!!!!!!!
                // M_offset is bigger that the fragmentation buffer size
        {
                // There have a long break of the link !!!!!!!!
                // M_offset is bigger that the fragmentation buffer size

-               LOG(3, s, t, "MPPP: M_offset out of range, min:%d, begin_seq:%d, jitteravg:%d\n", Mmin, this_fragmentation->start_seq, sess_local[s].jitteravg);
+               LOG(3, s, t, "MPPP: M_offset out of range, min:%d, begin_seq:%d\n", Mmin, this_fragmentation->start_seq);

 
                // Calculate the new start index, the previous frag are lost
                begin_index = (M_offset + this_fragmentation->start_index) & MAXFRAGNUM_MASK;
 
                // Calculate the new start index, the previous frag are lost
                begin_index = (M_offset + this_fragmentation->start_index) & MAXFRAGNUM_MASK;


@@ -1951,7 +1945,7 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (frag_offset < 0)
        {
                // this packet comes before the next
        if (frag_offset < 0)
        {
                // this packet comes before the next

-               LOG(3, s, t, "MPPP: packet comes before the next, seq:%d, begin_seq:%d, size frag:%d\n", seq_num, this_fragmentation->start_seq, l);
+               LOG(3, s, t, "MPPP: (COMES BEFORE) the next, seq:%d, begin_seq:%d, size_frag:%d, flags:%02X is LOST\n", seq_num, this_fragmentation->start_seq, l, flags);

                return;
        }
 
                return;
        }
 


@@ -1959,7 +1953,7 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
        if (frag_offset >= MAXFRAGNUM)
        {
                // frag_offset is bigger that the fragmentation buffer size
        if (frag_offset >= MAXFRAGNUM)
        {
                // frag_offset is bigger that the fragmentation buffer size

-               LOG(3, s, t, "MPPP: Index out of range, seq:%d, begin_seq:%d, jitteravg:%d\n", seq_num, this_fragmentation->start_seq, sess_local[s].jitteravg);
+               LOG(3, s, t, "MPPP: Index out of range, seq:%d, begin_seq:%d\n", seq_num, this_fragmentation->start_seq);

                return;
        }
 
                return;
        }
 


@@ -1971,8 +1965,8 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
        if (this_frag->length > 0)
                // This fragment is lost, It was around the buffer and it was never completed the packet.
 
        if (this_frag->length > 0)
                // This fragment is lost, It was around the buffer and it was never completed the packet.

-               LOG(3, this_frag->sid, this_frag->tid, "MPPP: (INSERT) seq_num:%d frag_index:%d flags:%d jitteravg:%d is LOST\n",
-                       this_frag->seq, frag_index, this_frag->flags, this_frag->jitteravg);
+               LOG(3, this_frag->sid, this_frag->tid, "MPPP: (INSERT) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+                       this_frag->seq, frag_index, this_frag->flags);

 
        this_frag->length = l;
        this_frag->sid = s;
 
        this_frag->length = l;
        this_frag->sid = s;


@@ -2001,9 +1995,9 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                {
                        // This fragment is lost, It was around the buffer and it was never completed the packet.
                        LOG(3, this_fragmentation->fragment[frag_index_next].sid, this_fragmentation->fragment[frag_index_next].tid,
                {
                        // This fragment is lost, It was around the buffer and it was never completed the packet.
                        LOG(3, this_fragmentation->fragment[frag_index_next].sid, this_fragmentation->fragment[frag_index_next].tid,

-                               "MPPP: (NEXT) seq_num:%d frag_index:%d flags:%d jitteravg:%d is LOST\n",
+                               "MPPP: (NEXT) seq_num:%d frag_index:%d flags:%02X is LOST\n",

                                this_fragmentation->fragment[frag_index_next].seq, frag_index_next,
                                this_fragmentation->fragment[frag_index_next].seq, frag_index_next,

-                               this_fragmentation->fragment[frag_index_next].flags, this_fragmentation->fragment[frag_index_next].jitteravg);
+                               this_fragmentation->fragment[frag_index_next].flags);

                        // this frag is lost
                        this_fragmentation->fragment[frag_index_next].length = 0;
                        this_fragmentation->fragment[frag_index_next].flags = 0;
                        // this frag is lost
                        this_fragmentation->fragment[frag_index_next].length = 0;
                        this_fragmentation->fragment[frag_index_next].flags = 0;


@@ -2020,9 +2014,9 @@ void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                {
                        // This fragment is lost, It was around the buffer and it was never completed the packet.
                        LOG(3, this_fragmentation->fragment[frag_index_prev].sid, this_fragmentation->fragment[frag_index_prev].tid,
                {
                        // This fragment is lost, It was around the buffer and it was never completed the packet.
                        LOG(3, this_fragmentation->fragment[frag_index_prev].sid, this_fragmentation->fragment[frag_index_prev].tid,

-                               "MPPP: (PREV) seq_num:%d frag_index:%d flags:%d jitteravg:%d is LOST\n",
+                               "MPPP: (PREV) seq_num:%d frag_index:%d flags:%02X is LOST\n",

                                this_fragmentation->fragment[frag_index_prev].seq, frag_index_prev,
                                this_fragmentation->fragment[frag_index_prev].seq, frag_index_prev,

-                               this_fragmentation->fragment[frag_index_prev].flags, this_fragmentation->fragment[frag_index_prev].jitteravg);
+                               this_fragmentation->fragment[frag_index_prev].flags);

 
                        this_fragmentation->fragment[frag_index_prev].length = 0;
                        this_fragmentation->fragment[frag_index_prev].flags = 0;
 
                        this_fragmentation->fragment[frag_index_prev].length = 0;
                        this_fragmentation->fragment[frag_index_prev].flags = 0;


@@ -2066,9 +2060,9 @@ find_frame:
                                                        {
                                                                // This fragment is lost, it was never completed the packet.
                                                                LOG(3, this_fragmentation->fragment[end_index].sid, this_fragmentation->fragment[end_index].tid,
                                                        {
                                                                // This fragment is lost, it was never completed the packet.
                                                                LOG(3, this_fragmentation->fragment[end_index].sid, this_fragmentation->fragment[end_index].tid,

-                                                                       "MPPP: (FIND END) seq_num:%d frag_index:%d flags:%d jitteravg:%d is LOST\n",
+                                                                       "MPPP: (FIND END) seq_num:%d frag_index:%d flags:%02X is LOST\n",

                                                                        this_fragmentation->fragment[end_index].seq, begin_index,
                                                                        this_fragmentation->fragment[end_index].seq, begin_index,

-                                                                       this_fragmentation->fragment[end_index].flags, this_fragmentation->fragment[end_index].jitteravg);
+                                                                       this_fragmentation->fragment[end_index].flags);

                                                                // this frag is lost
                                                                this_fragmentation->fragment[end_index].length = 0;
                                                                this_fragmentation->fragment[end_index].flags = 0;
                                                                // this frag is lost
                                                                this_fragmentation->fragment[end_index].length = 0;
                                                                this_fragmentation->fragment[end_index].flags = 0;


@@ -2097,9 +2091,9 @@ find_frame:
                        {
                                // This fragment is lost, it was never completed the packet.
                                LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,
                        {
                                // This fragment is lost, it was never completed the packet.
                                LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,

-                                       "MPPP: (FIND BEGIN) seq_num:%d frag_index:%d flags:%d jitteravg:%d is LOST\n",
+                                       "MPPP: (FIND BEGIN) seq_num:%d frag_index:%d flags:%02X is LOST\n",

                                        this_fragmentation->fragment[begin_index].seq, begin_index,
                                        this_fragmentation->fragment[begin_index].seq, begin_index,

-                                       this_fragmentation->fragment[begin_index].flags, this_fragmentation->fragment[begin_index].jitteravg);
+                                       this_fragmentation->fragment[begin_index].flags);

                                // this frag is lost
                                this_fragmentation->fragment[begin_index].length = 0;
                                this_fragmentation->fragment[begin_index].flags = 0;
                                // this frag is lost
                                this_fragmentation->fragment[begin_index].length = 0;
                                this_fragmentation->fragment[begin_index].flags = 0;


@@ -2117,6 +2111,10 @@ assembling_frame:
        {
                if (!(this_fragmentation->fragment[begin_index].flags & MP_BEGIN))
                {
        {
                if (!(this_fragmentation->fragment[begin_index].flags & MP_BEGIN))
                {

+                       LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,
+                               "MPPP: (NOT BEGIN) seq_num:%d frag_index:%d flags:%02X\n",
+                               this_fragmentation->fragment[begin_index].seq, begin_index,
+                               this_fragmentation->fragment[begin_index].flags);

                        // should occur only after an "M_Offset out of range"
                        // The start sequence must be a begin sequence
                        this_fragmentation->start_index = (begin_index +1) & MAXFRAGNUM_MASK;
                        // should occur only after an "M_Offset out of range"
                        // The start sequence must be a begin sequence
                        this_fragmentation->start_index = (begin_index +1) & MAXFRAGNUM_MASK;


@@ -2195,9 +2193,9 @@ assembling_frame:
                (this_fragmentation->fragment[begin_index].seq != this_fragmentation->start_seq))
        {
                LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,
                (this_fragmentation->fragment[begin_index].seq != this_fragmentation->start_seq))
        {
                LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,

-                               "MPPP: (START) seq_num:%d frag_index:%d flags:%d jitteravg:%d is LOST\n",
+                               "MPPP: (START) seq_num:%d frag_index:%d flags:%02X is LOST\n",

                                this_fragmentation->fragment[begin_index].seq, begin_index,
                                this_fragmentation->fragment[begin_index].seq, begin_index,

-                               this_fragmentation->fragment[begin_index].flags, this_fragmentation->fragment[begin_index].jitteravg);
+                               this_fragmentation->fragment[begin_index].flags);

                        this_fragmentation->fragment[begin_index].length = 0;
                        this_fragmentation->fragment[begin_index].flags = 0;
        }
                        this_fragmentation->fragment[begin_index].length = 0;
                        this_fragmentation->fragment[begin_index].flags = 0;
        }


@@ -2240,7 +2238,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
                return;
 
        // no spoof
                return;
 
        // no spoof

-       if (ipv4 != session[s].ip && memcmp(&config->ipv6_prefix, &ip, 8) && sessionbyipv6(ip) != s)
+       if ((ipv4 != session[s].ip || memcmp(&config->ipv6_prefix, &ip, 8)) && sessionbyipv6(ip) != s)

        {
                char str[INET6_ADDRSTRLEN];
                LOG(5, s, t, "Dropping packet with spoofed IP %s\n",
        {
                char str[INET6_ADDRSTRLEN];
                LOG(5, s, t, "Dropping packet with spoofed IP %s\n",