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/ikev1/tasks/isakmp_vendor.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/ikev1/tasks/isakmp_vendor.c')
| -rw-r--r-- | src/libcharon/sa/ikev1/tasks/isakmp_vendor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c index e07ac0ab4..426c4bd69 100644 --- a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c +++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c @@ -209,7 +209,7 @@ static void build(private_isakmp_vendor_t *this, message_t *message) (vendor_ids[i].extension == EXT_IKE_FRAGMENTATION && fragmentation)) { DBG2(DBG_IKE, "sending %s vendor ID", vendor_ids[i].desc); - vid_payload = vendor_id_payload_create_data(VENDOR_ID_V1, + vid_payload = vendor_id_payload_create_data(PLV1_VENDOR_ID, chunk_clone(chunk_create(vendor_ids[i].id, vendor_ids[i].len))); message->add_payload(message, &vid_payload->payload_interface); } @@ -220,7 +220,7 @@ static void build(private_isakmp_vendor_t *this, message_t *message) this->best_natt_ext == i) { DBG2(DBG_IKE, "sending %s vendor ID", vendor_natt_ids[i].desc); - vid_payload = vendor_id_payload_create_data(VENDOR_ID_V1, + vid_payload = vendor_id_payload_create_data(PLV1_VENDOR_ID, chunk_clone(chunk_create(vendor_natt_ids[i].id, vendor_natt_ids[i].len))); message->add_payload(message, &vid_payload->payload_interface); @@ -240,7 +240,7 @@ static void process(private_isakmp_vendor_t *this, message_t *message) enumerator = message->create_payload_enumerator(message); while (enumerator->enumerate(enumerator, &payload)) { - if (payload->get_type(payload) == VENDOR_ID_V1) + if (payload->get_type(payload) == PLV1_VENDOR_ID) { vendor_id_payload_t *vid; bool found = FALSE; |