payload: Use common prefixes for all payload type identifiers
[strongswan.git] / src / libcharon / encoding / generator.c
index 2b6825c..d4ca5b5 100644 (file)
@@ -498,15 +498,15 @@ METHOD(generator_t, generate_payload, void,
                        case ENCRYPTED_DATA:
                                generate_from_chunk(this, rules[i].offset);
                                break;
-                       case PAYLOAD_LIST + PROPOSAL_SUBSTRUCTURE:
-                       case PAYLOAD_LIST + PROPOSAL_SUBSTRUCTURE_V1:
-                       case PAYLOAD_LIST + TRANSFORM_SUBSTRUCTURE:
-                       case PAYLOAD_LIST + TRANSFORM_SUBSTRUCTURE_V1:
-                       case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
-                       case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
-                       case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
-                       case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
-                       case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
+                       case PAYLOAD_LIST + PLV2_PROPOSAL_SUBSTRUCTURE:
+                       case PAYLOAD_LIST + PLV1_PROPOSAL_SUBSTRUCTURE:
+                       case PAYLOAD_LIST + PLV2_TRANSFORM_SUBSTRUCTURE:
+                       case PAYLOAD_LIST + PLV1_TRANSFORM_SUBSTRUCTURE:
+                       case PAYLOAD_LIST + PLV2_TRANSFORM_ATTRIBUTE:
+                       case PAYLOAD_LIST + PLV1_TRANSFORM_ATTRIBUTE:
+                       case PAYLOAD_LIST + PLV2_CONFIGURATION_ATTRIBUTE:
+                       case PAYLOAD_LIST + PLV1_CONFIGURATION_ATTRIBUTE:
+                       case PAYLOAD_LIST + PLV2_TRAFFIC_SELECTOR_SUBSTRUCTURE:
                        {
                                linked_list_t *proposals;
                                enumerator_t *enumerator;