Rename macros so it's clear which ones refer to EAP codes

diff --git a/src/modules/rlm_eap/eap.c b/src/modules/rlm_eap/eap.c
index 944f907d80502d5f3db531425ba3b12a25082208..fba843039124c1fd2474812514e02856a04787b4 100644 (file)
--- a/src/modules/rlm_eap/eap.c
+++ b/src/modules/rlm_eap/eap.c
@@ -124,8 +124,8 @@ rlm_rcode_t eap_compose(eap_session_t *eap_session)
                 *      packet that it is sent in response
                 *      to.
                 */
-               case FR_EAP_SUCCESS:
-               case FR_EAP_FAILURE:
+               case FR_EAP_CODE_SUCCESS:
+               case FR_EAP_CODE_FAILURE:
                        break;
 
                /*
@@ -145,8 +145,8 @@ rlm_rcode_t eap_compose(eap_session_t *eap_session)
         *      that the TTLS and PEAP modules can call it to do most
         *      of their dirty work.
         */
-       if (((eap_round->request->code == FR_EAP_REQUEST) ||
-            (eap_round->request->code == FR_EAP_RESPONSE)) &&
+       if (((eap_round->request->code == FR_EAP_CODE_REQUEST) ||
+            (eap_round->request->code == FR_EAP_CODE_RESPONSE)) &&
            (eap_round->request->type.num == 0)) {
                rad_assert(eap_session->type >= FR_EAP_MD5);
                rad_assert(eap_session->type < FR_EAP_MAX_TYPES);
@@ -182,22 +182,22 @@ rlm_rcode_t eap_compose(eap_session_t *eap_session)
        /* Set request reply code, but only if it's not already set. */
        rcode = RLM_MODULE_OK;
        if (!request->reply->code) switch (reply->code) {
-       case FR_EAP_RESPONSE:
+       case FR_EAP_CODE_RESPONSE:
                request->reply->code = FR_CODE_ACCESS_ACCEPT;
                rcode = RLM_MODULE_HANDLED; /* leap weirdness */
                break;
 
-       case FR_EAP_SUCCESS:
+       case FR_EAP_CODE_SUCCESS:
                request->reply->code = FR_CODE_ACCESS_ACCEPT;
                rcode = RLM_MODULE_OK;
                break;
 
-       case FR_EAP_FAILURE:
+       case FR_EAP_CODE_FAILURE:
                request->reply->code = FR_CODE_ACCESS_REJECT;
                rcode = RLM_MODULE_REJECT;
                break;
 
-       case FR_EAP_REQUEST:
+       case FR_EAP_CODE_REQUEST:
                request->reply->code = FR_CODE_ACCESS_CHALLENGE;
                rcode = RLM_MODULE_HANDLED;
                break;
@@ -213,7 +213,7 @@ rlm_rcode_t eap_compose(eap_session_t *eap_session)
                /* Should never enter here */
                REDEBUG("Reply code %d is unknown, rejecting the request", reply->code);
                request->reply->code = FR_CODE_ACCESS_REJECT;
-               reply->code = FR_EAP_FAILURE;
+               reply->code = FR_EAP_CODE_FAILURE;
                rcode = RLM_MODULE_REJECT;
                break;
        }
@@ -307,7 +307,7 @@ int eap_start(rlm_eap_t const *inst, REQUEST *request)
                 *      Manually create an EAP Identity request
                 */
                p = talloc_array(vp, uint8_t, 5);
-               p[0] = FR_EAP_REQUEST;
+               p[0] = FR_EAP_CODE_REQUEST;
                p[1] = 0; /* ID */
                p[2] = 0;
                p[3] = 5; /* length */
@@ -322,7 +322,7 @@ int eap_start(rlm_eap_t const *inst, REQUEST *request)
         *      server, but they're not forbidden from doing so.
         *      This behaviour was observed with a Spirent Avalanche test server.
         */
-       if ((eap_msg->vp_length == EAP_HEADER_LEN) && (eap_msg->vp_octets[0] == FR_EAP_FAILURE)) {
+       if ((eap_msg->vp_length == EAP_HEADER_LEN) && (eap_msg->vp_octets[0] == FR_EAP_CODE_FAILURE)) {
                REDEBUG("Peer sent EAP %s (code %i) ID %d length %zu",
                        eap_codes[eap_msg->vp_octets[0]],
                        eap_msg->vp_octets[0],
@@ -370,7 +370,7 @@ int eap_start(rlm_eap_t const *inst, REQUEST *request)
         *      Success, or Failure.
         */
        if ((eap_msg->vp_octets[0] == 0) ||
-           (eap_msg->vp_octets[0] >= FR_EAP_MAX_CODES)) {
+           (eap_msg->vp_octets[0] >= FR_EAP_CODE_MAX)) {
                RDEBUG2("Peer sent EAP packet with unknown code %i", eap_msg->vp_octets[0]);
        } else {
                RDEBUG2("Peer sent EAP %s (code %i) ID %d length %zu",
@@ -386,8 +386,8 @@ int eap_start(rlm_eap_t const *inst, REQUEST *request)
         *      sending success/fail packets to us, as it doesn't make
         *      sense.
         */
-       if ((eap_msg->vp_octets[0] != FR_EAP_REQUEST) &&
-           (eap_msg->vp_octets[0] != FR_EAP_RESPONSE)) {
+       if ((eap_msg->vp_octets[0] != FR_EAP_CODE_REQUEST) &&
+           (eap_msg->vp_octets[0] != FR_EAP_CODE_RESPONSE)) {
                RDEBUG2("Ignoring EAP packet which we don't know how to handle");
                return RLM_MODULE_FAIL;
        }
@@ -481,7 +481,7 @@ void eap_fail(eap_session_t *eap_session)
 
        talloc_free(eap_session->this_round->request);
        eap_session->this_round->request = talloc_zero(eap_session->this_round, eap_packet_t);
-       eap_session->this_round->request->code = FR_EAP_FAILURE;
+       eap_session->this_round->request->code = FR_EAP_CODE_FAILURE;
        eap_session->finished = true;
        eap_compose(eap_session);
 }
@@ -491,7 +491,7 @@ void eap_fail(eap_session_t *eap_session)
  */
 void eap_success(eap_session_t *eap_session)
 {
-       eap_session->this_round->request->code = FR_EAP_SUCCESS;
+       eap_session->this_round->request->code = FR_EAP_CODE_SUCCESS;
        eap_session->finished = true;
        eap_compose(eap_session);
 }
@@ -511,8 +511,8 @@ static int eap_validation(REQUEST *request, eap_packet_raw_t **eap_packet_p)
         *      High level EAP packet checks
         */
        if ((len <= EAP_HEADER_LEN) ||
-           ((eap_packet->code != FR_EAP_RESPONSE) &&
-            (eap_packet->code != FR_EAP_REQUEST))) {
+           ((eap_packet->code != FR_EAP_CODE_RESPONSE) &&
+            (eap_packet->code != FR_EAP_CODE_REQUEST))) {
                REDEBUG("Badly formatted EAP Message: Ignoring the packet");
                return -1;
        }
@@ -609,7 +609,7 @@ static char *eap_identity(REQUEST *request, eap_session_t *eap_session, eap_pack
        uint16_t        len;
 
        if (!eap_packet ||
-           (eap_packet->code != FR_EAP_RESPONSE) ||
+           (eap_packet->code != FR_EAP_CODE_RESPONSE) ||
            (eap_packet->data[0] != FR_EAP_IDENTITY)) return NULL;
 
        memcpy(&len, eap_packet->length, sizeof(uint16_t));

diff --git a/src/modules/rlm_eap/lib/base/eap_tls.c b/src/modules/rlm_eap/lib/base/eap_tls.c
index 4bcfc2e9131e9d59f0fc594ba1eeb4a2623fe6ad..2df39aad679eb3ef7779ec3a33309ab6ac7276ca 100644 (file)
--- a/src/modules/rlm_eap/lib/base/eap_tls.c
+++ b/src/modules/rlm_eap/lib/base/eap_tls.c
@@ -187,15 +187,15 @@ int eap_tls_compose(eap_session_t *eap_session, eap_tls_status_t status, uint8_t
        case EAP_TLS_ACK_SEND:
        case EAP_TLS_START_SEND:
        case EAP_TLS_RECORD_SEND:
-               eap_round->request->code = FR_EAP_REQUEST;
+               eap_round->request->code = FR_EAP_CODE_REQUEST;
                break;
 
        case EAP_TLS_ESTABLISHED:
-               eap_round->request->code = FR_EAP_SUCCESS;
+               eap_round->request->code = FR_EAP_CODE_SUCCESS;
                break;
 
        case EAP_TLS_FAIL:
-               eap_round->request->code = FR_EAP_FAILURE;
+               eap_round->request->code = FR_EAP_CODE_FAILURE;
                break;
 
        default:

diff --git a/src/modules/rlm_eap/lib/base/eap_types.h b/src/modules/rlm_eap/lib/base/eap_types.h
index a48a1b9117504592ac302b67c074bb3eeb701935..bca506d898be2578c1dd128b8d5681611ef1a707 100644 (file)
--- a/src/modules/rlm_eap/lib/base/eap_types.h
+++ b/src/modules/rlm_eap/lib/base/eap_types.h
@@ -35,11 +35,11 @@ RCSIDH(eap_methods_h, "$Id$")
 #define EAP_HEADER_LEN                 4
 
 typedef enum eap_code {
-       FR_EAP_REQUEST = 1,
-       FR_EAP_RESPONSE,
-       FR_EAP_SUCCESS,
-       FR_EAP_FAILURE,
-       FR_EAP_MAX_CODES
+       FR_EAP_CODE_REQUEST = 1,
+       FR_EAP_CODE_RESPONSE,
+       FR_EAP_CODE_SUCCESS,
+       FR_EAP_CODE_FAILURE,
+       FR_EAP_CODE_MAX
 } eap_code_t;
 
 typedef enum eap_method {

diff --git a/src/modules/rlm_eap/lib/base/eapcommon.c b/src/modules/rlm_eap/lib/base/eapcommon.c
index 2eed3dc1e09e41782653aff544337c734dd4959b..20576d41aa61b1ad7a18dc06cf6b170072c2d904 100644 (file)
--- a/src/modules/rlm_eap/lib/base/eapcommon.c
+++ b/src/modules/rlm_eap/lib/base/eapcommon.c
@@ -151,8 +151,8 @@ int eap_wireformat(eap_packet_t *reply)
        /*
         *      Request and Response packets are special.
         */
-       if ((reply->code == FR_EAP_REQUEST) ||
-           (reply->code == FR_EAP_RESPONSE)) {
+       if ((reply->code == FR_EAP_CODE_REQUEST) ||
+           (reply->code == FR_EAP_CODE_RESPONSE)) {
                header->data[0] = (reply->type.num & 0xFF);
 
                /*
@@ -212,18 +212,18 @@ int eap_basic_compose(RADIUS_PACKET *packet, eap_packet_t *reply)
        /* Set request reply code, but only if it's not already set. */
        rcode = RLM_MODULE_OK;
        if (!packet->code) switch (reply->code) {
-       case FR_EAP_RESPONSE:
-       case FR_EAP_SUCCESS:
+       case FR_EAP_CODE_RESPONSE:
+       case FR_EAP_CODE_SUCCESS:
                packet->code = FR_CODE_ACCESS_ACCEPT;
                rcode = RLM_MODULE_HANDLED;
                break;
 
-       case FR_EAP_FAILURE:
+       case FR_EAP_CODE_FAILURE:
                packet->code = FR_CODE_ACCESS_REJECT;
                rcode = RLM_MODULE_REJECT;
                break;
 
-       case FR_EAP_REQUEST:
+       case FR_EAP_CODE_REQUEST:
                packet->code = FR_CODE_ACCESS_CHALLENGE;
                rcode = RLM_MODULE_HANDLED;
                break;

diff --git a/src/modules/rlm_eap/lib/sim/sim_proto.c b/src/modules/rlm_eap/lib/sim/sim_proto.c
index c7903ae3a851eb0b1a835102bd3e55310539f5e1..74b9b8097e13bde3c683f6b21ba801a518aa3f85 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/sim_proto.c
+++ b/src/modules/rlm_eap/lib/sim/sim_proto.c
@@ -765,14 +765,14 @@ ssize_t fr_sim_encode(REQUEST *request, fr_dict_attr_t const *parent, uint8_t ty
        id = vp ? vp->vp_uint32 : ((int)getpid() & 0xff);
 
        vp = fr_pair_find_by_num(to_encode, 0, FR_EAP_CODE, TAG_ANY);
-       eap_code = vp ? vp->vp_uint32 : FR_EAP_REQUEST;
+       eap_code = vp ? vp->vp_uint32 : FR_EAP_CODE_REQUEST;
 
        /*
         *      Fill in some bits in the EAP packet
         *
         *      These are needed even if we're sending an almost empty packet.
         */
-       if (eap_packet->code != FR_EAP_SUCCESS) eap_packet->code = eap_code;
+       if (eap_packet->code != FR_EAP_CODE_SUCCESS) eap_packet->code = eap_code;
        eap_packet->id = (id & 0xff);
        eap_packet->type.num = type;
 

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index ed40fd8dac4d8a5395ae2173fa25e329a96be89c..83a781fe2f6520e1f904c6729a66a53cf1feedc8 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -547,7 +547,7 @@ static rlm_rcode_t mod_authenticate(void *instance, UNUSED void *thread, REQUEST
         *      Add to the list only if it is EAP-Request, OR if
         *      it's LEAP, and a response.
         */
-       if (((eap_session->this_round->request->code == FR_EAP_REQUEST) &&
+       if (((eap_session->this_round->request->code == FR_EAP_CODE_REQUEST) &&
            (eap_session->this_round->request->type.num >= FR_EAP_MD5)) ||
 
                /*
@@ -559,9 +559,9 @@ static rlm_rcode_t mod_authenticate(void *instance, UNUSED void *thread, REQUEST
                 *      At stage 6, LEAP sends an EAP-Response, which
                 *      isn't put into the list.
                 */
-           ((eap_session->this_round->response->code == FR_EAP_RESPONSE) &&
+           ((eap_session->this_round->response->code == FR_EAP_CODE_RESPONSE) &&
             (eap_session->this_round->response->type.num == FR_EAP_LEAP) &&
-            (eap_session->this_round->request->code == FR_EAP_SUCCESS) &&
+            (eap_session->this_round->request->code == FR_EAP_CODE_SUCCESS) &&
             (eap_session->this_round->request->type.num == 0))) {
                talloc_free(eap_session->prev_round);
                eap_session->prev_round = eap_session->this_round;
@@ -746,7 +746,7 @@ static rlm_rcode_t mod_post_proxy(void *instance, UNUSED void *thread, REQUEST *
                 *      Add to the list only if it is EAP-Request, OR if
                 *      it's LEAP, and a response.
                 */
-               if ((eap_session->this_round->request->code == FR_EAP_REQUEST) &&
+               if ((eap_session->this_round->request->code == FR_EAP_CODE_REQUEST) &&
                    (eap_session->this_round->request->type.num >= FR_EAP_MD5)) {
                        talloc_free(eap_session->prev_round);
                        eap_session->prev_round = eap_session->this_round;

diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
index e84d749d4498f5eeea1c9a65a7b24782862d8027..bbb86d48f599ce45e0e67ee5d3d49c16b3a43425 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
@@ -168,7 +168,7 @@ static void eap_aka_send_success(eap_session_t *eap_session)
        VALUE_PAIR              *vp;
        RADIUS_PACKET           *packet;
 
-       eap_session->this_round->request->code = FR_EAP_SUCCESS;
+       eap_session->this_round->request->code = FR_EAP_CODE_SUCCESS;
        eap_session->finished = true;
 
        /* to_client is the data to the client. */

diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
index b018d181d355fa6e3845ee61d62bec9cb8462a20..98644a89cf6773e6ba1bde5c045adb90b797b6a8 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
@@ -144,7 +144,7 @@ static void eap_fast_send_identity_request(REQUEST *request, tls_session_t *tls_
 
        RDEBUG("Sending EAP-Identity");
 
-       eap_packet.code = FR_EAP_REQUEST;
+       eap_packet.code = FR_EAP_CODE_REQUEST;
        eap_packet.id = eap_session->this_round->response->id + 1;
        eap_packet.length[0] = 0;
        eap_packet.length[1] = EAP_HEADER_LEN + 1;
@@ -608,7 +608,7 @@ static FR_CODE eap_fast_eap_payload(REQUEST *request, eap_session_t *eap_session
                        vp = fr_pair_find_by_num(fake->packet->vps, 0, FR_EAP_MESSAGE, TAG_ANY);
                        if (vp &&
                            (vp->vp_length >= EAP_HEADER_LEN + 2) &&
-                           (vp->vp_strvalue[0] == FR_EAP_RESPONSE) &&
+                           (vp->vp_strvalue[0] == FR_EAP_CODE_RESPONSE) &&
                            (vp->vp_strvalue[EAP_HEADER_LEN] == FR_EAP_IDENTITY) &&
                            (vp->vp_strvalue[EAP_HEADER_LEN + 1] != 0)) {
                                /*

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index d9a60ca88bc6837bad3a6b2d382dc6f4adde7755..48bb208fa3451a447e83609936a44807b7db4b1f 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -66,11 +66,11 @@ static rlm_rcode_t mod_process_auth_type(UNUSED void *instance, eap_session_t *e
        if (rcode == RLM_MODULE_YIELD) return rcode;
 
        if (rcode != RLM_MODULE_OK) {
-               eap_round->request->code = FR_EAP_FAILURE;
+               eap_round->request->code = FR_EAP_CODE_FAILURE;
                return rcode;
        }
 
-       eap_round->request->code = FR_EAP_SUCCESS;
+       eap_round->request->code = FR_EAP_CODE_SUCCESS;
        return RLM_MODULE_OK;
 }
 
@@ -96,7 +96,7 @@ static rlm_rcode_t mod_process(void *instance, eap_session_t *eap_session)
         */
        if (eap_round->response->length <= 4) {
                ERROR("Corrupted data");
-               eap_round->request->code = FR_EAP_FAILURE;
+               eap_round->request->code = FR_EAP_CODE_FAILURE;
                return RLM_MODULE_INVALID;
        }
 
@@ -106,7 +106,7 @@ static rlm_rcode_t mod_process(void *instance, eap_session_t *eap_session)
         */
        if (eap_round->response->type.length > 128) {
                ERROR("Response is too large to understand");
-               eap_round->request->code = FR_EAP_FAILURE;
+               eap_round->request->code = FR_EAP_CODE_FAILURE;
                return RLM_MODULE_INVALID;
        }
 
@@ -133,11 +133,11 @@ static rlm_rcode_t mod_process(void *instance, eap_session_t *eap_session)
                 */
                rcode = process_authenticate(inst->auth_type, request);
                if (rcode != RLM_MODULE_OK) {
-                       eap_round->request->code = FR_EAP_FAILURE;
+                       eap_round->request->code = FR_EAP_CODE_FAILURE;
                        return rcode;
                }
 
-               eap_round->request->code = FR_EAP_SUCCESS;
+               eap_round->request->code = FR_EAP_CODE_SUCCESS;
                return RLM_MODULE_OK;
        }
 
@@ -168,7 +168,7 @@ static rlm_rcode_t mod_session_init(void *instance, eap_session_t *eap_session)
        /*
         *      We're sending a request...
         */
-       eap_round->request->code = FR_EAP_REQUEST;
+       eap_round->request->code = FR_EAP_CODE_REQUEST;
 
        eap_round->request->type.data = talloc_array(eap_round->request, uint8_t, length);
        if (!eap_round->request->type.data) return RLM_MODULE_FAIL;

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
index 6beb9c420071dfb75db99d1c12f92dd1a149f04f..7fd4260762743b22ab7eac3904bb9c1e616572ed 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
@@ -67,7 +67,7 @@ leap_packet_t *eap_leap_extract(REQUEST *request, eap_round_t *eap_round)
         *      messages sent to it.
         */
        if (!eap_round || !eap_round->response ||
-           ((eap_round->response->code != FR_EAP_RESPONSE) && (eap_round->response->code != FR_EAP_REQUEST)) ||
+           ((eap_round->response->code != FR_EAP_CODE_RESPONSE) && (eap_round->response->code != FR_EAP_CODE_REQUEST)) ||
             (eap_round->response->type.num != FR_EAP_LEAP) || !eap_round->response->type.data ||
             (eap_round->response->length < LEAP_HEADER_LEN) ||
             (eap_round->response->type.data[0] != 0x01)) {     /* version 1 */
@@ -87,14 +87,14 @@ leap_packet_t *eap_leap_extract(REQUEST *request, eap_round_t *eap_round)
         *      of the stages.
         */
        switch (eap_round->response->code) {
-       case FR_EAP_RESPONSE:
+       case FR_EAP_CODE_RESPONSE:
                if (data->count != 24) {
                        REDEBUG("Bad NTChallengeResponse in LEAP stage 3");
                        return NULL;
                }
                break;
 
-       case FR_EAP_REQUEST:
+       case FR_EAP_CODE_REQUEST:
                if (data->count != 8) {
                        REDEBUG("Bad AP Challenge in LEAP stage 5");
                        return NULL;
@@ -257,7 +257,7 @@ leap_packet_t *eap_leap_stage6(REQUEST *request, leap_packet_t *packet, VALUE_PA
        reply = talloc(session, leap_packet_t);
        if (!reply) return NULL;
 
-       reply->code = FR_EAP_RESPONSE;
+       reply->code = FR_EAP_CODE_RESPONSE;
        reply->length = LEAP_HEADER_LEN + 24 + user_name->vp_length;
        reply->count = 24;
 
@@ -353,7 +353,7 @@ leap_packet_t *eap_leap_initiate(REQUEST *request, eap_round_t *eap_round, VALUE
                return NULL;
        }
 
-       reply->code = FR_EAP_REQUEST;
+       reply->code = FR_EAP_CODE_REQUEST;
        reply->length = LEAP_HEADER_LEN + 8 + user_name->vp_length;
        reply->count = 8;       /* random challenge */
 
@@ -404,8 +404,8 @@ int eap_leap_compose(REQUEST *request, eap_round_t *eap_round, leap_packet_t *re
         *  We need the name and the challenge.
         */
        switch (reply->code) {
-       case FR_EAP_REQUEST:
-       case FR_EAP_RESPONSE:
+       case FR_EAP_CODE_REQUEST:
+       case FR_EAP_CODE_RESPONSE:
                eap_round->request->type.num = FR_EAP_LEAP;
                eap_round->request->type.length = reply->length;
 
@@ -430,7 +430,7 @@ int eap_leap_compose(REQUEST *request, eap_round_t *eap_round, leap_packet_t *re
                 *      EAP-Success packets don't contain any data
                 *      other than the header.
                 */
-       case FR_EAP_SUCCESS:
+       case FR_EAP_CODE_SUCCESS:
                eap_round->request->type.length = 0;
                break;
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
index 3dd0d19af0e135945c73d72fbdc3c37b8587b915..6af86b1f8e7db294e50be17c1d8deb36a59be1ee 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
@@ -79,12 +79,12 @@ static rlm_rcode_t mod_process(UNUSED void *instance, eap_session_t *eap_session
                 *      any LEAP packet.  So we return here.
                 */
                if (!rcode) {
-                       eap_session->this_round->request->code = FR_EAP_FAILURE;
+                       eap_session->this_round->request->code = FR_EAP_CODE_FAILURE;
                        talloc_free(packet);
                        return 0;
                }
 
-               eap_session->this_round->request->code = FR_EAP_SUCCESS;
+               eap_session->this_round->request->code = FR_EAP_CODE_SUCCESS;
 
                /*
                 *      Do this only for Success.

diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index 3a37bd09d075664156628f56bfbd7ae897a84db6..6da908908f3b028a07f082c01045d8bbba6b1a24 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -70,7 +70,7 @@ static int eapmschapv2_compose(rlm_eap_mschapv2_t const *inst, eap_session_t *ea
        eap_round_t             *eap_round = eap_session->this_round;
        REQUEST                 *request = eap_session->request;
 
-       eap_round->request->code = FR_EAP_REQUEST;
+       eap_round->request->code = FR_EAP_CODE_REQUEST;
        eap_round->request->type.num = FR_EAP_MSCHAPV2;
 
        /*
@@ -365,7 +365,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_process(void *arg, eap_session_t *eap_se
 
 failure:
                request->options &= ~RAD_REQUEST_OPTION_PROXY_EAP;
-               eap_round->request->code = FR_EAP_FAILURE;
+               eap_round->request->code = FR_EAP_CODE_FAILURE;
                return RLM_MODULE_REJECT;
 
        case FR_EAP_MSCHAPV2_SUCCESS:
@@ -377,7 +377,7 @@ failure:
 
                switch (ccode) {
                case FR_EAP_MSCHAPV2_SUCCESS:
-                       eap_round->request->code = FR_EAP_SUCCESS;
+                       eap_round->request->code = FR_EAP_CODE_SUCCESS;
 
                        fr_pair_list_mcopy_by_num(request->reply, &request->reply->vps, &data->mppe_keys, 0, 0, TAG_ANY);
                        /* FALL-THROUGH */
@@ -618,7 +618,7 @@ packet_ready:
                }
                data->code = FR_EAP_MSCHAPV2_FAILURE;
        } else {
-               eap_round->request->code = FR_EAP_FAILURE;
+               eap_round->request->code = FR_EAP_CODE_FAILURE;
                return RLM_MODULE_REJECT;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
index 41e5bf3052c4d591de708590724b50fa0a480f6c..93eb30595fa5efa962481fab30af313a60c9ce68 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
@@ -63,7 +63,7 @@ typedef struct peap_tunnel_t {
 #define EAP_TLV_FAILURE (2)
 #define EAP_TLV_ACK_RESULT (3)
 
-#define FR_EAP_TLV 33
+#define FR_PEAP_EXTENSIONS_METHOD 33
 
 /*
  *     Process the PEAP portion of an EAP-PEAP request.

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index b24ffdc119405078934e9e6f8b9bda29ad56b4eb..7d0fc9654a65df8e2d0416e98b40ff0c3bae678e 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -40,7 +40,7 @@ static int eap_peap_failure(eap_session_t *eap_session, tls_session_t *tls_sessi
 
        RDEBUG2("FAILURE");
 
-       tlv_packet[0] = FR_EAP_REQUEST;
+       tlv_packet[0] = FR_EAP_CODE_REQUEST;
        tlv_packet[1] = eap_session->this_round->response->id +1;
        tlv_packet[2] = 0;
        tlv_packet[3] = 11;     /* length of this packet */
@@ -75,7 +75,7 @@ static int eap_peap_success(eap_session_t *eap_session, tls_session_t *tls_sessi
 
        RDEBUG2("SUCCESS");
 
-       tlv_packet[0] = FR_EAP_REQUEST;
+       tlv_packet[0] = FR_EAP_CODE_REQUEST;
        tlv_packet[1] = eap_session->this_round->response->id +1;
        tlv_packet[2] = 0;
        tlv_packet[3] = 11;     /* length of this packet */
@@ -102,7 +102,7 @@ static int eap_peap_identity(eap_session_t *eap_session, tls_session_t *tls_sess
 {
        eap_packet_raw_t eap_packet;
 
-       eap_packet.code = FR_EAP_REQUEST;
+       eap_packet.code = FR_EAP_CODE_REQUEST;
        eap_packet.id = eap_session->this_round->response->id + 1;
        eap_packet.length[0] = 0;
        eap_packet.length[1] = EAP_HEADER_LEN + 1;
@@ -207,25 +207,22 @@ static void eap_peap_soh_verify(REQUEST *request, RADIUS_PACKET *packet,
 static int eap_peap_verify(REQUEST *request,
                           uint8_t const *data, unsigned int data_len)
 {
-       eap_packet_raw_t const *eap_packet = (eap_packet_raw_t const *) data;
-       eap_type_t eap_method;
+       eap_packet_raw_t const  *eap_packet = (eap_packet_raw_t const *) data;
+       eap_type_t              eap_method;
 
        /*
         *      No data, OR only 1 byte of EAP type.
         */
-       if (!data || (data_len == 0) ||
-           ((data_len <= 1) && (data[0] != FR_EAP_IDENTITY))) {
-               return 0;
-       }
+       if (!data || (data_len == 0) || ((data_len <= 1) && (data[0] != FR_EAP_IDENTITY))) return 0;
 
-       if (eap_packet->code == FR_EAP_RESPONSE) {
+       if (eap_packet->code == FR_EAP_CODE_RESPONSE) {
                if (eap_packet->data[0] == FR_EAP_TLV) {
                        RDEBUG2("Received EAP-TLV response");
                        return 1;
                }
        }
 
-       eap_method = *data;
+       eap_method = data[0];   /* Inner EAP header misses off code and identifier */
        switch (eap_method) {
        case FR_EAP_IDENTITY:
                RDEBUG2("Received EAP-Identity-Response");
@@ -241,7 +238,6 @@ static int eap_peap_verify(REQUEST *request,
                return 1;
        }
 
-       return 0;
 }
 
 /*
@@ -270,7 +266,7 @@ static VALUE_PAIR *eap_peap_inner_to_pairs(UNUSED REQUEST *request, RADIUS_PACKE
         *      Hand-build an EAP packet from the crap in PEAP version 0.
         */
        p = talloc_array(vp, uint8_t, EAP_HEADER_LEN + total);
-       p[0] = FR_EAP_RESPONSE;
+       p[0] = FR_EAP_CODE_RESPONSE;
        p[1] = eap_round->response->id;
        p[2] = (data_len + EAP_HEADER_LEN) >> 8;
        p[3] = (data_len + EAP_HEADER_LEN) & 0xff;
@@ -342,7 +338,7 @@ static int eap_peap_check_tlv(REQUEST *request, uint8_t const *data, size_t data
        /*
         *      Look for success or failure.
         */
-       if ((eap_packet->code == FR_EAP_RESPONSE) &&
+       if ((eap_packet->code == FR_EAP_CODE_RESPONSE) &&
            (eap_packet->data[0] == FR_EAP_TLV)) {
                if (data[10] == EAP_TLV_SUCCESS) {
                        return 1;
@@ -813,7 +809,7 @@ rlm_rcode_t eap_peap_process(eap_session_t *eap_session, tls_session_t *tls_sess
                vp = fr_pair_afrom_num(fake->packet, 0, FR_EAP_MESSAGE);
 
                q = talloc_array(vp, uint8_t, len);
-               q[0] = FR_EAP_RESPONSE;
+               q[0] = FR_EAP_CODE_RESPONSE;
                q[1] = eap_round->response->id;
                q[2] = (len >> 8) & 0xff;
                q[3] = len & 0xff;

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index e885a897313931728248eb2959df43317f343b61..c29f250804a009e31e8a3ae5284a3b4e35565d40 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -57,7 +57,7 @@ static int send_pwd_request(pwd_session_t *session, eap_round_t *eap_round)
 
        len = (session->out_len - session->out_pos) + sizeof(pwd_hdr);
        rad_assert(len > 0);
-       eap_round->request->code = FR_EAP_REQUEST;
+       eap_round->request->code = FR_EAP_CODE_REQUEST;
        eap_round->request->type.num = FR_EAP_PWD;
        eap_round->request->type.length = (len > session->mtu) ? session->mtu : len;
        eap_round->request->type.data = talloc_zero_array(eap_round->request, uint8_t, eap_round->request->type.length);
@@ -211,7 +211,7 @@ static rlm_rcode_t mod_process(void *instance, eap_session_t *eap_session)
                 * send back an ACK for this fragment
                 */
                exch = EAP_PWD_GET_EXCHANGE(hdr);
-               eap_round->request->code = FR_EAP_REQUEST;
+               eap_round->request->code = FR_EAP_CODE_REQUEST;
                eap_round->request->type.num = FR_EAP_PWD;
                eap_round->request->type.length = sizeof(pwd_hdr);
 
@@ -394,7 +394,7 @@ static rlm_rcode_t mod_process(void *instance, eap_session_t *eap_session)
                        REDEBUG("Failed generating (E)MSK");
                        return RLM_MODULE_FAIL;
                }
-               eap_round->request->code = FR_EAP_SUCCESS;
+               eap_round->request->code = FR_EAP_CODE_SUCCESS;
 
                /*
                 *      Return the MSK (in halves).

diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
index e0739248486ad9439270d058aced26ee2dc3a5e6..bbda33fa7874900ba9c5deeaed5556e050781d42 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
@@ -238,7 +238,7 @@ static int eap_sim_send_success(eap_session_t *eap_session)
        VALUE_PAIR              *vp;
        RADIUS_PACKET           *packet;
 
-       eap_session->this_round->request->code = FR_EAP_SUCCESS;
+       eap_session->this_round->request->code = FR_EAP_CODE_SUCCESS;
        eap_session->finished = true;
 
        /* to_client is the data to the client. */

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index c5c5cfc3553a2039acaea7a87e4eeb64250366da..b9df5aac4ad099f0ef0c6a8d5116a6e4e47c4053 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -802,7 +802,7 @@ FR_CODE eap_ttls_process(eap_session_t *eap_session, tls_session_t *tls_session)
                        vp = fr_pair_find_by_num(fake->packet->vps, 0, FR_EAP_MESSAGE, TAG_ANY);
                        if (vp &&
                            (vp->vp_length >= EAP_HEADER_LEN + 2) &&
-                           (vp->vp_strvalue[0] == FR_EAP_RESPONSE) &&
+                           (vp->vp_strvalue[0] == FR_EAP_CODE_RESPONSE) &&
                            (vp->vp_strvalue[EAP_HEADER_LEN] == FR_EAP_IDENTITY) &&
                            (vp->vp_strvalue[EAP_HEADER_LEN + 1] != 0)) {
                                /*