Use standard unsigned integer types

src/frontends/osx/charon-xpc/xpc_channels.c

@@ -78,12 +78,12 @@ static void destroy_entry(entry_t *entry)
 /**
  * Find an IKE_SA unique identifier by a given XPC channel
  */
-static u_int32_t find_ike_sa_by_conn(private_xpc_channels_t *this,
+static uint32_t find_ike_sa_by_conn(private_xpc_channels_t *this,
 									 xpc_connection_t conn)
 {
 	enumerator_t *enumerator;
 	entry_t *entry;
-	u_int32_t ike_sa = 0;
+	uint32_t ike_sa = 0;
 
 	this->lock->read_lock(this->lock);
 	enumerator = this->channels->create_enumerator(this->channels);
@@ -126,7 +126,7 @@ static void remove_conn(private_xpc_channels_t *this, xpc_connection_t conn)
 /**
  * Trigger termination of a connection
  */
-static void stop_connection(private_xpc_channels_t *this, u_int32_t ike_sa,
+static void stop_connection(private_xpc_channels_t *this, uint32_t ike_sa,
 							xpc_object_t request, xpc_object_t reply)
 {
 	status_t status;
@@ -141,7 +141,7 @@ static void stop_connection(private_xpc_channels_t *this, u_int32_t ike_sa,
  */
 static struct {
 	char *name;
-	void (*handler)(private_xpc_channels_t *this, u_int32_t ike_sa,
+	void (*handler)(private_xpc_channels_t *this, uint32_t ike_sa,
 					xpc_object_t request, xpc_object_t reply);
 } commands[] = {
 	{ "stop_connection", stop_connection },
@@ -156,7 +156,7 @@ static void handle(private_xpc_channels_t *this, xpc_connection_t conn,
 	xpc_object_t reply;
 	const char *type, *rpc;
 	bool found = FALSE;
-	u_int32_t ike_sa;
+	uint32_t ike_sa;
 	int i;
 
 	type = xpc_dictionary_get_string(request, "type");
@@ -201,7 +201,7 @@ static void handle(private_xpc_channels_t *this, xpc_connection_t conn,
 }
 
 METHOD(xpc_channels_t, add, void,
-	private_xpc_channels_t *this, xpc_connection_t conn, u_int32_t ike_sa)
+	private_xpc_channels_t *this, xpc_connection_t conn, uint32_t ike_sa)
 {
 	entry_t *entry;
 
@@ -466,7 +466,7 @@ static shared_key_t* password_cb(private_xpc_channels_t *this,
 	shared_key_t *shared = NULL;
 	ike_sa_t *ike_sa;
 	entry_t *entry;
-	u_int32_t sa;
+	uint32_t sa;
 
 	switch (type)
 	{

src/frontends/osx/charon-xpc/xpc_channels.h

@@ -45,7 +45,7 @@ struct xpc_channels_t {
 	 * @param conn			XPC connection to channel
 	 * @param ike_sa		IKE_SA unique identifier to associate to connection
 	 */
-	void (*add)(xpc_channels_t *this, xpc_connection_t conn, u_int32_t ike_sa);
+	void (*add)(xpc_channels_t *this, xpc_connection_t conn, uint32_t ike_sa);
 
 	/**
 	 * Destroy a xpc_channels_t.

src/frontends/osx/charon-xpc/xpc_dispatch.c

@@ -77,7 +77,7 @@ static peer_cfg_t* create_peer_cfg(char *name, char *host)
 {
 	ike_cfg_t *ike_cfg;
 	peer_cfg_t *peer_cfg;
-	u_int16_t local_port, remote_port = IKEV2_UDP_PORT;
+	uint16_t local_port, remote_port = IKEV2_UDP_PORT;
 
 	local_port = charon->socket->get_port(charon->socket, FALSE);
 	if (local_port != IKEV2_UDP_PORT)
@@ -154,7 +154,7 @@ static child_cfg_t* create_child_cfg(char *name)
 /**
  * Controller initiate callback
  */
-static bool initiate_cb(u_int32_t *sa, debug_t group, level_t level,
+static bool initiate_cb(uint32_t *sa, debug_t group, level_t level,
 						ike_sa_t *ike_sa, const char *message)
 {
 	if (ike_sa)
@@ -177,7 +177,7 @@ void start_connection(private_xpc_dispatch_t *this,
 	bool success = FALSE;
 	xpc_endpoint_t endpoint;
 	xpc_connection_t channel;
-	u_int32_t ike_sa;
+	uint32_t ike_sa;
 
 	name = (char*)xpc_dictionary_get_string(request, "name");
 	host = (char*)xpc_dictionary_get_string(request, "host");

src/frontends/osx/charon-xpc/xpc_logger.c

@@ -35,7 +35,7 @@ struct private_xpc_logger_t {
 	/**
 	 * IKE_SA we log for
 	 */
-	u_int32_t ike_sa;
+	uint32_t ike_sa;
 };
 
 METHOD(logger_t, log_, void,
@@ -62,7 +62,7 @@ METHOD(logger_t, get_level, level_t,
 }
 
 METHOD(xpc_logger_t, set_ike_sa, void,
-	private_xpc_logger_t *this, u_int32_t ike_sa)
+	private_xpc_logger_t *this, uint32_t ike_sa)
 {
 	this->ike_sa = ike_sa;
 }

src/frontends/osx/charon-xpc/xpc_logger.h

@@ -42,7 +42,7 @@ struct xpc_logger_t {
 	 *
 	 * @param ike_sa		IKE_SA unique identifier
 	 */
-	void (*set_ike_sa)(xpc_logger_t *this, u_int32_t ike_sa);
+	void (*set_ike_sa)(xpc_logger_t *this, uint32_t ike_sa);
 
 	/**
 	 * Destroy a xpc_logger_t.