Raise a bus alert when a received message contains unknown SPIs

diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index 4bde2434bd77edef9e9a5d6bf0ec7b158b12e828..c732b8c92d0c91211e588dd7315211e553daf98e 100644 (file)
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -92,6 +92,8 @@ enum alert_t {
        ALERT_PEER_ADDR_FAILED,
        /** peer did not respond to initial message, current try (int, 0-based) */
        ALERT_PEER_INIT_UNREACHABLE,
+       /** received IKE message with invalid SPI, argument is message_t* */
+       ALERT_INVALID_IKE_SPI,
 };
 
 /**

diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
index a396235c2dd2ff85edfe0fd5d3a468c38a8784bc..cccf5d0d1f38485318c2cf6aa7650c30010f0310 100644 (file)
--- a/src/libcharon/sa/ike_sa_manager.c
+++ b/src/libcharon/sa/ike_sa_manager.c
@@ -1274,6 +1274,10 @@ METHOD(ike_sa_manager_t, checkout_by_message, ike_sa_t*,
                }
                unlock_single_segment(this, segment);
        }
+       else
+       {
+               charon->bus->alert(charon->bus, ALERT_INVALID_IKE_SPI, message);
+       }
        id->destroy(id);
        charon->bus->set_sa(charon->bus, ike_sa);
        return ike_sa;