payload: Use common prefixes for all payload type identifiers
[strongswan.git] / src / libcharon / plugins / xauth_generic / xauth_generic.c
index 5df8aad..c37da0c 100644 (file)
@@ -69,7 +69,7 @@ METHOD(xauth_method_t, process_peer, status_t,
        }
        enumerator->destroy(enumerator);
 
-       cp = cp_payload_create_type(CONFIGURATION_V1, CFG_REPLY);
+       cp = cp_payload_create_type(PLV1_CONFIGURATION, CFG_REPLY);
 
        enumerator = in->create_attribute_enumerator(in);
        while (enumerator->enumerate(enumerator, &attr))
@@ -80,7 +80,7 @@ METHOD(xauth_method_t, process_peer, status_t,
                {
                        case XAUTH_USER_NAME:
                                cp->add_attribute(cp, configuration_attribute_create_chunk(
-                                                       CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_NAME,
+                                                       PLV1_CONFIGURATION_ATTRIBUTE, XAUTH_USER_NAME,
                                                        this->peer->get_encoding(this->peer)));
                                break;
                        case XAUTH_NEXT_PIN:
@@ -99,7 +99,7 @@ METHOD(xauth_method_t, process_peer, status_t,
                                        return FAILED;
                                }
                                cp->add_attribute(cp, configuration_attribute_create_chunk(
-                                                       CONFIGURATION_ATTRIBUTE_V1, attr->get_type(attr),
+                                                       PLV1_CONFIGURATION_ATTRIBUTE, attr->get_type(attr),
                                                        shared->get_key(shared)));
                                shared->destroy(shared);
                                break;
@@ -118,11 +118,11 @@ METHOD(xauth_method_t, initiate_server, status_t,
 {
        cp_payload_t *cp;
 
-       cp = cp_payload_create_type(CONFIGURATION_V1, CFG_REQUEST);
+       cp = cp_payload_create_type(PLV1_CONFIGURATION, CFG_REQUEST);
        cp->add_attribute(cp, configuration_attribute_create_chunk(
-                               CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_NAME, chunk_empty));
+                               PLV1_CONFIGURATION_ATTRIBUTE, XAUTH_USER_NAME, chunk_empty));
        cp->add_attribute(cp, configuration_attribute_create_chunk(
-                               CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_PASSWORD, chunk_empty));
+                               PLV1_CONFIGURATION_ATTRIBUTE, XAUTH_USER_PASSWORD, chunk_empty));
        *out = cp;
        return NEED_MORE;
 }