Add SIM method hint table so we can warn when we think the wrong SIM/AKA flavour...

diff --git a/src/modules/rlm_eap/lib/sim/id.c b/src/modules/rlm_eap/lib/sim/id.c
index d2794036df4e6b1b048aef1ed59bee68b9f18b24..2a1b57578779ea76fe4cd65bffc02fab4153cadb 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/id.c
+++ b/src/modules/rlm_eap/lib/sim/id.c
@@ -29,9 +29,16 @@
 #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     },
+       { "Id-Any-Req",         SIM_ANY_ID_REQ                  },
+       { "Permanent-Id-Req",   SIM_PERMANENT_ID_REQ            },
+       { "FullAuth-Id-Req",    SIM_FULLAUTH_ID_REQ             },
+       { NULL }
+};
+
+FR_NAME_NUMBER const sim_id_method_hint_table[] = {
+       { "SIM",                SIM_METHOD_HINT_SIM             },
+       { "AKA",                SIM_METHOD_HINT_AKA             },
+       { "AKA'",               SIM_METHOD_HINT_AKA_PRIME       },
        { NULL }
 };
 

diff --git a/src/modules/rlm_eap/lib/sim/id.h b/src/modules/rlm_eap/lib/sim/id.h
index ab9a7faba2590f9bf98e82cf575e03d863ee5ae7..fcdb556d146e9d2a38d24c6c02243f0d63098663 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/id.h
+++ b/src/modules/rlm_eap/lib/sim/id.h
@@ -70,12 +70,14 @@ typedef enum {
 /** 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.
+       SIM_NO_ID_REQ = 0,                      //!< We're not requesting any ID.
+       SIM_ANY_ID_REQ,                         //!< 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[];
+extern FR_NAME_NUMBER const sim_id_method_hint_table[];
 
 #define SIM_ID_TAG_PSEUDONYM_SIM_B64           55
 #define SIM_ID_TAG_PSEUDONYM_AKA_B64           54