4 files changed, 10 insertions, 62 deletions

diff --git a/Source/charon/sa/ike_sa.c b/Source/charon/sa/ike_sa.c
index cd2a666cb..2b1fe9421 100644
--- a/Source/charon/sa/ike_sa.c
+++ b/Source/charon/sa/ike_sa.c
@@ -303,14 +303,8 @@ static status_t build_message(private_ike_sa_t *this, exchange_type_t type, bool
 	
 	new_message->set_message_id(new_message, (request) ? this->message_id_out : this->message_id_in);
 
-	status = new_message->set_ike_sa_id(new_message, this->ike_sa_id);
-	if (status != SUCCESS)
-	{
-		this->logger->log(this->logger, ERROR, "Fatal error: could not set ike_sa_id of message");
-		new_message->destroy(new_message);
-		return status;
-	}
-	
+	new_message->set_ike_sa_id(new_message, this->ike_sa_id);
+		
 	*message = new_message;
 	
 	return SUCCESS;
diff --git a/Source/charon/sa/states/ike_sa_init_requested.c b/Source/charon/sa/states/ike_sa_init_requested.c
index 2db933681..4f79143a5 100644
--- a/Source/charon/sa/states/ike_sa_init_requested.c
+++ b/Source/charon/sa/states/ike_sa_init_requested.c
@@ -120,12 +120,7 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t
 	ike_sa_id->set_responder_spi(ike_sa_id,responder_spi);
 	
 	/* iterate over incoming payloads */
-	status = message->get_payload_iterator(message, &payloads);
-	if (status != SUCCESS)
-	{
-		this->logger->log(this->logger, ERROR, "Could not create payload interator");
-		return status;	
-	}
+	message->get_payload_iterator(message, &payloads);
 	while (payloads->has_next(payloads))
 	{
 		payload_t *payload;
diff --git a/Source/charon/sa/states/initiator_init.c b/Source/charon/sa/states/initiator_init.c
index 68413c119..1ffc32447 100644
--- a/Source/charon/sa/states/initiator_init.c
+++ b/Source/charon/sa/states/initiator_init.c
@@ -318,14 +318,7 @@ static status_t build_ike_sa_init_request (private_initiator_init_t *this, messa
 	}
 	
 	this	->logger->log(this->logger, CONTROL|MOST, "add SA payload to message");
-	status = message->add_payload(message, payload);
-	if (status != SUCCESS)
-	{	
-		this->logger->log(this->logger, ERROR, "Could not add SA payload to message");
-		payload->destroy(payload);
-		message->destroy(message);
-		return status;
-	}
+	message->add_payload(message, payload);
 
 	/* build KE payload */
 	status = this->build_ke_payload(this, &payload);
@@ -337,14 +330,7 @@ static status_t build_ike_sa_init_request (private_initiator_init_t *this, messa
 	}
 
 	this	->logger->log(this->logger, CONTROL|MOST, "add KE payload to message");
-	status = message->add_payload(message, payload);
-	if (status != SUCCESS)
-	{	
-		this->logger->log(this->logger, ERROR, "Could not add KE payload to message");
-		payload->destroy(payload);
-		message->destroy(message);
-		return status;
-	}
+	message->add_payload(message, payload);
 	
 	/* build Nonce payload */
 	status = this->build_nonce_payload(this, &payload);
@@ -356,14 +342,7 @@ static status_t build_ike_sa_init_request (private_initiator_init_t *this, messa
 	}
 
 	this	->logger->log(this->logger, CONTROL|MOST, "add nonce payload to message");
-	status = message->add_payload(message, payload);
-	if (status != SUCCESS)
-	{	
-		this->logger->log(this->logger, ERROR, "Could not add nonce payload to message");
-		payload->destroy(payload);
-		message->destroy(message);
-		return status;
-	}
+	message->add_payload(message, payload);
 	
 	*request = message;
 	return SUCCESS;
diff --git a/Source/charon/sa/states/responder_init.c b/Source/charon/sa/states/responder_init.c
index 03fd08acc..0d93a5b77 100644
--- a/Source/charon/sa/states/responder_init.c
+++ b/Source/charon/sa/states/responder_init.c
@@ -202,12 +202,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
 	}
 
 	/* iterate over incoming payloads. We can be sure, the message contains only accepted payloads! */
-	status = message->get_payload_iterator(message, &payloads);
-	if (status != SUCCESS)
-	{
-		this->logger->log(this->logger, ERROR, "Fatal error: Could not get payload interator");
-		return status;
-	}
+	message->get_payload_iterator(message, &payloads);
 	
 	while (payloads->has_next(payloads))
 	{
@@ -412,12 +407,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
 	}
 	
 	this->logger->log(this->logger, CONTROL|MOST, "add SA payload to message");
-	status = response->add_payload(response, payload);
-	if (status != SUCCESS)
-	{	
-		this->logger->log(this->logger, ERROR, "Could not add SA payload to message");
-		return status;
-	}
+	response->add_payload(response, payload);
 	
 	/* build KE payload */
 	status = this->build_ke_payload(this,&payload);
@@ -428,12 +418,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
 	}
 
 	this->logger->log(this->logger, CONTROL|MOST, "add KE payload to message");
-	status = response->add_payload(response, payload);
-	if (status != SUCCESS)
-	{	
-		this->logger->log(this->logger, ERROR, "Could not add KE payload to message");
-		return status;
-	}
+	response->add_payload(response, payload);
 	
 	/* build Nonce payload */
 	status = this->build_nonce_payload(this, &payload);
@@ -444,12 +429,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
 	}
 
 	this->logger->log(this->logger, CONTROL|MOST, "add nonce payload to message");
-	status = response->add_payload(response, payload);
-	if (status != SUCCESS)
-	{	
-		this->logger->log(this->logger, ERROR, "Could not add nonce payload to message");
-		return status;
-	}
+	response->add_payload(response, payload);
 	
 	/* generate packet */	
 	this->logger->log(this->logger, CONTROL|MOST, "generate packet from message");