Message stringification supports more detailed EAP payload information

diff --git a/src/charon/encoding/message.c b/src/charon/encoding/message.c
index b39c076e68f247ea19c639ccf480a8236575bec4..397a3c609fad6b43b17d1f0366c141cb9c70c6d0 100644 (file)
--- a/src/charon/encoding/message.c
+++ b/src/charon/encoding/message.c
@@ -946,6 +946,35 @@ static char* get_string(private_message_t *this, char *buf, int len)
                        pos += written;
                        len -= written;
                }
+               if (payload->get_type(payload) == EXTENSIBLE_AUTHENTICATION)
+               {
+                       eap_payload_t *eap = (eap_payload_t*)payload;
+                       u_int32_t vendor;
+                       eap_type_t type;
+                       char method[64] = "";
+
+                       type = eap->get_type(eap, &vendor);
+                       if (type)
+                       {
+                               if (vendor)
+                               {
+                                       snprintf(method, sizeof(method), "/%d-%d", type, vendor);
+                               }
+                               else
+                               {
+                                       snprintf(method, sizeof(method), "/%N",
+                                                        eap_type_short_names, type);
+                               }
+                       }
+                       written = snprintf(pos, len, "/%N%s", eap_code_short_names,
+                                                          eap->get_code(eap), method);
+                       if (written >= len || written < 0)
+                       {
+                               return buf;
+                       }
+                       pos += written;
+                       len -= written;
+               }
        }
        enumerator->destroy(enumerator);
 

diff --git a/src/charon/sa/authenticators/eap/eap_method.c b/src/charon/sa/authenticators/eap/eap_method.c
index 791ab2dd9cdf85dc9f603cf1ac491ff16a7a6c91..91fa5305f3e056cd4d42b2e331e71692365e9b13 100644 (file)
--- a/src/charon/sa/authenticators/eap/eap_method.c
+++ b/src/charon/sa/authenticators/eap/eap_method.c
@@ -34,6 +34,25 @@ ENUM_NEXT(eap_type_names, EAP_RADIUS, EAP_EXPERIMENTAL, EAP_MSCHAPV2,
        "EAP_EXPERIMENTAL");
 ENUM_END(eap_type_names, EAP_EXPERIMENTAL);
 
+ENUM_BEGIN(eap_type_short_names, EAP_IDENTITY, EAP_GTC,
+       "ID",
+       "NTF",
+       "NAK",
+       "MD5",
+       "OTP",
+       "GTC");
+ENUM_NEXT(eap_type_short_names, EAP_SIM, EAP_SIM, EAP_GTC,
+       "SIM");
+ENUM_NEXT(eap_type_short_names, EAP_AKA, EAP_AKA, EAP_SIM,
+       "AKA");
+ENUM_NEXT(eap_type_short_names, EAP_MSCHAPV2, EAP_MSCHAPV2, EAP_AKA,
+       "MSCHAPV2");
+ENUM_NEXT(eap_type_short_names, EAP_RADIUS, EAP_EXPERIMENTAL, EAP_MSCHAPV2,
+       "RAD",
+       "EXP",
+       "XP");
+ENUM_END(eap_type_short_names, EAP_EXPERIMENTAL);
+
 /*
  * See header
  */
@@ -71,6 +90,13 @@ ENUM(eap_code_names, EAP_REQUEST, EAP_FAILURE,
        "EAP_FAILURE",
 );
 
+ENUM(eap_code_short_names, EAP_REQUEST, EAP_FAILURE,
+       "REQ",
+       "RES",
+       "SUCC",
+       "FAIL",
+);
+
 ENUM(eap_role_names, EAP_SERVER, EAP_PEER,
        "EAP_SERVER",
        "EAP_PEER",

diff --git a/src/charon/sa/authenticators/eap/eap_method.h b/src/charon/sa/authenticators/eap/eap_method.h
index 61e8e2caaea6df356ab67f6d39d60523d96297ac..4cab84535eee7f27582641968a948c0140fd7f19 100644 (file)
--- a/src/charon/sa/authenticators/eap/eap_method.h
+++ b/src/charon/sa/authenticators/eap/eap_method.h
@@ -66,6 +66,11 @@ enum eap_type_t {
  */
 extern enum_name_t *eap_type_names;
 
+/**
+ * short string enum names for eap_type_t.
+ */
+extern enum_name_t *eap_type_short_names;
+
 /**
  * Lookup the EAP method type from a string.
  *
@@ -89,6 +94,11 @@ enum eap_code_t {
  */
 extern enum_name_t *eap_code_names;
 
+/**
+ * short string enum names for eap_code_t.
+ */
+extern enum_name_t *eap_code_short_names;
+
 /**
  * Interface of an EAP method for server and client side.
  *