From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 10 Dec 2017 12:21:47 +0000 (+0000)
Subject: Move identity request types and put them in a table
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4cbfe656d91d255ae9bccd6a87742a966fe6f7e;p=thirdparty%2Ffreeradius-server.git

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 10a4baaecee..22378cb3d9d 100644
--- 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 014dc60f0b9..ab9a7faba25 100644
--- 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 3127d7d5153..8f92eae1064 100644
--- 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 {