ike: Remove special handling for routed CHILD_SAs during reauth/reestablish
authorTobias Brunner <tobias@strongswan.org>
Tue, 10 Apr 2018 09:43:40 +0000 (11:43 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 12 Apr 2018 14:30:28 +0000 (16:30 +0200)
These are managed in the trap manager, no trap policies will ever be
attached to an IKE_SA (might have been the case in very early releases).

src/libcharon/sa/ike_sa.c

index 3814356..6005b89 100644 (file)
@@ -1930,21 +1930,7 @@ static status_t reestablish_children(private_ike_sa_t *this, ike_sa_t *new,
        {
                if (force)
                {
-                       switch (child_sa->get_state(child_sa))
-                       {
-                               case CHILD_ROUTED:
-                               {       /* move routed child directly */
-                                       remove_child_sa(this, enumerator);
-                                       new->add_child_sa(new, child_sa);
-                                       action = ACTION_NONE;
-                                       break;
-                               }
-                               default:
-                               {       /* initiate/queue all other CHILD_SAs */
-                                       action = ACTION_RESTART;
-                                       break;
-                               }
-                       }
+                       action = ACTION_RESTART;
                }
                else
                {       /* only restart CHILD_SAs that are configured accordingly */