diff options
| author | Martin Willi <martin@revosec.ch> | 2013-10-29 10:09:39 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-04 15:53:03 +0200 |
| commit | 3ecfc83c6be2e96d01bf8ee805737e9e14262a01 (patch) | |
| tree | 30dc063d27f594158ae6b1773b24bb32f44374a8 /src/libcharon/sa/ikev2/tasks/ike_cert_pre.c | |
| parent | 396baeaea257608655f91a824ddfcbb3fa01e7a5 (diff) | |
| download | strongswan-3ecfc83c6be2e96d01bf8ee805737e9e14262a01.tar.bz2 strongswan-3ecfc83c6be2e96d01bf8ee805737e9e14262a01.tar.xz | |
payload: Use common prefixes for all payload type identifiers
The old identifiers did not use a proper namespace and often clashed with
other defines.
Diffstat (limited to 'src/libcharon/sa/ikev2/tasks/ike_cert_pre.c')
| -rw-r--r-- | src/libcharon/sa/ikev2/tasks/ike_cert_pre.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c index 558b1e914..0dac975e7 100644 --- a/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c +++ b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c @@ -138,10 +138,10 @@ static void process_certreqs(private_ike_cert_pre_t *this, message_t *message) { switch (payload->get_type(payload)) { - case CERTIFICATE_REQUEST: + case PLV2_CERTREQ: process_certreq(this, (certreq_payload_t*)payload, auth); break; - case NOTIFY: + case PLV2_NOTIFY: process_notify(this, (notify_payload_t*)payload); break; default: @@ -298,7 +298,7 @@ static void process_certs(private_ike_cert_pre_t *this, message_t *message) enumerator = message->create_payload_enumerator(message); while (enumerator->enumerate(enumerator, &payload)) { - if (payload->get_type(payload) == CERTIFICATE) + if (payload->get_type(payload) == PLV2_CERTIFICATE) { cert_payload_t *cert_payload; cert_encoding_t encoding; @@ -469,7 +469,7 @@ static void build_certreqs(private_ike_cert_pre_t *this, message_t *message) static bool final_auth(message_t *message) { /* we check for an AUTH payload without a ANOTHER_AUTH_FOLLOWS notify */ - if (message->get_payload(message, AUTHENTICATION) == NULL) + if (message->get_payload(message, PLV2_AUTH) == NULL) { return FALSE; } |