Raise an ALERT_PROPOSAL_MISMATCH_IKE also when receiving NO_PROPOSAL_CHOSEN
authorMartin Willi <martin@revosec.ch>
Wed, 17 Apr 2013 09:46:12 +0000 (11:46 +0200)
committerMartin Willi <martin@revosec.ch>
Mon, 6 May 2013 12:56:50 +0000 (14:56 +0200)
src/libcharon/sa/ikev2/tasks/ike_init.c

index 7542937..278bdc3 100644 (file)
@@ -420,6 +420,25 @@ METHOD(task_t, build_r, status_t,
        return SUCCESS;
 }
 
+/**
+ * Raise alerts for received notify errors
+ */
+static void raise_alerts(private_ike_init_t *this, notify_type_t type)
+{
+       linked_list_t *list;
+
+       switch (type)
+       {
+               case NO_PROPOSAL_CHOSEN:
+                       list = this->config->get_proposals(this->config);
+                       charon->bus->alert(charon->bus, ALERT_PROPOSAL_MISMATCH_IKE, list);
+                       list->destroy_offset(list, offsetof(proposal_t, destroy));
+                       break;
+               default:
+                       break;
+       }
+}
+
 METHOD(task_t, process_i, status_t,
        private_ike_init_t *this, message_t *message)
 {
@@ -482,6 +501,7 @@ METHOD(task_t, process_i, status_t,
                                                DBG1(DBG_IKE, "received %N notify error",
                                                         notify_type_names, type);
                                                enumerator->destroy(enumerator);
+                                               raise_alerts(this, type);
                                                return FAILED;
                                        }
                                        DBG2(DBG_IKE, "received %N notify",