- processing of incoming message in worker thread programmed

Source/charon/daemon.c

@@ -217,7 +217,7 @@ static void register_signals()
 static status_t initialize_globals()
 {
  	/* initialize global object */
- 	global_socket = socket_create(4600);
+ 	global_socket = socket_create(4500);
  	global_ike_sa_manager = ike_sa_manager_create();
  	global_job_queue = job_queue_create();
  	global_event_queue = event_queue_create();

Source/charon/message.c

@@ -363,10 +363,10 @@ static status_t generate(private_message_t *this, packet_t **packet)
 }
 
 /**
- * Implements message_t's parse_header function.
+ * Implements message_t's parse_and_verify_header function.
- * See #message_s.parse_header.
+ * See #message_s.parse_and_verify_header.
  */
-static status_t parse_header (private_message_t *this)
+static status_t parse_and_verify_header (private_message_t *this)
 {
 	ike_header_t *ike_header;
 	status_t status;
@@ -378,6 +378,36 @@ static status_t parse_header (private_message_t *this)
 		return status;
 		
 	}
+	if (this->ike_sa_id != NULL)
+	{
+		this->ike_sa_id->destroy(this->ike_sa_id);
+	}
+	this->original_initiator = (!ike_header->get_initiator_flag(ike_header));
+	
+	this->ike_sa_id = ike_sa_id_create(ike_header->get_initiator_spi(ike_header),ike_header->get_responder_spi(ike_header),this->original_initiator);
+	if (this->ike_sa_id == NULL)
+	{
+		ike_header->destroy(ike_header);
+		return OUT_OF_RES;
+	}
+	this->exchange_type = ike_header->get_exchange_type(ike_header);
+	this->message_id = ike_header->get_message_id(ike_header);
+	this->is_request = (!ike_header->get_response_flag(ike_header));
+	if ((ike_header->get_initiator_spi(ike_header) == 0) && (ike_header->get_initiator_spi(ike_header) != 0))
+	{
+		/* initiator spi not set */
+		ike_header->destroy(ike_header);		
+		return VERIFY_ERROR;
+	}
+	if (!((ike_header->get_maj_version(ike_header) == 2) && (ike_header->get_min_version(ike_header) == 0)))
+	{
+		/* version not supported */
+		ike_header->destroy(ike_header);		
+		return NOT_SUPPORTED;	
+	}
+
+
+
 	ike_header->destroy(ike_header);	
 	return SUCCESS;	
 }
@@ -443,7 +473,7 @@ message_t *message_create_from_packet(packet_t *packet)
 	this->public.get_source = (status_t (*) (message_t*,host_t**)) get_source;
 	this->public.set_destination = (status_t (*) (message_t*,host_t*)) set_destination;
 	this->public.get_destination = (status_t (*) (message_t*,host_t**)) get_destination;
-	this->public.parse_header = 	(status_t (*) (message_t *)) parse_header;
+	this->public.parse_and_verify_header = 	(status_t (*) (message_t *)) parse_and_verify_header;
 	this->public.destroy = (status_t(*)(message_t*))destroy;
 		
 	/* public values */

Source/charon/message.h

@@ -160,7 +160,7 @@ struct message_s {
 	 */
 
 	/**
-	 * @brief Parses header of message
+	 * @brief Parses and verifies header of message
 	 *
 	 * @param this 		message_t object
 	 * @return
@@ -168,8 +168,9 @@ struct message_s {
 	 * 					- NOT_SUPPORTED if payload_type is not supported
 	 *					- OUT_OF_RES if out of ressources
 	 *					- PARSE_ERROR if corrupted/invalid data found
+	 * 					- VERIFY_ERROR if header contains wrong values
 	 */
-	status_t (*parse_header) (message_t *this);
+	status_t (*parse_and_verify_header) (message_t *this);
 	
 	status_t (*generate) (message_t *this, packet_t **packet);
 	status_t (*get_source) (message_t *this, host_t **host);

Source/charon/thread_pool.c

@@ -89,6 +89,9 @@ static void job_processing(private_thread_pool_t *this)
 			{
 				packet_t *packet;
 				message_t *message;
+				ike_sa_t *ike_sa;
+				ike_sa_id_t *ike_sa_id;
+				status_t status;
 				incoming_packet_job_t *incoming_packet_job = (incoming_packet_job_t *)job;
 				
 				if (incoming_packet_job->get_packet(incoming_packet_job,&packet) != SUCCESS)
@@ -103,8 +106,42 @@ static void job_processing(private_thread_pool_t *this)
 					packet->destroy(packet);
 					break;					
 				}
+				status = message->parse_and_verify_header(message);
+				if (status != SUCCESS)
+				{
+					this->logger->log(this->logger, CONTROL_MORE, "thread %u: Message header could not be verified!", pthread_self());				
+					message->destroy(message);
+					break;										
+				}
+				status = message->get_ike_sa_id(message,&ike_sa_id);
+				if (status != SUCCESS)
+				{
+					this->logger->log(this->logger, CONTROL_MORE, "thread %u: IKE SA ID of message could not be created!", pthread_self());
+					message->destroy(message);
+					break;
+				}
+				
+				status = global_ike_sa_manager->checkout(global_ike_sa_manager,ike_sa_id, &ike_sa);
+				if (status != SUCCESS)
+				{
+					this->logger->log(this->logger, CONTROL_MORE, "thread %u: IKE SA could not be checked out", pthread_self());
+					message->destroy(message);
+					break;
+				}				
+				
+				status = ike_sa->process_message (ike_sa,message);				
+				if (status != SUCCESS)
+				{
+					this->logger->log(this->logger, CONTROL_MORE, "thread %u: Message could not be processed by IKE SA", pthread_self());
+				}
+				
+				status = global_ike_sa_manager->checkin(global_ike_sa_manager,ike_sa);
+				{
+					this->logger->log(this->logger, CONTROL_MORE, "thread %u: Checkin of IKE SA return errors", pthread_self());
+				}
+				message->destroy(message);
+				ike_sa_id->destroy(ike_sa_id);				
 				
-				//global_ike_sa_manager->checkout
 				break;
 			}
 			case INITIATE_IKE_SA:

Source/charon/types.h

@@ -36,6 +36,7 @@ typedef enum status_e {
 	INVALID_ARG,
 	NOT_FOUND,
 	PARSE_ERROR,
+	VERIFY_ERROR,
 	INVALID_STATE
 } status_t;