RADIUS message constructor accepts a message code parameter

diff --git a/src/libcharon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c
index dfe0e2e09152248c3169c229eb47be147230b34f..ebb745a9a9ccaa05cb89a7ab4c9456d43021e4ef 100644 (file)
--- 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();
+       request = radius_message_create_request(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);
@@ -289,11 +289,11 @@ METHOD(eap_method_t, process, status_t,
        status_t status = FAILED;
        chunk_t data;
 
-       request = radius_message_create_request();
+       request = radius_message_create_request(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);
- 
+
        /* fragment data suitable for RADIUS (not more than 253 bytes) */
        while (data.len > 253)
        {

diff --git a/src/libcharon/plugins/eap_radius/radius_message.c b/src/libcharon/plugins/eap_radius/radius_message.c
index 23a29b7725f343f8e52e6901e66e7dc5754ad003..35f37414b9dc1054d24e97bab3750ec2e9df9baf 100644 (file)
--- a/src/libcharon/plugins/eap_radius/radius_message.c
+++ b/src/libcharon/plugins/eap_radius/radius_message.c
@@ -423,12 +423,12 @@ static private_radius_message_t *radius_message_create()
 /**
  * See header
  */
-radius_message_t *radius_message_create_request()
+radius_message_t *radius_message_create_request(radius_message_code_t code)
 {
        private_radius_message_t *this = radius_message_create();
 
        INIT(this->msg,
-               .code = RMC_ACCESS_REQUEST,
+               .code = code,
                .identifier = 0,
                .length = htons(sizeof(rmsg_t)),
        );

diff --git a/src/libcharon/plugins/eap_radius/radius_message.h b/src/libcharon/plugins/eap_radius/radius_message.h
index 266839d3b0be16d991d8468950e6bdc9775ed58a..18a2bcec152b43465ee29745479e26dd641a91b3 100644 (file)
--- a/src/libcharon/plugins/eap_radius/radius_message.h
+++ b/src/libcharon/plugins/eap_radius/radius_message.h
@@ -259,11 +259,12 @@ struct radius_message_t {
 };
 
 /**
- * Create an empty RADIUS request message (RMT_ACCESS_REQUEST).
+ * Create an empty RADIUS request message.
  *
+ * @code                               request type
  * @return                             radius_message_t object
  */
-radius_message_t *radius_message_create_request();
+radius_message_t *radius_message_create_request(radius_message_code_t code);
 
 /**
  * Parse and verify a recevied RADIUS response.