- works with new proposal code

- still some(!) memleaks

Source/charon/encoding/generator.c

@@ -633,7 +633,7 @@ static void write_to_chunk (private_generator_t *this,chunk_t *data)
 	memcpy(data->ptr,this->buffer,data_length);
 	data->len = data_length;
 	
-	this->logger->log_chunk(this->logger, RAW, "generated data of this parser", data);
+	this->logger->log_chunk(this->logger, RAW|LEVEL3, "generated data of this generator", data);
 }
 
 /**
@@ -1017,7 +1017,7 @@ static void generate_payload (private_generator_t *this,payload_t *payload)
 				return;
 		}
 	}
-	this->logger->log_bytes(this->logger, RAW|LEVEL1, "generated data for this payload",
+	this->logger->log_bytes(this->logger, RAW|LEVEL3, "generated data for this payload",
 							payload_start, this->out_position-payload_start);
 }
 

Source/charon/encoding/parser.c

@@ -595,7 +595,7 @@ static status_t parse_payload(private_parser_t *this, payload_type_t payload_typ
 						mapping_find(payload_type_m, payload_type),
 						this->input_roof-this->byte_pos);
 	
-	this->logger->log_bytes(this->logger, RAW, "parsing payload from", this->byte_pos, 
+	this->logger->log_bytes(this->logger, RAW|LEVEL3, "parsing payload from", this->byte_pos, 
 								this->input_roof-this->byte_pos);
 	
 	if (pld->get_type(pld) == UNKNOWN_PAYLOAD)

Source/charon/encoding/payloads/proposal_substructure.c

@@ -569,7 +569,6 @@ proposal_substructure_t *proposal_substructure_create_from_child_proposal(child_
 	this->proposal_number = proposal->get_number(proposal);
 	this->protocol_id = proto;
 	
-	
 	/* encryption algorithm is only availble in ESP */
 	iterator = proposal->create_algorithm_iterator(proposal, proto, ENCRYPTION_ALGORITHM);
 	while (iterator->has_next(iterator))

Source/charon/encoding/payloads/sa_payload.c

@@ -545,7 +545,7 @@ sa_payload_t *sa_payload_create_from_ike_proposals(ike_proposal_t *proposals, si
 /*
  * Described in header.
  */
-sa_payload_t *sa_payload_create_from_child_proposals(linked_list_t *proposals)
+sa_payload_t *sa_payload_create_from_child_proposal_list(linked_list_t *proposals)
 {
 	iterator_t *iterator;
 	child_proposal_t *proposal;
@@ -561,3 +561,15 @@ sa_payload_t *sa_payload_create_from_child_proposals(linked_list_t *proposals)
 	
 	return sa_payload;
 }
+
+/*
+ * Described in header.
+ */
+sa_payload_t *sa_payload_create_from_child_proposal(child_proposal_t *proposal)
+{
+	sa_payload_t *sa_payload = sa_payload_create();
+	
+	add_child_proposal((private_sa_payload_t*)sa_payload, proposal);
+	
+	return sa_payload;
+}

Source/charon/encoding/payloads/sa_payload.h

@@ -151,6 +151,8 @@ sa_payload_t *sa_payload_create();
  */
 sa_payload_t *sa_payload_create_from_ike_proposals(ike_proposal_t *proposals, size_t proposal_count);
 
-sa_payload_t *sa_payload_create_from_child_proposals(linked_list_t *proposals);
+sa_payload_t *sa_payload_create_from_child_proposal_list(linked_list_t *proposals);
+
+sa_payload_t *sa_payload_create_from_child_proposal(child_proposal_t *proposal);
 
 #endif /*SA_PAYLOAD_H_*/