Use standard unsigned integer types
This commit is contained in:
@@ -83,12 +83,12 @@ struct private_ike_cfg_t {
|
||||
/**
|
||||
* our source port
|
||||
*/
|
||||
u_int16_t my_port;
|
||||
uint16_t my_port;
|
||||
|
||||
/**
|
||||
* destination port
|
||||
*/
|
||||
u_int16_t other_port;
|
||||
uint16_t other_port;
|
||||
|
||||
/**
|
||||
* should we send a certificate request?
|
||||
@@ -108,7 +108,7 @@ struct private_ike_cfg_t {
|
||||
/**
|
||||
* DSCP value to use on sent IKE packets
|
||||
*/
|
||||
u_int8_t dscp;
|
||||
uint8_t dscp;
|
||||
|
||||
/**
|
||||
* List of proposals to use
|
||||
@@ -143,7 +143,7 @@ METHOD(ike_cfg_t, fragmentation, fragmentation_t,
|
||||
/**
|
||||
* Common function for resolve_me/other
|
||||
*/
|
||||
static host_t* resolve(linked_list_t *hosts, int family, u_int16_t port)
|
||||
static host_t* resolve(linked_list_t *hosts, int family, uint16_t port)
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
host_t *host = NULL;
|
||||
@@ -192,7 +192,7 @@ static u_int match(linked_list_t *hosts, linked_list_t *ranges, host_t *cand)
|
||||
traffic_selector_t *ts;
|
||||
char *str;
|
||||
host_t *host;
|
||||
u_int8_t mask;
|
||||
uint8_t mask;
|
||||
u_int quality = 0;
|
||||
|
||||
/* try single hosts first */
|
||||
@@ -261,19 +261,19 @@ METHOD(ike_cfg_t, get_other_addr, char*,
|
||||
return this->other;
|
||||
}
|
||||
|
||||
METHOD(ike_cfg_t, get_my_port, u_int16_t,
|
||||
METHOD(ike_cfg_t, get_my_port, uint16_t,
|
||||
private_ike_cfg_t *this)
|
||||
{
|
||||
return this->my_port;
|
||||
}
|
||||
|
||||
METHOD(ike_cfg_t, get_other_port, u_int16_t,
|
||||
METHOD(ike_cfg_t, get_other_port, uint16_t,
|
||||
private_ike_cfg_t *this)
|
||||
{
|
||||
return this->other_port;
|
||||
}
|
||||
|
||||
METHOD(ike_cfg_t, get_dscp, u_int8_t,
|
||||
METHOD(ike_cfg_t, get_dscp, uint8_t,
|
||||
private_ike_cfg_t *this)
|
||||
{
|
||||
return this->dscp;
|
||||
@@ -353,7 +353,7 @@ METHOD(ike_cfg_t, get_dh_group, diffie_hellman_group_t,
|
||||
{
|
||||
enumerator_t *enumerator;
|
||||
proposal_t *proposal;
|
||||
u_int16_t dh_group = MODP_NONE;
|
||||
uint16_t dh_group = MODP_NONE;
|
||||
|
||||
enumerator = this->proposals->create_enumerator(this->proposals);
|
||||
while (enumerator->enumerate(enumerator, &proposal))
|
||||
@@ -545,9 +545,9 @@ int ike_cfg_get_family(ike_cfg_t *cfg, bool local)
|
||||
* Described in header.
|
||||
*/
|
||||
ike_cfg_t *ike_cfg_create(ike_version_t version, bool certreq, bool force_encap,
|
||||
char *me, u_int16_t my_port,
|
||||
char *other, u_int16_t other_port,
|
||||
fragmentation_t fragmentation, u_int8_t dscp)
|
||||
char *me, uint16_t my_port,
|
||||
char *other, uint16_t other_port,
|
||||
fragmentation_t fragmentation, uint8_t dscp)
|
||||
{
|
||||
private_ike_cfg_t *this;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user