ike: Publish getter for the current message ID on IKE_SA

This commit is contained in:
Tobias Brunner
2017-02-08 15:03:25 +01:00
parent 05a2be82c2
commit 347c403cf6
2 changed files with 19 additions and 1 deletions
+7
View File
@@ -617,6 +617,12 @@ METHOD(ike_sa_t, set_message_id, void,
} }
} }
METHOD(ike_sa_t, get_message_id, uint32_t,
private_ike_sa_t *this, bool initiate)
{
return this->task_manager->get_mid(this->task_manager, initiate);
}
METHOD(ike_sa_t, send_keepalive, void, METHOD(ike_sa_t, send_keepalive, void,
private_ike_sa_t *this, bool scheduled) private_ike_sa_t *this, bool scheduled)
{ {
@@ -2885,6 +2891,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator,
.get_other_host = _get_other_host, .get_other_host = _get_other_host,
.set_other_host = _set_other_host, .set_other_host = _set_other_host,
.set_message_id = _set_message_id, .set_message_id = _set_message_id,
.get_message_id = _get_message_id,
.float_ports = _float_ports, .float_ports = _float_ports,
.update_hosts = _update_hosts, .update_hosts = _update_hosts,
.get_my_id = _get_my_id, .get_my_id = _get_my_id,
+12 -1
View File
@@ -554,7 +554,7 @@ struct ike_sa_t {
void (*set_proposal)(ike_sa_t *this, proposal_t *proposal); void (*set_proposal)(ike_sa_t *this, proposal_t *proposal);
/** /**
* Set the message id of the IKE_SA. * Set the message ID of the IKE_SA.
* *
* The IKE_SA stores two message IDs, one for initiating exchanges (send) * The IKE_SA stores two message IDs, one for initiating exchanges (send)
* and one to respond to exchanges (expect). * and one to respond to exchanges (expect).
@@ -564,6 +564,17 @@ struct ike_sa_t {
*/ */
void (*set_message_id)(ike_sa_t *this, bool initiate, uint32_t mid); void (*set_message_id)(ike_sa_t *this, bool initiate, uint32_t mid);
/**
* Get the message ID of the IKE_SA.
*
* The IKE_SA stores two message IDs, one for initiating exchanges (send)
* and one to respond to exchanges (expect).
*
* @param initiate TRUE to get message ID for initiating
* @return current message
*/
uint32_t (*get_message_id)(ike_sa_t *this, bool initiate);
/** /**
* Add an additional address for the peer. * Add an additional address for the peer.
* *