Use standard unsigned integer types
This commit is contained in:
@@ -32,7 +32,7 @@ struct private_acquire_job_t {
|
||||
/**
|
||||
* reqid of the child to rekey
|
||||
*/
|
||||
u_int32_t reqid;
|
||||
uint32_t reqid;
|
||||
|
||||
/**
|
||||
* acquired source traffic selector
|
||||
@@ -70,7 +70,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
/*
|
||||
* Described in header
|
||||
*/
|
||||
acquire_job_t *acquire_job_create(u_int32_t reqid,
|
||||
acquire_job_t *acquire_job_create(uint32_t reqid,
|
||||
traffic_selector_t *src_ts,
|
||||
traffic_selector_t *dst_ts)
|
||||
{
|
||||
|
||||
@@ -47,7 +47,7 @@ struct acquire_job_t {
|
||||
* @param dst_ts destination traffic selector
|
||||
* @return acquire_job_t object
|
||||
*/
|
||||
acquire_job_t *acquire_job_create(u_int32_t reqid,
|
||||
acquire_job_t *acquire_job_create(uint32_t reqid,
|
||||
traffic_selector_t *src_ts,
|
||||
traffic_selector_t *dst_ts);
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ METHOD(job_t, execute, job_requeue_t,
|
||||
ike_sa_id_t *id;
|
||||
ike_sa_t *ike_sa;
|
||||
child_sa_t *child_sa;
|
||||
u_int32_t unique;
|
||||
uint32_t unique;
|
||||
|
||||
ike_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager, this->id);
|
||||
if (ike_sa)
|
||||
|
||||
@@ -38,7 +38,7 @@ struct private_delete_child_sa_job_t {
|
||||
/**
|
||||
* inbound SPI of the CHILD_SA
|
||||
*/
|
||||
u_int32_t spi;
|
||||
uint32_t spi;
|
||||
|
||||
/**
|
||||
* SA destination address
|
||||
@@ -89,7 +89,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
* Described in header
|
||||
*/
|
||||
delete_child_sa_job_t *delete_child_sa_job_create(protocol_id_t protocol,
|
||||
u_int32_t spi, host_t *dst, bool expired)
|
||||
uint32_t spi, host_t *dst, bool expired)
|
||||
{
|
||||
private_delete_child_sa_job_t *this;
|
||||
|
||||
|
||||
@@ -51,6 +51,6 @@ struct delete_child_sa_job_t {
|
||||
* @return delete_child_sa_job_t object
|
||||
*/
|
||||
delete_child_sa_job_t *delete_child_sa_job_create(protocol_id_t protocol,
|
||||
u_int32_t spi, host_t *dst, bool expired);
|
||||
uint32_t spi, host_t *dst, bool expired);
|
||||
|
||||
#endif /** DELETE_CHILD_SA_JOB_H_ @}*/
|
||||
|
||||
@@ -32,12 +32,12 @@ struct private_inactivity_job_t {
|
||||
/**
|
||||
* Unique CHILD_SA identifier to check
|
||||
*/
|
||||
u_int32_t id;
|
||||
uint32_t id;
|
||||
|
||||
/**
|
||||
* Inactivity timeout
|
||||
*/
|
||||
u_int32_t timeout;
|
||||
uint32_t timeout;
|
||||
|
||||
/**
|
||||
* Close IKE_SA if last remaining CHILD inactive?
|
||||
@@ -55,7 +55,7 @@ METHOD(job_t, execute, job_requeue_t,
|
||||
private_inactivity_job_t *this)
|
||||
{
|
||||
ike_sa_t *ike_sa;
|
||||
u_int32_t reschedule = 0;
|
||||
uint32_t reschedule = 0;
|
||||
|
||||
ike_sa = charon->child_sa_manager->checkout_by_id(charon->child_sa_manager,
|
||||
this->id, NULL);
|
||||
@@ -63,7 +63,7 @@ METHOD(job_t, execute, job_requeue_t,
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
child_sa_t *child_sa;
|
||||
u_int32_t delete = 0;
|
||||
uint32_t delete = 0;
|
||||
protocol_id_t proto = 0;
|
||||
int children = 0;
|
||||
status_t status = SUCCESS;
|
||||
@@ -136,7 +136,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
/**
|
||||
* See header
|
||||
*/
|
||||
inactivity_job_t *inactivity_job_create(u_int32_t unique_id, u_int32_t timeout,
|
||||
inactivity_job_t *inactivity_job_create(uint32_t unique_id, uint32_t timeout,
|
||||
bool close_ike)
|
||||
{
|
||||
private_inactivity_job_t *this;
|
||||
|
||||
@@ -47,7 +47,7 @@ struct inactivity_job_t {
|
||||
* @param close_ike close IKE_SA if the last remaining CHILD_SA is inactive?
|
||||
* @return inactivity checking job
|
||||
*/
|
||||
inactivity_job_t *inactivity_job_create(u_int32_t unique_id, u_int32_t timeout,
|
||||
inactivity_job_t *inactivity_job_create(uint32_t unique_id, uint32_t timeout,
|
||||
bool close_ike);
|
||||
|
||||
#endif /** INACTIVITY_JOB_H_ @}*/
|
||||
|
||||
@@ -34,7 +34,7 @@ struct private_migrate_job_t {
|
||||
/**
|
||||
* reqid of the CHILD_SA if it already exists
|
||||
*/
|
||||
u_int32_t reqid;
|
||||
uint32_t reqid;
|
||||
|
||||
/**
|
||||
* source traffic selector
|
||||
@@ -144,7 +144,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
/*
|
||||
* Described in header
|
||||
*/
|
||||
migrate_job_t *migrate_job_create(u_int32_t reqid,
|
||||
migrate_job_t *migrate_job_create(uint32_t reqid,
|
||||
traffic_selector_t *src_ts,
|
||||
traffic_selector_t *dst_ts,
|
||||
policy_dir_t dir,
|
||||
|
||||
@@ -54,7 +54,7 @@ struct migrate_job_t {
|
||||
* @param remote remote host address to be used in the IKE_SA
|
||||
* @return migrate_job_t object
|
||||
*/
|
||||
migrate_job_t *migrate_job_create(u_int32_t reqid,
|
||||
migrate_job_t *migrate_job_create(uint32_t reqid,
|
||||
traffic_selector_t *src_ts, traffic_selector_t *dst_ts,
|
||||
policy_dir_t dir, host_t *local, host_t *remote);
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ struct private_rekey_child_sa_job_t {
|
||||
/**
|
||||
* inbound SPI of the CHILD_SA
|
||||
*/
|
||||
u_int32_t spi;
|
||||
uint32_t spi;
|
||||
|
||||
/**
|
||||
* SA destination address
|
||||
@@ -86,7 +86,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
* Described in header
|
||||
*/
|
||||
rekey_child_sa_job_t *rekey_child_sa_job_create(protocol_id_t protocol,
|
||||
u_int32_t spi, host_t *dst)
|
||||
uint32_t spi, host_t *dst)
|
||||
{
|
||||
private_rekey_child_sa_job_t *this;
|
||||
|
||||
|
||||
@@ -49,5 +49,5 @@ struct rekey_child_sa_job_t {
|
||||
* @return rekey_child_sa_job_t object
|
||||
*/
|
||||
rekey_child_sa_job_t *rekey_child_sa_job_create(protocol_id_t protocol,
|
||||
u_int32_t spi, host_t *dst);
|
||||
uint32_t spi, host_t *dst);
|
||||
#endif /** REKEY_CHILD_SA_JOB_H_ @}*/
|
||||
|
||||
@@ -49,11 +49,11 @@ METHOD(job_t, destroy, void,
|
||||
/**
|
||||
* Check if we should delay a reauth, and by how many seconds
|
||||
*/
|
||||
static u_int32_t get_retry_delay(ike_sa_t *ike_sa)
|
||||
static uint32_t get_retry_delay(ike_sa_t *ike_sa)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
child_sa_t *child_sa;
|
||||
u_int32_t retry = 0;
|
||||
uint32_t retry = 0;
|
||||
|
||||
/* avoid reauth collisions for certain IKE_SA/CHILD_SA states */
|
||||
if (ike_sa->get_state(ike_sa) != IKE_ESTABLISHED)
|
||||
@@ -87,7 +87,7 @@ METHOD(job_t, execute, job_requeue_t,
|
||||
{
|
||||
ike_sa_t *ike_sa;
|
||||
status_t status = SUCCESS;
|
||||
u_int32_t retry = 0;
|
||||
uint32_t retry = 0;
|
||||
|
||||
ike_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager,
|
||||
this->ike_sa_id);
|
||||
|
||||
@@ -32,7 +32,7 @@ struct private_retransmit_job_t {
|
||||
/**
|
||||
* Message ID of the request to resend.
|
||||
*/
|
||||
u_int32_t message_id;
|
||||
uint32_t message_id;
|
||||
|
||||
/**
|
||||
* ID of the IKE_SA which the message belongs to.
|
||||
@@ -79,7 +79,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
/*
|
||||
* Described in header.
|
||||
*/
|
||||
retransmit_job_t *retransmit_job_create(u_int32_t message_id,ike_sa_id_t *ike_sa_id)
|
||||
retransmit_job_t *retransmit_job_create(uint32_t message_id,ike_sa_id_t *ike_sa_id)
|
||||
{
|
||||
private_retransmit_job_t *this;
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ struct retransmit_job_t {
|
||||
* @param ike_sa_id identification of the ike_sa as ike_sa_id_t
|
||||
* @return retransmit_job_t object
|
||||
*/
|
||||
retransmit_job_t *retransmit_job_create(u_int32_t message_id,
|
||||
retransmit_job_t *retransmit_job_create(uint32_t message_id,
|
||||
ike_sa_id_t *ike_sa_id);
|
||||
|
||||
#endif /** RETRANSMIT_JOB_H_ @}*/
|
||||
|
||||
@@ -41,7 +41,7 @@ struct private_update_sa_job_t {
|
||||
/**
|
||||
* SPI of the CHILD_SA
|
||||
*/
|
||||
u_int32_t spi;
|
||||
uint32_t spi;
|
||||
|
||||
/**
|
||||
* Old SA destination address
|
||||
@@ -92,7 +92,7 @@ METHOD(job_t, get_priority, job_priority_t,
|
||||
* Described in header
|
||||
*/
|
||||
update_sa_job_t *update_sa_job_create(protocol_id_t protocol,
|
||||
u_int32_t spi, host_t *dst, host_t *new)
|
||||
uint32_t spi, host_t *dst, host_t *new)
|
||||
{
|
||||
private_update_sa_job_t *this;
|
||||
|
||||
|
||||
@@ -49,6 +49,6 @@ struct update_sa_job_t {
|
||||
* @return update_sa_job_t object
|
||||
*/
|
||||
update_sa_job_t *update_sa_job_create(protocol_id_t protocol,
|
||||
u_int32_t spi, host_t *dst, host_t *new);
|
||||
uint32_t spi, host_t *dst, host_t *new);
|
||||
|
||||
#endif /** UPDATE_SA_JOB_H_ @}*/
|
||||
|
||||
Reference in New Issue
Block a user