denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use standard unsigned integer types

Browse Source
This commit is contained in:
Andreas Steffen
2016-03-24 18:52:48 +01:00
parent b210369314
commit b12c53ce77
584 changed files with 3430 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/delete_payload.c
+14 -14
View File
@@ -36,7 +36,7 @@ struct private_delete_payload_t {
/**
* Next payload type.
*/
u_int8_t next_payload;
uint8_t next_payload;
/**
* Critical flag.
@@ -51,27 +51,27 @@ struct private_delete_payload_t {
/**
* Length of this payload.
*/
u_int16_t payload_length;
uint16_t payload_length;
/**
* IKEv1 Domain of Interpretation
*/
u_int32_t doi;
uint32_t doi;
/**
* Protocol ID.
*/
u_int8_t protocol_id;
uint8_t protocol_id;
/**
* SPI Size.
*/
u_int8_t spi_size;
uint8_t spi_size;
/**
* Number of SPI's.
*/
u_int16_t spi_count;
uint16_t spi_count;
/**
* The contained SPI's.
@@ -257,7 +257,7 @@ METHOD(delete_payload_t, get_protocol_id, protocol_id_t,
}
METHOD(delete_payload_t, add_spi, void,
private_delete_payload_t *this, u_int32_t spi)
private_delete_payload_t *this, uint32_t spi)
{
switch (this->protocol_id)
{
@@ -273,7 +273,7 @@ METHOD(delete_payload_t, add_spi, void,
}
METHOD(delete_payload_t, set_ike_spi, void,
private_delete_payload_t *this, u_int64_t spi_i, u_int64_t spi_r)
private_delete_payload_t *this, uint64_t spi_i, uint64_t spi_r)
{
free(this->spis.ptr);
this->spis = chunk_cat("cc", chunk_from_thing(spi_i),
@@ -283,15 +283,15 @@ METHOD(delete_payload_t, set_ike_spi, void,
}
METHOD(delete_payload_t, get_ike_spi, bool,
private_delete_payload_t *this, u_int64_t *spi_i, u_int64_t *spi_r)
private_delete_payload_t *this, uint64_t *spi_i, uint64_t *spi_r)
{
if (this->protocol_id != PROTO_IKE ||
this->spis.len < 2 * sizeof(u_int64_t))
this->spis.len < 2 * sizeof(uint64_t))
{
return FALSE;
}
memcpy(spi_i, this->spis.ptr, sizeof(u_int64_t));
memcpy(spi_r, this->spis.ptr + sizeof(u_int64_t), sizeof(u_int64_t));
memcpy(spi_i, this->spis.ptr, sizeof(uint64_t));
memcpy(spi_r, this->spis.ptr + sizeof(uint64_t), sizeof(uint64_t));
return TRUE;
}
@@ -306,7 +306,7 @@ typedef struct {
} spi_enumerator_t;
METHOD(enumerator_t, spis_enumerate, bool,
spi_enumerator_t *this, u_int32_t *spi)
spi_enumerator_t *this, uint32_t *spi)
{
if (this->spis.len >= sizeof(*spi))
{
@@ -322,7 +322,7 @@ METHOD(delete_payload_t, create_spi_enumerator, enumerator_t*,
{
spi_enumerator_t *e;
if (this->spi_size != sizeof(u_int32_t))
if (this->spi_size != sizeof(uint32_t))
{
return enumerator_create_empty();
}