attribute-manager: Pass full IKE_SA to handler methods

src/libcharon/sa/ike_sa.c

@@ -2347,7 +2347,7 @@ METHOD(ike_sa_t, destroy, void,
 		if (entry.handler)
 		{
 			charon->attributes->release(charon->attributes, entry.handler,
-										this->other_id, entry.type, entry.data);
+										&this->public, entry.type, entry.data);
 		}
 		free(entry.data.ptr);
 	}

src/libcharon/sa/ikev1/tasks/mode_config.c

@@ -136,8 +136,7 @@ static void handle_attribute(private_mode_config_t *this,
 
 	/* and pass it to the handle function */
 	handler = charon->attributes->handle(charon->attributes,
-							this->ike_sa->get_other_id(this->ike_sa), handler,
-							ca->get_type(ca), ca->get_chunk(ca));
+					this->ike_sa, handler, ca->get_type(ca), ca->get_chunk(ca));
 	this->ike_sa->add_configuration_attribute(this->ike_sa,
 							handler, ca->get_type(ca), ca->get_chunk(ca));
 }
@@ -326,8 +325,7 @@ static status_t build_request(private_mode_config_t *this, message_t *message)
 	}
 
 	enumerator = charon->attributes->create_initiator_enumerator(
-								charon->attributes,
-								this->ike_sa->get_other_id(this->ike_sa), vips);
+										charon->attributes, this->ike_sa, vips);
 	while (enumerator->enumerate(enumerator, &handler, &type, &data))
 	{
 		add_attribute(this, cp, type, data, handler);

src/libcharon/sa/ikev2/tasks/ike_config.c

@@ -127,8 +127,7 @@ static void handle_attribute(private_ike_config_t *this,
 
 	/* and pass it to the handle function */
 	handler = charon->attributes->handle(charon->attributes,
-							this->ike_sa->get_other_id(this->ike_sa), handler,
-							ca->get_type(ca), ca->get_chunk(ca));
+					this->ike_sa, handler, ca->get_type(ca), ca->get_chunk(ca));
 	this->ike_sa->add_configuration_attribute(this->ike_sa,
 							handler, ca->get_type(ca), ca->get_chunk(ca));
 }
@@ -274,8 +273,7 @@ METHOD(task_t, build_i, status_t,
 		}
 
 		enumerator = charon->attributes->create_initiator_enumerator(
-								charon->attributes,
-								this->ike_sa->get_other_id(this->ike_sa), vips);
+										charon->attributes, this->ike_sa, vips);
 		while (enumerator->enumerate(enumerator, &handler, &type, &data))
 		{
 			configuration_attribute_t *ca;