ike: Remove special handling for routed CHILD_SAs during reauth/reestablish

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).

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 381435688b65776af2d743e99cbc3cdcf9e16238..6005b8971b2280efc879ba7e0ed368042af9ea6d 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -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 */