display EAP identifiers in HEX format

This commit is contained in:
Andreas Steffen 2011-04-06 17:34:27 +02:00
parent 0ef9744123
commit c98ed04de0
3 changed files with 8 additions and 8 deletions

View File

@ -130,12 +130,12 @@ METHOD(tls_application_t, process, status_t,
if (received_vendor) if (received_vendor)
{ {
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d " DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d "
"(id: %u)", received_type, received_vendor, "(id 0x%02X", received_type, received_vendor,
in->get_identifier(in)); in->get_identifier(in));
} }
else else
{ {
DBG1(DBG_IKE, "server requested %N authentication (id: %u)", DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)",
eap_type_names, received_type, in->get_identifier(in)); eap_type_names, received_type, in->get_identifier(in));
} }
this->ph2_method = charon->eap->create_instance(charon->eap, this->ph2_method = charon->eap->create_instance(charon->eap,

View File

@ -168,12 +168,12 @@ METHOD(tls_application_t, process, status_t,
if (received_vendor) if (received_vendor)
{ {
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d " DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d "
"(id: %u)", received_type, received_vendor, "(id 0x%02X)", received_type, received_vendor,
in->get_identifier(in)); in->get_identifier(in));
} }
else else
{ {
DBG1(DBG_IKE, "server requested %N authentication (id: %u)", DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)",
eap_type_names, received_type, in->get_identifier(in)); eap_type_names, received_type, in->get_identifier(in));
} }
this->method = charon->eap->create_instance(charon->eap, this->method = charon->eap->create_instance(charon->eap,

View File

@ -187,12 +187,12 @@ static eap_payload_t* server_initiate_eap(private_eap_authenticator_t *this,
{ {
if (vendor) if (vendor)
{ {
DBG1(DBG_IKE, "initiating EAP vendor type %d-%d method (id: %u)", DBG1(DBG_IKE, "initiating EAP vendor type %d-%d method (id 0x%02X)",
type, vendor, out->get_identifier(out)); type, vendor, out->get_identifier(out));
} }
else else
{ {
DBG1(DBG_IKE, "initiating %N method (id: %u)", eap_type_names, DBG1(DBG_IKE, "initiating %N method (id 0x%02X)", eap_type_names,
type, out->get_identifier(out)); type, out->get_identifier(out));
} }
return out; return out;
@ -373,11 +373,11 @@ static eap_payload_t* client_process_eap(private_eap_authenticator_t *this,
if (vendor) if (vendor)
{ {
DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d ", DBG1(DBG_IKE, "server requested vendor specific EAP method %d-%d ",
"(id: %u)", type, vendor, in->get_identifier(in)); "(id 0x%02X)", type, vendor, in->get_identifier(in));
} }
else else
{ {
DBG1(DBG_IKE, "server requested %N authentication (id: %u)", DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)",
eap_type_names, type, in->get_identifier(in)); eap_type_names, type, in->get_identifier(in));
} }
this->method = load_method(this, type, vendor, EAP_PEER); this->method = load_method(this, type, vendor, EAP_PEER);