Move identity request types and put them in a table

diff --git a/src/modules/rlm_eap/lib/sim/id.c b/src/modules/rlm_eap/lib/sim/id.c
index 10a4baaeceef9cffeca9d3078f845f4eddfdaab6..22378cb3d9d47eff697b3a4784f5a050fd7b9b6d 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/id.c
+++ b/src/modules/rlm_eap/lib/sim/id.c
@@ -28,6 +28,12 @@
 
 #define us(x) (uint8_t) x
 
+FR_NAME_NUMBER const sim_id_request_table[] = {
+       { "Id-Any-Req",         SIM_ANY_ID              },
+       { "Permanent-Id-Req",   SIM_PERMANENT_ID_REQ    },
+       { "FullAuth-Id-Req",    SIM_FULLAUTH_ID_REQ     },
+       { NULL }
+};
 
 /** Find where the identity ends
  *

diff --git a/src/modules/rlm_eap/lib/sim/id.h b/src/modules/rlm_eap/lib/sim/id.h
index 014dc60f0b92a3d25af1f794a91f14bbc75ef75c..ab9a7faba2590f9bf98e82cf575e03d863ee5ae7 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/id.h
+++ b/src/modules/rlm_eap/lib/sim/id.h
@@ -24,6 +24,7 @@
 #define _EAP_SIM_ID_TYPE_H
 
 #include <sys/types.h>
+#include <freeradius-devel/token.h>
 
 #define SIM_3GPP_PSEUDONYM_LEN                 23      //!< Length of a base64 encoded 3gpp pseudonym.
 #define SIM_IMSI_MAX_LEN                       15      //!< Length of an IMSI number in ASCII.
@@ -66,6 +67,16 @@ typedef enum {
        SIM_ID_TAG_FASTAUTH_AKA_PRIME           = '8'   //!< Fastuath, continue EAP-AKA-Prime
 } fr_sim_id_tag_t;
 
+/** Identity request types
+ */
+typedef enum {
+       SIM_ANY_ID,                                     //!< Request IMSI, Pseudonym or Fast-reauth.
+       SIM_PERMANENT_ID_REQ,                           //!< Request IMSI.
+       SIM_FULLAUTH_ID_REQ                             //!< Request IMSI or Pseudonym.
+} fr_sim_id_req_type_t;
+
+extern FR_NAME_NUMBER const sim_id_request_table[];
+
 #define SIM_ID_TAG_PSEUDONYM_SIM_B64           55
 #define SIM_ID_TAG_PSEUDONYM_AKA_B64           54
 #define SIM_ID_TAG_PSEUDONYM_AKA_PRIME_B64     59

diff --git a/src/modules/rlm_eap/lib/sim/sim_proto.h b/src/modules/rlm_eap/lib/sim/sim_proto.h
index 3127d7d5153977ca1afc0e3e5e56f834c2f5b999..8f92eae106440f24fa7be534cfa6b9fd62ac809b 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/sim_proto.h
+++ b/src/modules/rlm_eap/lib/sim/sim_proto.h
@@ -86,15 +86,6 @@ typedef enum {
        SIM_VECTOR_SRC_KI                                       //!< Should generate triplets locally using a Ki.
 } fr_sim_vector_src_t;
 
-
-/** Identity request types
- */
-typedef enum {
-       SIM_ANY_ID,                                             //!< Request IMSI, Pseudonym or Fast-reauth.
-       SIM_PERMANENT_ID_REQ,                                   //!< Request IMSI.
-       SIM_FULLAUTH_ID_REQ                                     //!< Request IMSI or Pseudonym.
-} fr_sim_identity_req_type_t;
-
 typedef struct {
        uint8_t         rand[SIM_VECTOR_GSM_RAND_SIZE];         //!< RAND challenge to the SIM.
        union {