Merge from master

[l2tpns.git] / grpsess.c

diff --git a/grpsess.c b/grpsess.c
index 7f897b3..e710709 100644 (file)
--- a/grpsess.c
+++ b/grpsess.c
@@ -551,7 +551,13 @@ sessionidt grp_getnextsession(groupidt g, in_addr_t ip)
 
        if ((s = sessionbyip(ip)))
        {
 
        if ((s = sessionbyip(ip)))
        {

-               if (s == grpsession[g].smax)
+               if (g != grp_groupbysession(s))
+               {
+                       // This session does not belong to this group
+                       LOG(2, s, session[s].tunnel, "Warning, the session does not belong to group %d\n", g);
+                       s = 0;
+               }
+               else if (s == grpsession[g].smax)

                {
                        s = grpsession[g].smin;
                        grpsession[g].smax = 0;
                {
                        s = grpsession[g].smin;
                        grpsession[g].smax = 0;