Rename RADIUS message constructors to handle both, requests and responses

6 files changed, 15 insertions, 15 deletions

diff --git a/src/libcharon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c
index 72e707e6a..3d8c823b8 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius.c
@@ -162,7 +162,7 @@ METHOD(eap_method_t, initiate, status_t,
 	status_t status = FAILED;
 	chunk_t username;
 
-	request = radius_message_create_request(RMC_ACCESS_REQUEST);
+	request = radius_message_create(RMC_ACCESS_REQUEST);
 	username = chunk_create(this->id_prefix, strlen(this->id_prefix));
 	username = chunk_cata("cc", username, this->peer->get_encoding(this->peer));
 	request->add(request, RAT_USER_NAME, username);
@@ -314,7 +314,7 @@ METHOD(eap_method_t, process, status_t,
 	status_t status = FAILED;
 	chunk_t data;
 
-	request = radius_message_create_request(RMC_ACCESS_REQUEST);
+	request = radius_message_create(RMC_ACCESS_REQUEST);
 	request->add(request, RAT_USER_NAME, this->peer->get_encoding(this->peer));
 	data = in->get_data(in);
 	DBG3(DBG_IKE, "%N payload %B", eap_type_names, this->type, &data);
diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index 613569ffb..cd81cfc84 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -181,7 +181,7 @@ static void send_start(private_eap_radius_accounting_t *this, ike_sa_t *ike_sa)
 	);
 	snprintf(entry->sid, sizeof(entry->sid), "%u-%u", this->prefix, id);
 
-	message = radius_message_create_request(RMC_ACCOUNTING_REQUEST);
+	message = radius_message_create(RMC_ACCOUNTING_REQUEST);
 	value = htonl(ACCT_STATUS_START);
 	message->add(message, RAT_ACCT_STATUS_TYPE, chunk_from_thing(value));
 	message->add(message, RAT_ACCT_SESSION_ID,
@@ -212,7 +212,7 @@ static void send_stop(private_eap_radius_accounting_t *this, ike_sa_t *ike_sa)
 	this->mutex->unlock(this->mutex);
 	if (entry)
 	{
-		message = radius_message_create_request(RMC_ACCOUNTING_REQUEST);
+		message = radius_message_create(RMC_ACCOUNTING_REQUEST);
 		value = htonl(ACCT_STATUS_STOP);
 		message->add(message, RAT_ACCT_STATUS_TYPE, chunk_from_thing(value));
 		message->add(message, RAT_ACCT_SESSION_ID,
diff --git a/src/libcharon/plugins/eap_radius/eap_radius_dae.c b/src/libcharon/plugins/eap_radius/eap_radius_dae.c
index c6f5d84b3..ce8a36db1 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius_dae.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_dae.c
@@ -76,7 +76,7 @@ static job_requeue_t receive(private_eap_radius_dae_t *this)
 
 	if (len > 0)
 	{
-		request = radius_message_parse_response(chunk_create(buf, len));
+		request = radius_message_parse(chunk_create(buf, len));
 		if (request)
 		{
 			switch (request->get_code(request))
diff --git a/src/libcharon/plugins/eap_radius/radius_message.c b/src/libcharon/plugins/eap_radius/radius_message.c
index 3df7e6323..7fa95e39d 100644
--- a/src/libcharon/plugins/eap_radius/radius_message.c
+++ b/src/libcharon/plugins/eap_radius/radius_message.c
@@ -418,7 +418,7 @@ METHOD(radius_message_t, destroy, void,
 /**
  * Generic constructor
  */
-static private_radius_message_t *radius_message_create()
+static private_radius_message_t *radius_message_create_empty()
 {
 	private_radius_message_t *this;
 
@@ -443,9 +443,9 @@ static private_radius_message_t *radius_message_create()
 /**
  * See header
  */
-radius_message_t *radius_message_create_request(radius_message_code_t code)
+radius_message_t *radius_message_create(radius_message_code_t code)
 {
-	private_radius_message_t *this = radius_message_create();
+	private_radius_message_t *this = radius_message_create_empty();
 
 	INIT(this->msg,
 		.code = code,
@@ -459,9 +459,9 @@ radius_message_t *radius_message_create_request(radius_message_code_t code)
 /**
  * See header
  */
-radius_message_t *radius_message_parse_response(chunk_t data)
+radius_message_t *radius_message_parse(chunk_t data)
 {
-	private_radius_message_t *this = radius_message_create();
+	private_radius_message_t *this = radius_message_create_empty();
 
 	this->msg = malloc(data.len);
 	memcpy(this->msg, data.ptr, data.len);
diff --git a/src/libcharon/plugins/eap_radius/radius_message.h b/src/libcharon/plugins/eap_radius/radius_message.h
index fbbfdc942..eede40120 100644
--- a/src/libcharon/plugins/eap_radius/radius_message.h
+++ b/src/libcharon/plugins/eap_radius/radius_message.h
@@ -268,19 +268,19 @@ struct radius_message_t {
 };
 
 /**
- * Create an empty RADIUS request message.
+ * Create an empty RADIUS message.
  *
  * @param code			request type
  * @return				radius_message_t object
  */
-radius_message_t *radius_message_create_request(radius_message_code_t code);
+radius_message_t *radius_message_create(radius_message_code_t code);
 
 /**
- * Parse and verify a recevied RADIUS response.
+ * Parse and verify a recevied RADIUS message.
  *
  * @param data			received message data
  * @return				radius_message_t object, NULL if length invalid
  */
-radius_message_t *radius_message_parse_response(chunk_t data);
+radius_message_t *radius_message_parse(chunk_t data);
 
 #endif /** RADIUS_MESSAGE_H_ @}*/
diff --git a/src/libcharon/plugins/eap_radius/radius_socket.c b/src/libcharon/plugins/eap_radius/radius_socket.c
index 56b65fea8..96eafb8b6 100644
--- a/src/libcharon/plugins/eap_radius/radius_socket.c
+++ b/src/libcharon/plugins/eap_radius/radius_socket.c
@@ -205,7 +205,7 @@ METHOD(radius_socket_t, request, radius_message_t*,
 					 strerror(errno));
 				break;
 			}
-			response = radius_message_parse_response(chunk_create(buf, res));
+			response = radius_message_parse(chunk_create(buf, res));
 			if (response)
 			{
 				if (response->verify(response,