iked ikev2_ikesa_enable is not copying sa_eapid

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

iked ikev2_ikesa_enable is not copying sa_eapid

Bernardo Vieira
Hi,
inside the function ikev2_ikesa_enable the atribute sa_eapid should
be copied to the new sa.
Regards,
Bernardo

Index: ikev2.c
===================================================================
RCS file: /cvs/src/sbin/iked/ikev2.c,v
retrieving revision 1.203
diff -u -p -r1.203 ikev2.c
--- ikev2.c     27 Mar 2020 12:20:48 -0000      1.203
+++ ikev2.c     27 Mar 2020 13:11:28 -0000
@@ -3860,7 +3860,10 @@ ikev2_ikesa_enable(struct iked *env, str
                nsa->sa_tag = sa->sa_tag;
                sa->sa_tag = NULL;
        }
-
+       if (sa->sa_eapid) {
+               nsa->sa_eapid = sa->sa_eapid;
+               sa->sa_eapid = NULL;
+       }
        log_debug("%s: activating new IKE SA", __func__);
        sa_state(env, nsa, IKEV2_STATE_ESTABLISHED);
        ikev2_enable_timer(env, nsa);

Reply | Threaded
Open this post in threaded view
|

Re: iked ikev2_ikesa_enable is not copying sa_eapid

Tobias Heider-2
On Fri, Mar 27, 2020 at 10:39:52AM -0300, Bernardo Vieira wrote:
> Hi,
> inside the function ikev2_ikesa_enable the atribute sa_eapid should
> be copied to the new sa.
> Regards,
> Bernardo

Looks correct, thank you. Committed!

>
> Index: ikev2.c
> ===================================================================
> RCS file: /cvs/src/sbin/iked/ikev2.c,v
> retrieving revision 1.203
> diff -u -p -r1.203 ikev2.c
> --- ikev2.c     27 Mar 2020 12:20:48 -0000      1.203
> +++ ikev2.c     27 Mar 2020 13:11:28 -0000
> @@ -3860,7 +3860,10 @@ ikev2_ikesa_enable(struct iked *env, str
>                 nsa->sa_tag = sa->sa_tag;
>                 sa->sa_tag = NULL;
>         }
> -
> +       if (sa->sa_eapid) {
> +               nsa->sa_eapid = sa->sa_eapid;
> +               sa->sa_eapid = NULL;
> +       }
>         log_debug("%s: activating new IKE SA", __func__);
>         sa_state(env, nsa, IKEV2_STATE_ESTABLISHED);
>         ikev2_enable_timer(env, nsa);
>