Don't update an IKE_SA-entry's cached message ID when handling fragments

diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
index 031c632eb6886922ffabb7940927bf3a9e58a143..962787647698e045dc07f2539695eea7bddf67a2 100644 (file)
--- a/src/libcharon/sa/ike_sa_manager.c
+++ b/src/libcharon/sa/ike_sa_manager.c
@@ -1280,7 +1280,10 @@ METHOD(ike_sa_manager_t, checkout_by_message, ike_sa_t*,
 
                        ike_id = entry->ike_sa->get_id(entry->ike_sa);
                        entry->checked_out = TRUE;
-                       entry->message_id = message->get_message_id(message);
+                       if (message->get_first_payload_type(message) != FRAGMENT_V1)
+                       {
+                               entry->message_id = message->get_message_id(message);
+                       }
                        if (ike_id->get_responder_spi(ike_id) == 0)
                        {
                                ike_id->set_responder_spi(ike_id, id->get_responder_spi(id));