payload: Use common prefixes for all payload type identifiers
[strongswan.git] / src / libcharon / encoding / payloads / id_payload.c
old mode 100755 (executable)
new mode 100644 (file)
index 2d27021..a002a8f
@@ -81,7 +81,7 @@ struct private_id_payload_t {
        u_int16_t port;
 
        /**
-        * one of ID_INITIATOR, ID_RESPONDER, IDv1 and NAT_OA_V1
+        * one of PLV2_ID_INITIATOR, PLV2_ID_RESPONDER, IDv1 and PLV1_NAT_OA
         */
        payload_type_t type;
 };
@@ -165,7 +165,7 @@ METHOD(payload_t, verify, status_t,
 {
        bool bad_length = FALSE;
 
-       if (this->type == NAT_OA_V1 &&
+       if ((this->type == PLV1_NAT_OA || this->type == PLV1_NAT_OA_DRAFT_00_03) &&
                this->id_type != ID_IPV4_ADDR && this->id_type != ID_IPV6_ADDR)
        {
                DBG1(DBG_ENC, "invalid ID type %N for %N payload", id_type_names,
@@ -195,7 +195,8 @@ METHOD(payload_t, verify, status_t,
 METHOD(payload_t, get_encoding_rules, int,
        private_id_payload_t *this, encoding_rule_t **rules)
 {
-       if (this->type == ID_V1 || this->type == NAT_OA_V1)
+       if (this->type == PLV1_ID ||
+               this->type == PLV1_NAT_OA || this->type == PLV1_NAT_OA_DRAFT_00_03)
        {
                *rules = encodings_v1;
                return countof(encodings_v1);
@@ -327,6 +328,15 @@ METHOD(id_payload_t, get_ts, traffic_selector_t*,
        return NULL;
 }
 
+METHOD(id_payload_t, get_encoded, chunk_t,
+       private_id_payload_t *this)
+{
+       u_int16_t port = htons(this->port);
+       return chunk_cat("cccc", chunk_from_thing(this->id_type),
+                                        chunk_from_thing(this->protocol_id),
+                                        chunk_from_thing(port), this->id_data);
+}
+
 METHOD2(payload_t, id_payload_t, destroy, void,
        private_id_payload_t *this)
 {
@@ -354,10 +364,11 @@ id_payload_t *id_payload_create(payload_type_t type)
                                .destroy = _destroy,
                        },
                        .get_identification = _get_identification,
+                       .get_encoded = _get_encoded,
                        .get_ts = _get_ts,
                        .destroy = _destroy,
                },
-               .next_payload = NO_PAYLOAD,
+               .next_payload = PL_NONE,
                .payload_length = get_header_length(this),
                .type = type,
        );
@@ -389,9 +400,21 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts)
        u_int8_t mask;
        host_t *net;
 
-       this = (private_id_payload_t*)id_payload_create(ID_V1);
+       this = (private_id_payload_t*)id_payload_create(PLV1_ID);
 
-       if (ts->to_subnet(ts, &net, &mask))
+       if (ts->is_host(ts, NULL))
+       {
+               if (ts->get_type(ts) == TS_IPV4_ADDR_RANGE)
+               {
+                       this->id_type = ID_IPV4_ADDR;
+               }
+               else
+               {
+                       this->id_type = ID_IPV6_ADDR;
+               }
+               this->id_data = chunk_clone(ts->get_from_address(ts));
+       }
+       else if (ts->to_subnet(ts, &net, &mask))
        {
                u_int8_t netmask[16], len, byte;
 
@@ -418,6 +441,7 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts)
                }
                this->id_data = chunk_cat("cc", net->get_address(net),
                                                                  chunk_create(netmask, len));
+               net->destroy(net);
        }
        else
        {
@@ -431,12 +455,12 @@ id_payload_t *id_payload_create_from_ts(traffic_selector_t *ts)
                }
                this->id_data = chunk_cat("cc",
                                                        ts->get_from_address(ts), ts->get_to_address(ts));
+               net->destroy(net);
        }
        this->port = ts->get_from_port(ts);
        this->protocol_id = ts->get_protocol(ts);
        this->payload_length += this->id_data.len;
 
-       net->destroy(net);
-
        return &this->public;
 }
+