From: Martin Willi Date: Fri, 31 Aug 2012 14:55:45 +0000 (+0200) Subject: Print EAP types with %M identifier, providing a fallback for unknown vendors X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=08dc10fd642e96a067e33a6363dee63ab5474f8e;p=thirdparty%2Fstrongswan.git Print EAP types with %M identifier, providing a fallback for unknown vendors --- diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c index f5e54176f2..26f8a5f81b 100644 --- a/src/libcharon/encoding/message.c +++ b/src/libcharon/encoding/message.c @@ -1229,8 +1229,8 @@ static char* get_string(private_message_t *this, char *buf, int len) type = eap->get_type(eap, &vendor); if (type) { - snprintf(method, sizeof(method), "/%N", - eap_type_get_names(vendor), type); + snprintf(method, sizeof(method), "/%M", + eap_type_get_names, vendor, type); } written = snprintf(pos, len, "/%N%s", eap_code_short_names, eap->get_code(eap), method); diff --git a/src/libcharon/plugins/eap_dynamic/eap_dynamic.c b/src/libcharon/plugins/eap_dynamic/eap_dynamic.c index 660ce649d5..37f1e3d435 100644 --- a/src/libcharon/plugins/eap_dynamic/eap_dynamic.c +++ b/src/libcharon/plugins/eap_dynamic/eap_dynamic.c @@ -91,8 +91,8 @@ static eap_method_t *load_method(private_eap_dynamic_t *this, this->server, this->peer); if (!method) { - DBG1(DBG_IKE, "loading EAP-%N method failed", - eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "loading EAP-%M method failed", + eap_type_get_names, vendor, type); } return method; } @@ -120,8 +120,8 @@ static void select_method(private_eap_dynamic_t *this) if (inner->find_first(inner, (void*)entry_matches, NULL, entry) != SUCCESS) { - DBG2(DBG_IKE, "proposed EAP-%N method not supported " - "by %s, skipped", eap_type_get_names(entry->vendor), + DBG2(DBG_IKE, "proposed EAP-%M method not supported " + "by %s, skipped", eap_type_get_names, entry->vendor, entry->type, who); free(entry); continue; @@ -130,8 +130,8 @@ static void select_method(private_eap_dynamic_t *this) this->method = load_method(this, entry->type, entry->vendor); if (this->method) { - DBG1(DBG_IKE, "EAP-%N method selected", - eap_type_get_names(entry->vendor), entry->type); + DBG1(DBG_IKE, "EAP-%M method selected", + eap_type_get_names, entry->vendor, entry->type); free(entry); break; } diff --git a/src/libcharon/plugins/eap_peap/eap_peap_peer.c b/src/libcharon/plugins/eap_peap/eap_peap_peer.c index 84a877f11e..3fd83fb37f 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_peer.c +++ b/src/libcharon/plugins/eap_peap/eap_peap_peer.c @@ -95,9 +95,9 @@ static status_t process_phase2(private_eap_peap_peer_t *this, eap_payload_t *in) code = in->get_code(in); received_type = in->get_type(in, &received_vendor); - DBG1(DBG_IKE, "received tunneled EAP-PEAP AVP [ EAP/%N/%N ]", + DBG1(DBG_IKE, "received tunneled EAP-PEAP AVP [ EAP/%N/%M ]", eap_code_short_names, code, - eap_type_get_names(received_vendor), received_type); + eap_type_get_names, received_vendor, received_type); /* yet another phase2 authentication? */ if (this->ph2) @@ -113,8 +113,8 @@ static status_t process_phase2(private_eap_peap_peer_t *this, eap_payload_t *in) if (this->ph2 == NULL) { - DBG1(DBG_IKE, "server requested EAP method %N (id 0x%02X)", - eap_type_get_names(received_vendor), received_type, + DBG1(DBG_IKE, "server requested EAP method %M (id 0x%02X)", + eap_type_get_names, received_vendor, received_type, in->get_identifier(in)); this->ph2 = charon->eap->create_instance(charon->eap, received_type, received_vendor, @@ -143,7 +143,7 @@ static status_t process_phase2(private_eap_peap_peer_t *this, eap_payload_t *in) return NEED_MORE; case FAILED: default: - DBG1(DBG_IKE, "EAP-%N failed", eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "EAP-%M failed", eap_type_get_names, vendor, type); return FAILED; } } @@ -278,9 +278,9 @@ static status_t process_eap_with_header(private_eap_peap_peer_t *this, DBG1(DBG_IKE, "parsing PEAP inner expanded EAP header failed"); return FAILED; } - DBG1(DBG_IKE, "received tunneled EAP-PEAP AVP [ EAP/%N/%N ]", + DBG1(DBG_IKE, "received tunneled EAP-PEAP AVP [ EAP/%N/%M ]", eap_code_short_names, code, - eap_type_get_names(vendor), type); + eap_type_get_names, vendor, type); if (vendor == PEN_MICROSOFT && type == EAP_MS_CAPABILITES) { return process_capabilities(this, reader); @@ -338,9 +338,9 @@ METHOD(tls_application_t, build, status_t, { code = this->out->get_code(this->out); type = this->out->get_type(this->out, &vendor); - DBG1(DBG_IKE, "sending tunneled EAP-PEAP AVP [ EAP/%N/%N ]", + DBG1(DBG_IKE, "sending tunneled EAP-PEAP AVP [ EAP/%N/%M ]", eap_code_short_names, code, - eap_type_get_names(vendor), type); + eap_type_get_names, vendor, type); data = this->out->get_data(this->out); diff --git a/src/libcharon/plugins/eap_peap/eap_peap_server.c b/src/libcharon/plugins/eap_peap/eap_peap_server.c index 73c9c4fd2a..ed0559345e 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_server.c +++ b/src/libcharon/plugins/eap_peap/eap_peap_server.c @@ -100,13 +100,13 @@ static status_t start_phase2_auth(private_eap_peap_server_t *this) DBG1(DBG_IKE, "unrecognized phase2 method \"%s\"", eap_type_str); return FAILED; } - DBG1(DBG_IKE, "phase2 method %N selected", eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "phase2 method %M selected", eap_type_get_names, vendor, type); this->ph2_method = charon->eap->create_instance(charon->eap, type, vendor, EAP_SERVER, this->server, this->peer); if (this->ph2_method == NULL) { - DBG1(DBG_IKE, "%N method not available", - eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "%M method not available", + eap_type_get_names, vendor, type); return FAILED; } @@ -120,7 +120,7 @@ static status_t start_phase2_auth(private_eap_peap_server_t *this) } else { - DBG1(DBG_IKE, "%N method failed", eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "%M method failed", eap_type_get_names, vendor, type); return FAILED; } } diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c index 21718cef65..35aee1067e 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c @@ -87,13 +87,13 @@ static status_t start_phase2_auth(private_eap_ttls_server_t *this) DBG1(DBG_IKE, "unrecognized phase2 method \"%s\"", eap_type_str); return FAILED; } - DBG1(DBG_IKE, "phase2 method %N selected", eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "phase2 method %M selected", eap_type_get_names, vendor, type); this->method = charon->eap->create_instance(charon->eap, type, vendor, EAP_SERVER, this->server, this->peer); if (this->method == NULL) { - DBG1(DBG_IKE, "%N method not available", - eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "%M method not available", + eap_type_get_names, vendor, type); return FAILED; } if (this->method->initiate(this->method, &this->out) == NEED_MORE) @@ -102,7 +102,7 @@ static status_t start_phase2_auth(private_eap_ttls_server_t *this) } else { - DBG1(DBG_IKE, "%N method failed", eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "%M method failed", eap_type_get_names, vendor, type); return FAILED; } } diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c index bcaa19a6f5..7c856d07e8 100644 --- a/src/libcharon/plugins/stroke/stroke_list.c +++ b/src/libcharon/plugins/stroke/stroke_list.c @@ -355,9 +355,9 @@ static void log_auth_cfgs(FILE *out, peer_cfg_t *peer_cfg, bool local) } else { - fprintf(out, "EAP-%N authentication", - eap_type_get_names( - (uintptr_t)auth->get(auth, AUTH_RULE_EAP_VENDOR)), + fprintf(out, "EAP-%M authentication", + eap_type_get_names, + (uintptr_t)auth->get(auth, AUTH_RULE_EAP_VENDOR), (uintptr_t)auth->get(auth, AUTH_RULE_EAP_TYPE)); } id = auth->get(auth, AUTH_RULE_EAP_IDENTITY); diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp.c index 5b596b65eb..952d2ad49d 100644 --- a/src/libcharon/plugins/tnc_pdp/tnc_pdp.c +++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp.c @@ -274,8 +274,8 @@ static void send_response(private_tnc_pdp_t *this, radius_message_t *request, if (eap) { data = eap->get_data(eap); - DBG3(DBG_CFG, "%N payload %B", - eap_type_get_names(this->vendor), this->type, &data); + DBG3(DBG_CFG, "%M payload %B", + eap_type_get_names, this->vendor, this->type, &data); /* fragment data suitable for RADIUS */ while (data.len > MAX_RADIUS_ATTRIBUTE_SIZE) @@ -364,8 +364,8 @@ static void process_eap(private_tnc_pdp_t *this, radius_message_t *request, /* apply EAP method selected by RADIUS server */ eap_type = in->get_type(in, &eap_vendor); - DBG3(DBG_CFG, "EAP-%N payload %B", - eap_type_get_names(eap_vendor), eap_type, &message); + DBG3(DBG_CFG, "EAP-%M payload %B", + eap_type_get_names, eap_vendor, eap_type, &message); if (eap_type == EAP_IDENTITY) { @@ -650,8 +650,8 @@ tnc_pdp_t *tnc_pdp_create(u_int16_t port) destroy(this); return NULL; } - DBG1(DBG_IKE, "eap method %N selected", - eap_type_get_names(this->vendor), this->type); + DBG1(DBG_IKE, "eap method %M selected", + eap_type_get_names, this->vendor, this->type); lib->processor->queue_job(lib->processor, (job_t*)callback_job_create_with_prio((callback_job_cb_t)receive, this, diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c index c7d3fb6569..84b2f02c58 100644 --- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c +++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c @@ -190,15 +190,15 @@ static eap_payload_t* server_initiate_eap(private_eap_authenticator_t *this, if (this->method->initiate(this->method, &out) == NEED_MORE) { type = this->method->get_type(this->method, &vendor); - DBG1(DBG_IKE, "%s EAP-%N method (id 0x%02X)", action, - eap_type_get_names(vendor), type, out->get_identifier(out)); + DBG1(DBG_IKE, "%s EAP-%M method (id 0x%02X)", action, + eap_type_get_names, vendor, type, out->get_identifier(out)); return out; } /* type might have changed for virtual methods */ type = this->method->get_type(this->method, &vendor); } - DBG1(DBG_IKE, "%s EAP-%N method failed", action, - eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "%s EAP-%M method failed", action, + eap_type_get_names, vendor, type); return eap_payload_create_code(EAP_FAILURE, 0); } @@ -284,8 +284,8 @@ static eap_payload_t* server_process_eap(private_eap_authenticator_t *this, { this->msk = chunk_clone(this->msk); } - DBG1(DBG_IKE, "EAP method %N succeeded, %sMSK established", - eap_type_get_names(vendor), type, this->msk.ptr ? "" : "no "); + DBG1(DBG_IKE, "EAP method %M succeeded, %sMSK established", + eap_type_get_names, vendor, type, this->msk.ptr ? "" : "no "); this->ike_sa->set_condition(this->ike_sa, COND_EAP_AUTHENTICATED, TRUE); this->eap_complete = TRUE; @@ -293,8 +293,8 @@ static eap_payload_t* server_process_eap(private_eap_authenticator_t *this, case FAILED: default: /* type might have changed for virtual methods */ - DBG1(DBG_IKE, "EAP method %N failed for peer %Y", - eap_type_get_names(vendor), type, + DBG1(DBG_IKE, "EAP method %M failed for peer %Y", + eap_type_get_names, vendor, type, this->ike_sa->get_other_id(this->ike_sa)); return eap_payload_create_code(EAP_FAILURE, in->get_identifier(in)); } @@ -347,8 +347,8 @@ static eap_payload_t* client_process_eap(private_eap_authenticator_t *this, } if (this->method == NULL) { - DBG1(DBG_IKE, "server requested %N authentication (id 0x%02X)", - eap_type_get_names(vendor), type, in->get_identifier(in)); + DBG1(DBG_IKE, "server requested %M authentication (id 0x%02X)", + eap_type_get_names, vendor, type, in->get_identifier(in)); auth = this->ike_sa->get_auth_cfg(this->ike_sa, TRUE); conf_type = (uintptr_t)auth->get(auth, AUTH_RULE_EAP_TYPE); @@ -356,8 +356,8 @@ static eap_payload_t* client_process_eap(private_eap_authenticator_t *this, if (conf_type != EAP_NAK && (conf_type != type || conf_vendor != vendor)) { - DBG1(DBG_IKE, "requesting EAP-%N authentication, sending EAP_NAK", - eap_type_get_names(conf_vendor), conf_type); + DBG1(DBG_IKE, "requesting EAP-%M authentication, sending EAP_NAK", + eap_type_get_names, conf_vendor, conf_type); return eap_payload_create_nak(in->get_identifier(in), conf_type, conf_vendor, in->is_expanded(in)); } @@ -377,7 +377,7 @@ static eap_payload_t* client_process_eap(private_eap_authenticator_t *this, return out; } - DBG1(DBG_IKE, "EAP-%N method failed", eap_type_get_names(vendor), type); + DBG1(DBG_IKE, "EAP-%M method failed", eap_type_get_names, vendor, type); return NULL; } @@ -527,8 +527,8 @@ METHOD(authenticator_t, process_client, status_t, type = this->method->get_type(this->method, &vendor); DBG1(DBG_IKE, "EAP-only authentication requires a mutual and " - "MSK deriving EAP method, but %N is not", - eap_type_get_names(vendor), type); + "MSK deriving EAP method, but %M is not", + eap_type_get_names, vendor, type); return FAILED; } return SUCCESS; @@ -560,8 +560,8 @@ METHOD(authenticator_t, process_client, status_t, this->msk = chunk_clone(this->msk); } type = this->method->get_type(this->method, &vendor); - DBG1(DBG_IKE, "EAP method %N succeeded, %sMSK established", - eap_type_get_names(vendor), type, + DBG1(DBG_IKE, "EAP method %M succeeded, %sMSK established", + eap_type_get_names, vendor, type, this->msk.ptr ? "" : "no "); cfg = this->ike_sa->get_auth_cfg(this->ike_sa, TRUE); cfg->add(cfg, AUTH_RULE_EAP_TYPE, type);