[Swan-commit] Changes to ref refs/heads/master

[Tuomo Soini]

New commits:
commit cc2a8ceb37528013bb132491f21663b6067b18d0
Author: Antony Antony <antony at phenome.org>
Date:   Thu Oct 20 06:21:27 2016 +0200

    ikev1: when a delete arrives for an IPSec SA scheudle REPLACE immediately.
    
        Now schedule a REPLACE immediately.
        If a parrent/ISKAMP delete arrive following this the delete of child
        A first Quick mode attempt will fail and create
        a new parent/child be established.
    
        Previously a REPLACE event was scheduled after DELETE_SA_DELAY (60s).
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>

commit 7edb44bb7af3254778a0ecb1cb55aa797b459ebd
Author: Antony Antony <antony at phenome.org>
Date:   Sat Nov 19 19:17:21 2016 +0100

    ikev2: when a delete arrives for an IPSec SA either expire/expire/delete.
    
        Instead of just deleting check if it need to be replaced or
        expired.  If replace such as auto=start. Replace it with st_margin=0
        which will replace and expire immediately.
    
        If the SA's next event is EXPIRE just expire immediately.
        Otherwise delete the state/SA.
    
    Signed-off-by: Tuomo Soini <tis at foobar.fi>