From: Martin Willi <martin@revosec.ch>
Date: Wed, 10 Nov 2010 15:30:25 +0000 (+0100)
Subject: Handle all error notifies in CREATE_CHILD_SA exchanges
X-Git-Tag: 4.5.1~292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7099aa24effb0b88f1667953daba7f917655afe;p=thirdparty%2Fstrongswan.git

Handle all error notifies in CREATE_CHILD_SA exchanges
---

diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/tasks/child_create.c
index f971f88596..02831b0047 100644
--- a/src/libcharon/sa/tasks/child_create.c
+++ b/src/libcharon/sa/tasks/child_create.c
@@ -1110,7 +1110,21 @@ METHOD(task_t, process_i, status_t,
 					return NEED_MORE;
 				}
 				default:
+				{
+					if (message->get_exchange_type(message) == CREATE_CHILD_SA)
+					{	/* handle notifies if not handled in IKE_AUTH */
+						if (type <= 16383)
+						{
+							DBG1(DBG_IKE, "received %N notify error",
+								 notify_type_names, type);
+							enumerator->destroy(enumerator);
+							return SUCCESS;
+						}
+						DBG2(DBG_IKE, "received %N notify",
+							 notify_type_names, type);
+					}
 					break;
+				}
 			}
 		}
 	}