[COMMIT] branch api-next updated. v1.16.0.0-585-gbe65d81a
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via be65d81a9342e322b70376adab69270c5c9bb9e2 (commit)
via 71b8cfcecb99c8416200f1f54ab5d6dab004a69a (commit)
via dae20519a6825217dbe27842f1a24b1401410836 (commit)
via 5a5a8148fcd174cffd3e9140bed3259ac1af2d9f (commit)
via c54180d65bc9b86200f46b4f0ac540f74b884ee8 (commit)
via 7c665557d21db3ba7c4dd3d3845e7175a4a2acb6 (commit)
via 774f242c72008eecf5b07b341b76f577445fb4fb (commit)
via a4165611e5aa58b138946e17a079f8a7f065d08c (commit)
via fee9e59ca4a53ac30fea62d6b2f4b22a53042fe1 (commit)
via ad863d29c6e46487ed1ef3fad0766037faac919f (commit)
via 44f8d1421361c3238fed85a1a3d5ebff8f39cc88 (commit)
via 412235594802aa4e4b3f63efc464de18955265c5 (commit)
via 11620182599921c91e2d4f764b0ef921c171523b (commit)
via 043db6742a8dfc218409aba0e456365163b8b249 (commit)
via 16568d747ba2eb4a91962641e19b5da1d7a6091c (commit)
via cf17398302b4114b17d92d41de4dd4fe7d72a16a (commit)
from 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be65d81a9342e322b70376adab69270c5c9bb9e2
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 3 13:58:57 2017 +0300
validation: ipsec: add AES-CTR tests
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 6c562358..277d393a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -168,6 +168,10 @@ int ipsec_check(odp_bool_t ah,
if (!capa.ciphers.bit.aes_cbc)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ if (!capa.ciphers.bit.aes_ctr)
+ return ODP_TEST_INACTIVE;
+ break;
case ODP_CIPHER_ALG_AES_GCM:
if (!capa.ciphers.bit.aes_gcm)
return ODP_TEST_INACTIVE;
@@ -259,6 +263,12 @@ int ipsec_check_esp_aes_cbc_128_sha256(void)
ODP_AUTH_ALG_SHA256_HMAC);
}
+int ipsec_check_esp_aes_ctr_128_null(void)
+{
+ return ipsec_check_esp(ODP_CIPHER_ALG_AES_CTR, 128,
+ ODP_AUTH_ALG_NULL);
+}
+
int ipsec_check_esp_aes_gcm_128(void)
{
return ipsec_check_esp(ODP_CIPHER_ALG_AES_GCM, 128,
diff --git a/test/validation/api/ipsec/ipsec.h b/test/validation/api/ipsec/ipsec.h
index d1c6854b..d4506367 100644
--- a/test/validation/api/ipsec/ipsec.h
+++ b/test/validation/api/ipsec/ipsec.h
@@ -83,6 +83,7 @@ int ipsec_check_ah_sha256(void);
int ipsec_check_esp_null_sha256(void);
int ipsec_check_esp_aes_cbc_128_null(void);
int ipsec_check_esp_aes_cbc_128_sha256(void);
+int ipsec_check_esp_aes_ctr_128_null(void);
int ipsec_check_esp_aes_gcm_128(void);
int ipsec_check_esp_aes_gcm_256(void);
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 598a83e3..8c883262 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -191,6 +191,36 @@ static void test_in_esp_aes_cbc_sha256(void)
ipsec_sa_destroy(sa);
}
+static void test_in_esp_aes_ctr_null(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
+ ODP_AUTH_ALG_NULL, NULL,
+ &key_mcgrew_gcm_salt_3);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_aes_ctr_null_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_lookup_ah_sha256(void)
{
odp_ipsec_sa_param_t param;
@@ -987,6 +1017,8 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_aes_cbc_128_null),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_cbc_sha256,
ipsec_check_esp_aes_cbc_128_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_aes_ctr_null,
+ ipsec_check_esp_aes_ctr_128_null),
ODP_TEST_INFO_CONDITIONAL(test_in_lookup_ah_sha256,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_lookup_esp_null_sha256,
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index 39a3c30f..b543271b 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -277,6 +277,48 @@ static void test_out_esp_aes_cbc_sha256(void)
ipsec_sa_destroy(sa);
}
+static void test_out_esp_aes_ctr_null(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+ odp_ipsec_sa_t sa2;
+
+ ipsec_sa_param_fill(¶m,
+ false, false, 123, NULL,
+ ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
+ ODP_AUTH_ALG_NULL, NULL,
+ &key_mcgrew_gcm_salt_3);
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_AES_CTR, &key_a5_128,
+ ODP_AUTH_ALG_NULL, NULL,
+ &key_mcgrew_gcm_salt_3);
+
+ sa2 = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa2);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_out_in_one(&test, sa, sa2);
+
+ ipsec_sa_destroy(sa2);
+ ipsec_sa_destroy(sa);
+}
+
static void test_out_esp_aes_gcm128(void)
{
odp_ipsec_sa_param_t param;
@@ -342,6 +384,8 @@ odp_testinfo_t ipsec_out_suite[] = {
ipsec_check_esp_aes_cbc_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_cbc_sha256,
ipsec_check_esp_aes_cbc_128_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_ctr_null,
+ ipsec_check_esp_aes_ctr_128_null),
ODP_TEST_INFO_CONDITIONAL(test_out_esp_aes_gcm128,
ipsec_check_esp_aes_gcm_128),
ODP_TEST_INFO_NULL,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 593a8f45..fbf7d366 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -583,6 +583,45 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_sha256_1 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_ctr_null_1 = {
+ .len = 162,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x32, 0xab, 0xe2, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x00, 0x01,
+
+ /* IV */
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+ /* data */
+ 0x39, 0xab, 0xe5, 0xae, 0x74, 0x57, 0x76, 0x7f,
+ 0x1d, 0x1f, 0xce, 0xe8, 0xca, 0xf1, 0x87, 0xf5,
+ 0xfd, 0x9e, 0x1d, 0x20, 0x38, 0x30, 0x8a, 0xe5,
+ 0xb9, 0x55, 0x80, 0x7b, 0xfd, 0x9d, 0xb9, 0x99,
+ 0x85, 0xcd, 0xb5, 0x30, 0x86, 0xaa, 0xe1, 0x7a,
+ 0x69, 0xe5, 0xfa, 0x38, 0xf3, 0x0f, 0x91, 0x18,
+ 0x75, 0x7b, 0x5f, 0x4e, 0x69, 0x17, 0xaa, 0xe7,
+ 0x84, 0x6c, 0x40, 0x31, 0xec, 0x87, 0x4c, 0x8c,
+ 0xb3, 0xb4, 0x9f, 0x7e, 0xea, 0x83, 0x6f, 0xc6,
+ 0x11, 0xd5, 0xce, 0xbe, 0x65, 0x37, 0x1c, 0xb6,
+ 0xd3, 0xcb, 0x51, 0xa8, 0xa4, 0x0e, 0x3e, 0xe6,
+ 0x26, 0xd8, 0x17, 0xec, 0x8b, 0xca, 0x79, 0x96,
+ 0xa0, 0xcd, 0x6f, 0xdd, 0x9e, 0xe9, 0x6a, 0xc0,
+ 0xf2, 0x6c, 0xdb, 0xfd, 0x99, 0xa2, 0xb5, 0xbf,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_rfc3602_5 = {
.len = 98,
.l2_offset = 0,
commit 71b8cfcecb99c8416200f1f54ab5d6dab004a69a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 3 13:59:44 2017 +0300
linux-gen: ipsec: add AES-CTR cipher support
Add support for encrypting packets with AES-CTR cipher.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 0a7f9625..b50b65be 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -127,6 +127,7 @@ struct ipsec_sa_s {
unsigned dec_ttl : 1;
unsigned copy_dscp : 1;
unsigned copy_df : 1;
+ unsigned aes_ctr_iv : 1;
/* Only for outbound */
unsigned use_counter_iv : 1;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 4c032b9c..9533ca42 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -337,6 +337,13 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto err;
}
+ if (ipsec_sa->aes_ctr_iv) {
+ iv[12] = 0;
+ iv[13] = 0;
+ iv[14] = 0;
+ iv[15] = 1;
+ }
+
hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
trl_len = _ODP_ESPTRL_LEN + ipsec_sa->icv_len;
@@ -729,6 +736,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
memcpy(iv + ipsec_sa->salt_length, &ctr,
ipsec_sa->esp_iv_len);
+ if (ipsec_sa->aes_ctr_iv) {
+ iv[12] = 0;
+ iv[13] = 0;
+ iv[14] = 0;
+ iv[15] = 1;
+ }
} else if (ipsec_sa->esp_iv_len) {
uint32_t len;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 42517569..8eaa4f90 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -319,6 +319,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->esp_block_len = 16;
crypto_param.iv.length = 16;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ ipsec_sa->use_counter_iv = 1;
+ ipsec_sa->aes_ctr_iv = 1;
+ ipsec_sa->esp_iv_len = 8;
+ ipsec_sa->esp_block_len = 16;
+ crypto_param.iv.length = 16;
+ break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
#endif
commit dae20519a6825217dbe27842f1a24b1401410836
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:12:37 2017 +0300
linux-gen: ipsec: don't leak SA on creation error
Some paths during odp_ipsec_sa_create() can lead to SA leakage. Fix
them by always releasing SA in error case.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index c3011924..42517569 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -296,7 +296,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->icv_len = 16;
break;
default:
- return ODP_IPSEC_SA_INVALID;
+ goto error;
}
switch (crypto_param.cipher_alg) {
@@ -329,7 +329,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
crypto_param.iv.length = 12;
break;
default:
- return ODP_IPSEC_SA_INVALID;
+ goto error;
}
if (1 == ipsec_sa->use_counter_iv &&
commit 5a5a8148fcd174cffd3e9140bed3259ac1af2d9f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 1 11:00:27 2017 +0300
linux-gen: ipsec: correct frag_offset for tunneled packets
Generated outer header should have frag_offset = 0, MF = 0. Change code
accordingly.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index aadc671f..4c032b9c 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -663,10 +663,10 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
out_ip.id = odp_atomic_fetch_add_u32(&ipsec_sa->out.tun_hdr_id,
1);
if (ipsec_sa->copy_df)
- out_ip.frag_offset = ip->frag_offset;
+ out_ip.frag_offset = ip->frag_offset & 0x4000;
else
- out_ip.frag_offset = (ip->frag_offset & ~0x4000) |
- (ipsec_sa->out.tun_df << 14);
+ out_ip.frag_offset =
+ ((uint16_t)ipsec_sa->out.tun_df) << 14;
out_ip.ttl = ipsec_sa->out.tun_ttl;
out_ip.proto = _ODP_IPV4;
/* Will be filled later by packet checksum update */
commit c54180d65bc9b86200f46b4f0ac540f74b884ee8
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Nov 3 13:57:27 2017 +0300
linux-gen: ipsec: validate ip header total length
Check that IP packet length from the header is not bogus.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index f8085756..aadc671f 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -286,6 +286,11 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_offset = ip_offset + ip_hdr_len;
+ if (odp_be_to_cpu_16(ip->tot_len) + ip_offset > odp_packet_len(pkt)) {
+ status->error.alg = 1;
+ goto err;
+ }
+
if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
status->error.proto = 1;
goto err;
@@ -634,6 +639,11 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
goto err;
}
+ if (odp_be_to_cpu_16(ip->tot_len) + ip_offset > odp_packet_len(pkt)) {
+ status->error.alg = 1;
+ goto err;
+ }
+
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
_odp_ipv4hdr_t out_ip;
uint16_t tot_len;
commit 7c665557d21db3ba7c4dd3d3845e7175a4a2acb6
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 31 18:04:35 2017 +0300
validation: check that erroneous IPsec packets have error flag set
Verify that odp_packet_has_error() returns true for IPsec packets with
error status in result.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 853bd88a..6c562358 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -613,6 +613,8 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i]));
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
+ CU_ASSERT(!result.status.error.all ==
+ !odp_packet_has_error(pkto[i]));
CU_ASSERT_EQUAL(suite_context.inbound_op_mode ==
ODP_IPSEC_OP_MODE_INLINE,
result.flag.inline_mode);
@@ -652,6 +654,8 @@ void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i]));
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
+ CU_ASSERT(!result.status.error.all ==
+ !odp_packet_has_error(pkto[i]));
CU_ASSERT_EQUAL(sa, result.sa);
CU_ASSERT_EQUAL(IPSEC_SA_CTX,
odp_ipsec_sa_context(sa));
commit 774f242c72008eecf5b07b341b76f577445fb4fb
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 31 18:02:50 2017 +0300
linux-gen: ipsec: mark IPsec packets with errors with error flag
Add new ipsec_err error flag, which is set by IPsec code if there was an
error during IPsec packet processing. This allow application code to
quickly check packets using odp_packet_has_error() function and use fast
path if there was none.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index fc10d61c..e62854b1 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -55,6 +55,7 @@ typedef union {
uint32_t tcp_err:1; /**< TCP error, checks TBD */
uint32_t udp_err:1; /**< UDP error, checks TBD */
uint32_t l4_chksum:1; /**< L4 checksum error */
+ uint32_t ipsec_err:1; /**< IPsec error */
};
} error_flags_t;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 1f9d410d..f8085756 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -272,6 +272,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
uint8_t ip_ttl; /**< Saved IP TTL value */
uint16_t ip_frag_offset; /**< Saved IP flags value */
odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_hdr_t *pkt_hdr;
ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset);
ODP_ASSERT(NULL != ip);
@@ -287,7 +288,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
status->error.proto = 1;
- goto out;
+ goto err;
}
/* Check IP header for IPSec protocols and look it up */
@@ -297,7 +298,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, ipsec_offset,
sizeof(esp), &esp) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_SA_INVALID == sa) {
@@ -310,7 +311,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
if (NULL == ipsec_sa) {
status->error.sa_lookup = 1;
- goto out;
+ goto err;
}
} else {
ipsec_sa = _odp_ipsec_sa_use(sa);
@@ -318,7 +319,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (ipsec_sa->proto != ODP_IPSEC_ESP ||
ipsec_sa->spi != odp_be_to_cpu_32(esp.spi)) {
status->error.proto = 1;
- goto out;
+ goto err;
}
}
@@ -328,7 +329,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_sa->esp_iv_len,
iv + ipsec_sa->salt_length) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
hdr_len = _ODP_ESPHDR_LEN + ipsec_sa->esp_iv_len;
@@ -362,7 +363,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, ipsec_offset,
sizeof(ah), &ah) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_SA_INVALID == sa) {
@@ -375,7 +376,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ipsec_sa = _odp_ipsec_sa_lookup(&lookup);
if (NULL == ipsec_sa) {
status->error.sa_lookup = 1;
- goto out;
+ goto err;
}
} else {
ipsec_sa = _odp_ipsec_sa_use(sa);
@@ -383,7 +384,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (ipsec_sa->proto != ODP_IPSEC_AH ||
ipsec_sa->spi != odp_be_to_cpu_32(ah.spi)) {
status->error.proto = 1;
- goto out;
+ goto err;
}
}
@@ -417,16 +418,16 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
stats_length = param.auth_range.length;
} else {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (_odp_ipsec_sa_replay_precheck(ipsec_sa,
odp_be_to_cpu_32(aad.seq_no),
status) < 0)
- goto out;
+ goto err;
if (_odp_ipsec_sa_stats_precheck(ipsec_sa, status) < 0)
- goto out;
+ goto err;
param.session = ipsec_sa->session;
@@ -434,14 +435,14 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
rc = odp_crypto_result(&crypto, pkt);
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
if (!crypto.ok) {
@@ -457,16 +458,16 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ODP_CRYPTO_HW_ERR_NONE))
status->error.auth = 1;
- goto out;
+ goto err;
}
if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
- goto out;
+ goto err;
if (_odp_ipsec_sa_replay_update(ipsec_sa,
odp_be_to_cpu_32(aad.seq_no),
status) < 0)
- goto out;
+ goto err;
ip_offset = odp_packet_l3_offset(pkt);
ip = odp_packet_l3_ptr(pkt, NULL);
@@ -484,18 +485,18 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, esptrl_offset,
sizeof(esptrl), &esptrl) < 0) {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (ip_offset + esptrl.pad_len > esptrl_offset) {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (_odp_packet_cmp_data(pkt, esptrl_offset - esptrl.pad_len,
ipsec_padding, esptrl.pad_len) != 0) {
status->error.proto = 1;
- goto out;
+ goto err;
}
ip->proto = esptrl.next_header;
@@ -509,7 +510,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_copy_to_mem(pkt, ipsec_offset,
sizeof(ah), &ah) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
ip->proto = ah.next_header;
@@ -520,12 +521,12 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ip->frag_offset = odp_cpu_to_be_16(ip_frag_offset);
} else {
status->error.proto = 1;
- goto out;
+ goto err;
}
if (odp_packet_trunc_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
@@ -536,7 +537,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_trunc_head(&pkt, ip_hdr_len + hdr_len,
NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
} else {
odp_packet_move_data(pkt, hdr_len, 0,
@@ -544,7 +545,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (odp_packet_trunc_head(&pkt, hdr_len,
NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
}
@@ -559,15 +560,21 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
_odp_ipv4_csum_update(pkt);
}
- if (!status->error.all) {
- odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr = odp_packet_hdr(pkt);
+
+ packet_parse_reset(pkt_hdr);
- packet_parse_reset(pkt_hdr);
+ packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
+ ip_offset, _ODP_ETHTYPE_IPV4);
+
+ *pkt_out = pkt;
+
+ return ipsec_sa;
+
+err:
+ pkt_hdr = odp_packet_hdr(pkt);
+ pkt_hdr->p.error_flags.ipsec_err = 1;
- packet_parse_l3_l4(pkt_hdr, parse_layer(ipsec_config.inbound.parse),
- ip_offset, _ODP_ETHTYPE_IPV4);
- }
-out:
*pkt_out = pkt;
return ipsec_sa;
@@ -606,6 +613,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
uint8_t ip_ttl; /**< Saved IP TTL value */
uint16_t ip_frag_offset; /**< Saved IP flags value */
odp_crypto_packet_result_t crypto; /**< Crypto operation result */
+ odp_packet_hdr_t *pkt_hdr;
ODP_ASSERT(ODP_PACKET_OFFSET_INVALID != ip_offset);
ODP_ASSERT(NULL != ip);
@@ -623,7 +631,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (ODP_IPSEC_MODE_TRANSPORT == ipsec_sa->mode &&
_ODP_IPV4HDR_IS_FRAGMENT(odp_be_to_cpu_16(ip->frag_offset))) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (ODP_IPSEC_MODE_TUNNEL == ipsec_sa->mode) {
@@ -659,7 +667,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (odp_packet_extend_head(&pkt, _ODP_IPV4HDR_LEN,
NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
odp_packet_move_data(pkt, 0, _ODP_IPV4HDR_LEN, ip_offset);
@@ -705,7 +713,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
1);
/* Check for overrun */
if (ctr == 0)
- goto out;
+ goto err;
memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
memcpy(iv + ipsec_sa->salt_length, &ctr,
@@ -719,7 +727,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (len != ipsec_sa->esp_iv_len) {
status->error.alg = 1;
- goto out;
+ goto err;
}
}
@@ -727,12 +735,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset);
@@ -805,12 +813,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
if (odp_packet_extend_head(&pkt, hdr_len, NULL, NULL) < 0) {
status->error.alg = 1;
- goto out;
+ goto err;
}
odp_packet_move_data(pkt, 0, hdr_len, ipsec_offset);
@@ -852,12 +860,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
stats_length = param.auth_range.length;
} else {
status->error.alg = 1;
- goto out;
+ goto err;
}
/* No need to run precheck here, we know that packet is authentic */
if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
- goto out;
+ goto err;
param.session = ipsec_sa->session;
@@ -865,14 +873,14 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
rc = odp_crypto_result(&crypto, pkt);
if (rc < 0) {
ODP_DBG("Crypto failed\n");
status->error.alg = 1;
- goto out;
+ goto err;
}
if (!crypto.ok) {
@@ -888,7 +896,7 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ODP_CRYPTO_HW_ERR_NONE))
status->error.auth = 1;
- goto out;
+ goto err;
}
ip = odp_packet_l3_ptr(pkt, NULL);
@@ -902,7 +910,13 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
_odp_ipv4_csum_update(pkt);
-out:
+ *pkt_out = pkt;
+ return ipsec_sa;
+
+err:
+ pkt_hdr = odp_packet_hdr(pkt);
+
+ pkt_hdr->p.error_flags.ipsec_err = 1;
*pkt_out = pkt;
return ipsec_sa;
commit a4165611e5aa58b138946e17a079f8a7f065d08c
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:15:04 2017 +0300
validation: ipsec: add replay window checks
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 25fc00e1..598a83e3 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -284,6 +284,202 @@ static void test_in_esp_null_sha256_tun(void)
ipsec_sa_destroy(sa);
}
+static void test_in_ah_sha256_noreplay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 0;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_ah_sha256_replay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, true, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 32;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_repl = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.antireplay = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_ah_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_repl, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test_repl, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_esp_null_sha256_noreplay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 0;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
+static void test_in_esp_null_sha256_replay(void)
+{
+ odp_ipsec_sa_param_t param;
+ odp_ipsec_sa_t sa;
+
+ ipsec_sa_param_fill(¶m,
+ true, false, 123, NULL,
+ ODP_CIPHER_ALG_NULL, NULL,
+ ODP_AUTH_ALG_SHA256_HMAC, &key_5a_256,
+ NULL);
+ param.inbound.antireplay_ws = 32;
+
+ sa = odp_ipsec_sa_create(¶m);
+
+ CU_ASSERT_NOT_EQUAL_FATAL(ODP_IPSEC_SA_INVALID, sa);
+
+ ipsec_test_part test = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_test_part test_repl = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.antireplay = 1,
+ .pkt_out = NULL },
+ },
+ };
+
+ ipsec_test_part test_1235 = {
+ .pkt_in = &pkt_icmp_0_esp_null_sha256_1235,
+ .out_pkt = 1,
+ .out = {
+ { .status.warn.all = 0,
+ .status.error.all = 0,
+ .pkt_out = &pkt_icmp_0 },
+ },
+ };
+
+ ipsec_check_in_one(&test, sa);
+ ipsec_check_in_one(&test_repl, sa);
+ ipsec_check_in_one(&test_1235, sa);
+ ipsec_check_in_one(&test_repl, sa);
+
+ ipsec_sa_destroy(sa);
+}
+
static void test_in_ah_esp_pkt(void)
{
odp_ipsec_sa_param_t param;
@@ -797,6 +993,14 @@ odp_testinfo_t ipsec_in_suite[] = {
ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_tun,
ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_noreplay,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_ah_sha256_replay,
+ ipsec_check_ah_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_noreplay,
+ ipsec_check_esp_null_sha256),
+ ODP_TEST_INFO_CONDITIONAL(test_in_esp_null_sha256_replay,
+ ipsec_check_esp_null_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_ah_esp_pkt,
ipsec_check_ah_sha256),
ODP_TEST_INFO_CONDITIONAL(test_in_esp_ah_pkt,
diff --git a/test/validation/api/ipsec/test_vectors.h b/test/validation/api/ipsec/test_vectors.h
index 2fb06b2b..593a8f45 100644
--- a/test/validation/api/ipsec/test_vectors.h
+++ b/test/validation/api/ipsec/test_vectors.h
@@ -278,6 +278,50 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1_bad2 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_ah_sha256_1235 = {
+ .len = 170,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x33, 0xab, 0xd9, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* AH */
+ 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b,
+ 0x00, 0x00, 0x12, 0x35,
+ 0x04, 0xef, 0x71, 0x73, 0xa1, 0xd4, 0x71, 0x3f,
+ 0xd6, 0x78, 0xfe, 0xa2, 0x59, 0xe9, 0x93, 0x70,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37,
+
+ /* ICMP echo */
+ 0x12, 0x34, 0x00, 0x00,
+
+ /* data */
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1 = {
.len = 170,
.l2_offset = 0,
@@ -412,6 +456,49 @@ static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1_bad1 = {
},
};
+static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_null_sha256_1235 = {
+ .len = 170,
+ .l2_offset = 0,
+ .l3_offset = 14,
+ .l4_offset = 34,
+ .data = {
+ /* ETH */
+ 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1,
+ 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0x08, 0x00,
+
+ /* IP */
+ 0x45, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x32, 0xab, 0xda, 0xc0, 0xa8, 0x6f, 0x02,
+ 0xc0, 0xa8, 0xde, 0x02,
+
+ /* ESP */
+ 0x00, 0x00, 0x00, 0x7b, 0x00, 0x00, 0x12, 0x35,
+
+ /* ICMP */
+ 0x08, 0x00, 0xfb, 0x37, 0x12, 0x34, 0x00, 0x00,
+ 0xba, 0xbe, 0x01, 0x23, 0x45, 0x67, 0xca, 0xfe,
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+ 0x58, 0x59, 0x5a, 0x5b,
+
+ /* ESP TRL */
+ 0x01, 0x02, 0x02, 0x01,
+
+ /* ICV */
+ 0x2f, 0xfb, 0xdd, 0x9d, 0xc0, 0xca, 0xb8, 0x0a,
+ 0xaa, 0xf1, 0x59, 0x31, 0x4e, 0xef, 0x62, 0x50,
+ },
+};
+
static const ODP_UNUSED ipsec_test_packet pkt_icmp_0_esp_aes_cbc_null_1 = {
.len = 170,
.l2_offset = 0,
commit fee9e59ca4a53ac30fea62d6b2f4b22a53042fe1
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:12:01 2017 +0300
linux-gen: ipsec: support replay window checks
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index dc6359d6..1f9d410d 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -42,6 +42,8 @@ int odp_ipsec_capability(odp_ipsec_capability_t *capa)
capa->max_num_sa = ODP_CONFIG_IPSEC_SAS;
+ capa->max_antireplay_ws = IPSEC_ANTIREPLAY_WS;
+
rc = odp_crypto_capability(&crypto_capa);
if (rc < 0)
return rc;
@@ -402,6 +404,12 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
ip->frag_offset = 0;
ip->ttl = 0;
+ aad.spi = ah.spi;
+ aad.seq_no = ah.seq_no;
+
+ param.aad.ptr = (uint8_t *)&aad;
+ param.aad.length = sizeof(aad);
+
param.auth_range.offset = ip_offset;
param.auth_range.length = odp_be_to_cpu_16(ip->tot_len);
param.hash_result_offset = ipsec_offset + _ODP_AHHDR_LEN;
@@ -412,6 +420,11 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto out;
}
+ if (_odp_ipsec_sa_replay_precheck(ipsec_sa,
+ odp_be_to_cpu_32(aad.seq_no),
+ status) < 0)
+ goto out;
+
if (_odp_ipsec_sa_stats_precheck(ipsec_sa, status) < 0)
goto out;
@@ -450,6 +463,11 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
goto out;
+ if (_odp_ipsec_sa_replay_update(ipsec_sa,
+ odp_be_to_cpu_32(aad.seq_no),
+ status) < 0)
+ goto out;
+
ip_offset = odp_packet_l3_offset(pkt);
ip = odp_packet_l3_ptr(pkt, NULL);
ip_hdr_len = ipv4_hdr_len(ip);
@@ -809,6 +827,12 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ah.next_header = ip->proto;
ip->proto = _ODP_IPPROTO_AH;
+ aad.spi = ah.spi;
+ aad.seq_no = ah.seq_no;
+
+ param.aad.ptr = (uint8_t *)&aad;
+ param.aad.length = sizeof(aad);
+
odp_packet_copy_from_mem(pkt,
ipsec_offset, _ODP_AHHDR_LEN,
&ah);
commit ad863d29c6e46487ed1ef3fad0766037faac919f
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:11:28 2017 +0300
linux-gen: ipsec: add replay window support to SAD
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 68ab195c..0a7f9625 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -81,6 +81,9 @@ int _odp_ipsec_status_send(odp_queue_t queue,
#define IPSEC_MAX_SALT_LEN 4 /**< Maximum salt length in bytes */
+/* 32 is minimum required by the standard. We do not support more */
+#define IPSEC_ANTIREPLAY_WS 32
+
/**
* Maximum number of available SAs
*/
@@ -127,6 +130,9 @@ struct ipsec_sa_s {
/* Only for outbound */
unsigned use_counter_iv : 1;
+
+ /* Only for inbound */
+ unsigned antireplay : 1;
};
};
@@ -134,6 +140,7 @@ struct ipsec_sa_s {
struct {
odp_ipsec_lookup_mode_t lookup_mode;
odp_u32be_t lookup_dst_ip;
+ odp_atomic_u64_t antireplay;
} in;
struct {
@@ -200,6 +207,19 @@ int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status);
+/* Run pre-check on sequence number of the packet.
+ *
+ * @retval <0 if the packet falls out of window
+ */
+int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status);
+
+/* Run check on sequence number of the packet and update window if necessary.
+ *
+ * @retval <0 if the packet falls out of window
+ */
+int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status);
/**
* Try inline IPsec processing of provided packet.
*
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index e42bf94e..c3011924 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -215,6 +215,10 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
param->inbound.lookup_param.dst_addr,
sizeof(ipsec_sa->in.lookup_dst_ip));
+ if (param->inbound.antireplay_ws > IPSEC_ANTIREPLAY_WS)
+ return ODP_IPSEC_SA_INVALID;
+ ipsec_sa->antireplay = (param->inbound.antireplay_ws != 0);
+ odp_atomic_init_u64(&ipsec_sa->in.antireplay, 0);
} else {
odp_atomic_store_u32(&ipsec_sa->out.seq, 1);
}
@@ -528,3 +532,59 @@ int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
return rc;
}
+
+int _odp_ipsec_sa_replay_precheck(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status)
+{
+ /* Try to be as quick as possible, we will discard packets later */
+ if (ipsec_sa->antireplay &&
+ seq + IPSEC_ANTIREPLAY_WS <=
+ (odp_atomic_load_u64(&ipsec_sa->in.antireplay) & 0xffffffff)) {
+ status->error.antireplay = 1;
+ return -1;
+ }
+
+ return 0;
+}
+
+int _odp_ipsec_sa_replay_update(ipsec_sa_t *ipsec_sa, uint32_t seq,
+ odp_ipsec_op_status_t *status)
+{
+ int cas = 0;
+ uint64_t state, new_state;
+
+ if (!ipsec_sa->antireplay)
+ return 0;
+
+ state = odp_atomic_load_u64(&ipsec_sa->in.antireplay);
+
+ while (0 == cas) {
+ uint32_t max_seq = state & 0xffffffff;
+ uint32_t mask = state >> 32;
+
+ if (seq + IPSEC_ANTIREPLAY_WS <= max_seq) {
+ status->error.antireplay = 1;
+ return -1;
+ }
+
+ if (seq > max_seq) {
+ mask <<= seq - max_seq;
+ mask |= 1;
+ max_seq = seq;
+ } else {
+ if (mask & (1U << (max_seq - seq))) {
+ status->error.antireplay = 1;
+ return -1;
+ }
+
+ mask |= (1U << (max_seq - seq));
+ }
+
+ new_state = (((uint64_t)mask) << 32) | max_seq;
+
+ cas = odp_atomic_cas_acq_rel_u64(&ipsec_sa->in.antireplay,
+ &state, new_state);
+ }
+
+ return 0;
+}
commit 44f8d1421361c3238fed85a1a3d5ebff8f39cc88
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Sun Oct 15 08:04:30 2017 +0300
linux-gen: ipsec: fix soft/hard limits check
Split count expiration check into two phases:
- optional precheck, run before crypto, which fails only if hard limit
is already breached
- update, run after crypto in INBOUND case, so that limits will not be
updated for packets failing ICV check.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index afc2f686..68ab195c 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -184,12 +184,20 @@ void _odp_ipsec_sa_unuse(ipsec_sa_t *ipsec_sa);
*/
ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup);
+/**
+ * Run pre-check on SA usage statistics.
+ *
+ * @retval <0 if hard limits were breached
+ */
+int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
+ odp_ipsec_op_status_t *status);
+
/**
* Update SA usage statistics, filling respective status for the packet.
*
* @retval <0 if hard limits were breached
*/
-int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len,
+int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status);
/**
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index f49fc465..dc6359d6 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -412,9 +412,7 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto out;
}
- if (_odp_ipsec_sa_update_stats(ipsec_sa,
- stats_length,
- status) < 0)
+ if (_odp_ipsec_sa_stats_precheck(ipsec_sa, status) < 0)
goto out;
param.session = ipsec_sa->session;
@@ -449,6 +447,9 @@ static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt,
goto out;
}
+ if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
+ goto out;
+
ip_offset = odp_packet_l3_offset(pkt);
ip = odp_packet_l3_ptr(pkt, NULL);
ip_hdr_len = ipv4_hdr_len(ip);
@@ -830,9 +831,8 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
goto out;
}
- if (_odp_ipsec_sa_update_stats(ipsec_sa,
- stats_length,
- status) < 0)
+ /* No need to run precheck here, we know that packet is authentic */
+ if (_odp_ipsec_sa_stats_update(ipsec_sa, stats_length, status) < 0)
goto out;
param.session = ipsec_sa->session;
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index dc338bfc..e42bf94e 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -479,7 +479,28 @@ ipsec_sa_t *_odp_ipsec_sa_lookup(const ipsec_sa_lookup_t *lookup)
return best;
}
-int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len,
+int _odp_ipsec_sa_stats_precheck(ipsec_sa_t *ipsec_sa,
+ odp_ipsec_op_status_t *status)
+{
+ int rc = 0;
+
+ if (ipsec_sa->hard_limit_bytes > 0 &&
+ odp_atomic_load_u64(&ipsec_sa->bytes) >
+ ipsec_sa->hard_limit_bytes) {
+ status->error.hard_exp_bytes = 1;
+ rc = -1;
+ }
+ if (ipsec_sa->hard_limit_packets > 0 &&
+ odp_atomic_load_u64(&ipsec_sa->packets) >
+ ipsec_sa->hard_limit_packets) {
+ status->error.hard_exp_packets = 1;
+ rc = -1;
+ }
+
+ return rc;
+}
+
+int _odp_ipsec_sa_stats_update(ipsec_sa_t *ipsec_sa, uint32_t len,
odp_ipsec_op_status_t *status)
{
uint64_t bytes = odp_atomic_fetch_add_u64(&ipsec_sa->bytes, len) + len;
commit 412235594802aa4e4b3f63efc464de18955265c5
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Tue Oct 17 21:27:03 2017 +0300
validation: ipsec: verify odp_ipsec_sa_context
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index ac0a083b..853bd88a 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -19,6 +19,9 @@ struct suite_context_s suite_context;
#define PKT_POOL_NUM 64
#define PKT_POOL_LEN (1 * 1024)
+#define PACKET_USER_PTR ((void *)0x1212fefe)
+#define IPSEC_SA_CTX ((void *)0xfefefafa)
+
static odp_pktio_t pktio_create(odp_pool_t pool)
{
odp_pktio_t pktio;
@@ -300,6 +303,8 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param,
param->dest_queue = suite_context.queue;
+ param->context = IPSEC_SA_CTX;
+
param->crypto.cipher_alg = cipher_alg;
if (cipher_key)
param->crypto.cipher_key = *cipher_key;
@@ -317,6 +322,8 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa)
odp_event_t event;
odp_ipsec_status_t status;
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX, odp_ipsec_sa_context(sa));
+
CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_disable(sa));
if (ODP_QUEUE_INVALID != suite_context.queue) {
@@ -339,8 +346,6 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_destroy(sa));
}
-#define PACKET_USER_PTR ((void *)0x1212fefe)
-
odp_packet_t ipsec_packet(const ipsec_test_packet *itp)
{
odp_packet_t pkt = odp_packet_alloc(suite_context.pool, itp->len);
@@ -612,6 +617,9 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
ODP_IPSEC_OP_MODE_INLINE,
result.flag.inline_mode);
CU_ASSERT_EQUAL(sa, result.sa);
+ if (ODP_IPSEC_SA_INVALID != sa)
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX,
+ odp_ipsec_sa_context(sa));
}
ipsec_check_packet(part->out[i].pkt_out,
pkto[i]);
@@ -645,6 +653,8 @@ void ipsec_check_out_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
CU_ASSERT_EQUAL(sa, result.sa);
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX,
+ odp_ipsec_sa_context(sa));
}
ipsec_check_packet(part->out[i].pkt_out,
pkto[i]);
@@ -682,6 +692,8 @@ void ipsec_check_out_in_one(const ipsec_test_part *part,
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
CU_ASSERT_EQUAL(sa, result.sa);
+ CU_ASSERT_EQUAL(IPSEC_SA_CTX,
+ odp_ipsec_sa_context(sa));
}
CU_ASSERT_FATAL(odp_packet_len(pkto[i]) <=
sizeof(pkt_in.data));
commit 11620182599921c91e2d4f764b0ef921c171523b
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Oct 20 11:29:39 2017 +0300
validation: ipsec: drop unused file
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec_sync_in.c b/test/validation/api/ipsec/ipsec_sync_in.c
deleted file mode 100644
index 8a7fc468..00000000
--- a/test/validation/api/ipsec/ipsec_sync_in.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "config.h"
-
-#include "ipsec.h"
-
-int main(int argc, char *argv[])
-{
- int ret;
-
- /* parse common options: */
- if (odp_cunit_parse_options(argc, argv))
- return -1;
-
- odp_cunit_register_global_init(ipsec_init);
- odp_cunit_register_global_term(ipsec_term);
-
- ret = odp_cunit_register(ipsec_suites);
- if (ret == 0)
- ret = odp_cunit_run();
-
- return ret;
-}
commit 043db6742a8dfc218409aba0e456365163b8b249
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:15:13 2017 +0300
validation: ipsec: verify inline_mode flag
Verify inline_mode flag being set for inbound inline packets.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index a8fdf2b1..ac0a083b 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -608,6 +608,9 @@ void ipsec_check_in_one(const ipsec_test_part *part, odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, pkto[i]));
CU_ASSERT_EQUAL(part->out[i].status.error.all,
result.status.error.all);
+ CU_ASSERT_EQUAL(suite_context.inbound_op_mode ==
+ ODP_IPSEC_OP_MODE_INLINE,
+ result.flag.inline_mode);
CU_ASSERT_EQUAL(sa, result.sa);
}
ipsec_check_packet(part->out[i].pkt_out,
commit 16568d747ba2eb4a91962641e19b5da1d7a6091c
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Mon Nov 13 16:13:23 2017 +0300
linux-gen: ipsec: set inline_mode flag for inline inbound packets
Set IPsec inline_mode_flag for inbound inline packets according to the
API specification.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index 6a731e99..f49fc465 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -1131,6 +1131,7 @@ int _odp_ipsec_try_inline(odp_packet_t pkt)
memset(result, 0, sizeof(*result));
result->status = status;
result->sa = ipsec_sa->ipsec_sa_hdl;
+ result->flag.inline_mode = 1;
pkt_hdr = odp_packet_hdr(pkt);
pkt_hdr->p.input_flags.dst_queue = 1;
commit cf17398302b4114b17d92d41de4dd4fe7d72a16a
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Fri Oct 20 12:11:25 2017 +0300
linux-gen: ipsec: use counter instead of random IV for GCM
Reusing IV block with GCM results in disastrous consequences. Use
counter instead of random-generated IV to remove possibility for IV
reuse.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h
index 1340ca7b..afc2f686 100644
--- a/platform/linux-generic/include/odp_ipsec_internal.h
+++ b/platform/linux-generic/include/odp_ipsec_internal.h
@@ -118,9 +118,17 @@ struct ipsec_sa_s {
uint8_t salt[IPSEC_MAX_SALT_LEN];
uint32_t salt_length;
- unsigned dec_ttl : 1;
- unsigned copy_dscp : 1;
- unsigned copy_df : 1;
+ union {
+ unsigned flags;
+ struct {
+ unsigned dec_ttl : 1;
+ unsigned copy_dscp : 1;
+ unsigned copy_df : 1;
+
+ /* Only for outbound */
+ unsigned use_counter_iv : 1;
+ };
+ };
union {
struct {
@@ -136,6 +144,8 @@ struct ipsec_sa_s {
odp_atomic_u32_t tun_hdr_id;
odp_atomic_u32_t seq;
+ odp_atomic_u64_t counter; /* for CTR/GCM */
+
uint8_t tun_ttl;
uint8_t tun_dscp;
uint8_t tun_df;
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index e57736c2..6a731e99 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -676,23 +676,36 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
ip_data_len +
ipsec_sa->icv_len;
- if (ipsec_sa->esp_iv_len) {
+ if (ipsec_sa->use_counter_iv) {
+ uint64_t ctr;
+
+ /* Both GCM and CTR use 8-bit counters */
+ ODP_ASSERT(sizeof(ctr) == ipsec_sa->esp_iv_len);
+
+ ctr = odp_atomic_fetch_add_u64(&ipsec_sa->out.counter,
+ 1);
+ /* Check for overrun */
+ if (ctr == 0)
+ goto out;
+
+ memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
+ memcpy(iv + ipsec_sa->salt_length, &ctr,
+ ipsec_sa->esp_iv_len);
+
+ } else if (ipsec_sa->esp_iv_len) {
uint32_t len;
- len = odp_random_data(iv + ipsec_sa->salt_length,
- ipsec_sa->esp_iv_len,
+ len = odp_random_data(iv, ipsec_sa->esp_iv_len,
ODP_RANDOM_CRYPTO);
if (len != ipsec_sa->esp_iv_len) {
status->error.alg = 1;
goto out;
}
-
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
-
- param.override_iv_ptr = iv;
}
+ param.override_iv_ptr = iv;
+
if (odp_packet_extend_tail(&pkt, trl_len, NULL, NULL) < 0) {
status->error.alg = 1;
goto out;
@@ -734,7 +747,6 @@ static ipsec_sa_t *ipsec_out_single(odp_packet_t pkt,
odp_packet_copy_from_mem(pkt,
ipsec_offset, _ODP_ESPHDR_LEN,
&esp);
- memcpy(iv, ipsec_sa->salt, ipsec_sa->salt_length);
odp_packet_copy_from_mem(pkt,
ipsec_offset + _ODP_ESPHDR_LEN,
ipsec_sa->esp_iv_len,
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index f0b5b9e4..dc338bfc 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -207,6 +207,7 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
ipsec_sa->context = param->context;
ipsec_sa->queue = param->dest_queue;
ipsec_sa->mode = param->mode;
+ ipsec_sa->flags = 0;
if (ODP_IPSEC_DIR_INBOUND == param->dir) {
ipsec_sa->in.lookup_mode = param->inbound.lookup_mode;
if (ODP_IPSEC_LOOKUP_DSTADDR_SPI == ipsec_sa->in.lookup_mode)
@@ -298,11 +299,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
case ODP_CIPHER_ALG_NULL:
ipsec_sa->esp_iv_len = 0;
ipsec_sa->esp_block_len = 1;
+ crypto_param.iv.length = 0;
break;
case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
ipsec_sa->esp_iv_len = 8;
ipsec_sa->esp_block_len = 8;
+ crypto_param.iv.length = 8;
break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_CBC:
@@ -310,11 +313,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
case ODP_CIPHER_ALG_AES_CBC:
ipsec_sa->esp_iv_len = 16;
ipsec_sa->esp_block_len = 16;
+ crypto_param.iv.length = 16;
break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
#endif
case ODP_CIPHER_ALG_AES_GCM:
+ ipsec_sa->use_counter_iv = 1;
ipsec_sa->esp_iv_len = 8;
ipsec_sa->esp_block_len = 16;
crypto_param.iv.length = 12;
@@ -323,6 +328,10 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param)
return ODP_IPSEC_SA_INVALID;
}
+ if (1 == ipsec_sa->use_counter_iv &&
+ ODP_IPSEC_DIR_OUTBOUND == param->dir)
+ odp_atomic_init_u64(&ipsec_sa->out.counter, 1);
+
crypto_param.auth_digest_len = ipsec_sa->icv_len;
if (param->crypto.cipher_key_extra.length) {
-----------------------------------------------------------------------
Summary of changes:
.../linux-generic/include/odp_ipsec_internal.h | 47 +++-
.../linux-generic/include/odp_packet_internal.h | 1 +
platform/linux-generic/odp_ipsec.c | 190 ++++++++++++-----
platform/linux-generic/odp_ipsec_sad.c | 103 ++++++++-
test/validation/api/ipsec/ipsec.c | 33 ++-
test/validation/api/ipsec/ipsec.h | 1 +
test/validation/api/ipsec/ipsec_sync_in.c | 27 ---
test/validation/api/ipsec/ipsec_test_in.c | 236 +++++++++++++++++++++
test/validation/api/ipsec/ipsec_test_out.c | 44 ++++
test/validation/api/ipsec/test_vectors.h | 126 +++++++++++
10 files changed, 714 insertions(+), 94 deletions(-)
delete mode 100644 test/validation/api/ipsec/ipsec_sync_in.c
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-569-g26a556e0
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd (commit)
via 12403213da9cd4600f4e3b61a10e2369219061f0 (commit)
via 5cbb3749e3478d9ed22423399c2339b7fa39442f (commit)
from a908a4dead95321e84d6a8a23de060051dcd8969 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 26a556e03e07e62e4bcdf3dec6c76ebb02aa5efd
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Sep 20 13:40:04 2017 -0500
doc: userguide: add ipsec user documentation
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index d88d7f9e..54f87bb6 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -3,6 +3,7 @@ include ../Makefile.inc
SRC = users-guide.adoc \
users-guide-cls.adoc \
users-guide-crypto.adoc \
+ users-guide-ipsec.adoc \
users-guide-packet.adoc \
users-guide-pktio.adoc \
users-guide-timer.adoc \
diff --git a/doc/users-guide/users-guide-ipsec.adoc b/doc/users-guide/users-guide-ipsec.adoc
new file mode 100644
index 00000000..d560df9c
--- /dev/null
+++ b/doc/users-guide/users-guide-ipsec.adoc
@@ -0,0 +1,466 @@
+== IPsec services
+
+In addition to general cryptographic services, ODP offers offload support for
+the IPsec protocol. IPsec is a general term referencing a suite of protocols
+and packet formats and as such a full discussion of IPsec is beyond the scope
+of this document. See https://tools.ietf.org/html/rfc4301[RFC 4301] and
+related RFCs for more detail. This section assumes the reader is already
+familiar with IPsec and focuses on explaining the ODP APIs that support it.
+
+ODP provides APIs for the following IPsec services:
+
+* General IPsec configuration
+* Security Association (SA) configuration and lifecycle management
+* Synchronous and Asynchronous IPsec lookaside processing
+* Inline processing for full IPsec RX and/or TX offload
+* Pipelining for RX traffic
+* Fragmentation support for TX traffic
+* IPsec event management
+
+=== IPsec Capabilities and Configuration
+As with other features, ODP provides APIs that permit applications to query
+platform-specific IPsec capabilities. The `odp_ipsec_capability()` API queries
+the general IPsec features available while the `odp_ipsec_cipher_capability()`
+and `odp_ipsec_auth_capability()` APIs provide detail on the range of
+cipher and authentication algorithms supported by IPsec on this platform.
+
+General IPsec capabilities that are reported include:
+
+* The IPsec operation modes supported by this implementation. Different
+operation modes may be _not supported_, _supported_, or _preferred_. A
+preferred form means that this mode takes advantage of hardware
+acceleration features to achieve best performance.
+* Whether IPsec AH processing is supported. All ODP platforms must provide
+support for IPsec ESP processing, however since AH is relatively rare, it
+may not be supported, or supported only via software emulation (_e.g.,_ be
+non-preferred).
+* Whether IPsec headers can be retained on decrypt for inbound inline
+operations.
+* Whether classification pipelining is supported (to be discussed below).
+
+In addition, capabilities also inform the application of the maximum number
+of destination queues and classification CoS targets supported. These
+will be discussed further later.
+
+==== IPsec Operation Modes
+IPsec operates in one of three modes: Synchronous, Asynchronous, and Inline.
+
+==== Lookaside Processing
+Synchronous and Asynchronous are types of _lookaside_ processing. Which of
+these forms may be used depends on the IPsec operation mode. So synchronous
+APIs may only be used when operating in synchronous mode, and asynchronous
+APIs may only be used when operating in asynchronous mode.
+
+In lookaside mode, the application receives (or creates) an IPsec packet and
+then uses ODP to perform one of two functions:
+
+* To decrypt an IPsec packet into a "normal" packet
+* To take a "normal" packet and encrypt it into an IPsec packet.
+
+This process may be performed _synchronously_ with the APIs `odp_ipsec_in()`
+(to decrypt) and `odp_ipsec_out()` (to encrypt). Upon return from these calls
+the requested packet transformation is complete, or an error return code
+indicates that it could not be performed (_e.g.,_ packet decryption failed).
+
+Synchronous processing may be preferred if the application has a large number
+of worker threads so that blocking any individual worker while IPsec processing
+is performed represents a reasonable design. The alternative is to use
+_asynchronous_ forms of these APIs:
+
+* `odp_ipsec_in_enq()` for decrypt
+* `odp_ipsec_out_enq()` for encrypt
+
+These simply pass packets to IPsec for processing. When this processing is
+complete, the resulting packets are sent to the completion queue associated
+with the SA used by the operation, serving as IPsec completion events as
+shown here:
+
+image::ipsec-lookaside.svg[align="center"]
+
+If the operation fails because SA lookup failed for inbound processing, then
+these result packets are sent to the default queue specified as part of the
+`odp_ipsec_inbound_config_t` used in the `odp_ipsec_config()` call.
+
+Following an asynchronous IPsec call, the worker thread moves on to process
+other events until the IPsec completion shows up. At that point the worker
+thread sees whether the operation was successful or not and continues
+processing for that packet. These events may be direct-polled with
+`odp_queue_deq()` if the completion queue was created as a plain queue, or
+processed via the ODP scheduler if the completion queue was created as a
+scheduled queue.
+
+==== Inline Processing
+While lookaside processing offers flexibility, it still requires extra
+processing steps not required by modern hardware. To avoid this overhead
+ODP also offers _inline_ processing support for IPsec. In this mode the
+processing of IPsec packets on the RX and TX paths is fully offloaded as
+shown here:
+
+image::ipsec-inline.svg[align="center"]
+
+It is worth noting that, depending on the implementation and application
+needs, inline processing may be enabled only for one direction (inbound or
+outbound) or for both directions.
+
+On the receive side, once configured for inline processing, arriving IPsec
+packets that are recognized at the PktIO interface are decrypted automatically
+before the application ever sees them. On the transmit side, the application
+calls `odp_ipsec_out_inline()` and the packet is encrypted and queued for
+transmission as a single operation without further application involvement.
+Note that if an inbound IPsec packet is not recognized (_e.g.,_ it belongs to
+an unknown SA) then it will be presented to the application as-is without
+further processing. The application may then use a lookaside call to process
+the packet if it is able to supply a matching SA by other means.
+
+On the receive side, after an IPsec packet is decrypted, it may be
+_pipelined_ to the ODP classifier or added to a poll queue, as the
+application wishes. The advantage of classification pipelining is that inbound
+IPsec traffic is automatically decrypted and classified into appropriate
+flow-based queues for ease of processing.
+
+On the transmit side, since IPsec encryption and tunneling may exceed an
+output MTU, ODP also offers support for MTU configuration and automatic IPsec
+TX fragmentation.
+
+Both classification pipelining and TX fragmentation support are support
+features that are indicated by `odp_ipsec_capability()`.
+
+Note that at present inline IPsec output support sends resulting packets
+directly to an output PktIO. If it's desired to send them to the ODP
+Traffic Manager for shaping prior to transmission, use the lookaside APIs
+to perform the IPsec encrypt and then call `odp_tm_enq()` on the resulting
+packet.
+
+=== IPsec Configuration
+Prior to making use of IPsec services, the `odp_ipsec_config()` API is used to
+configure IPsec processing options. This API takes a pointer to an
+`odp_ipsec_config_t` struct as its argument.
+
+The `odp_ipsec_config_t` struct specifies the inbound and outbound processing
+modes (SYNC, ASYNC, or INLINE) that the application plans to use, the maximum
+number of Security Associations it will use, and sets inbound and outbound
+processing options.
+
+==== IPsec Inbound Configuration
+Inbound configuration options for IPsec specify the default `odp_queue_t` to
+be used for processing global events like SA lookup failures, how Security
+Parameter Index (SPI) lookup is to be performed, and whether the application
+requires ODP to retain outer headers for decrypted IPsec packets.
+
+Parsing options specify how "deep" decrypted packets are to be parsed
+after IPsec processing by specifying the packet layers of interest to the
+application (None, L2, L3, L4, or All). And which checksums should be verified
+on decrypted packets.
+
+==== IPsec Outbound Configuration
+Outbound configuration options for IPsec specify checksum insertion processing
+that should be performed prior to encryption.
+
+=== IPsec Events
+IPsec introduces one new event type and one new event subtype. These are:
+
+* IPsec packet events. These are events of type `ODP_EVENT_PACKET` that have
+subtype `ODP_EVENT_PACKET_IPSEC`. These are packets that carry additional
+IPsec-related metadata in the form of an `odp_ipsec_packet_result_t` struct
+that can be retrieved from the packet via the `odp_ipsec_result()` API.
+
+* IPsec status notifications. These are events of type `ODP_EVENT_IPSEC_STATUS`
+that indicate status events not associated with any particular IPsec
+packet. Such events carry status in the form of an `odp_ipsec_status_t`
+struct that is retrieved from the event via the `odp_ipsec_status()` API.
+
+IPsec-related events are thus part of normal and exception processing when
+working with IPsec.
+
+=== Security Associations (SAs)
+The fundamental "building block" for IPsec processing is the _Security
+Association (SA)_. Similar to a crypto session, the SA encapsulates the keying
+material and context needed to perform IPsec protocol processing for inbound
+or outbound packets on a given flow, as well as additional processing options
+that control how IPsec is to be used for packets processed under this
+SA. Security Associations are unidirectional (RX or TX) so a flow that
+requires both inbound (decrypt) and outbound (encrypt) IPsec functions will
+have two SAs associated with it. SAs in ODP are represented by the
+abstract type `odp_ipsec_sa_t`.
+
+After ODP initialization, IPsec support is dormant until it is configured
+by a call to `odp_ipsec_config()` as described earlier. Once configured,
+SAs may be created by calling `odp_ipsec_sa_create()`.
+
+==== SA Creation and Configuration
+The `odp_ipsec_sa_create()` API takes an `odp_ipsec_sa_param_t` argument that
+describes the SA to be created. Use the `odp_ipsec_sa_param_init()` API to
+initialize this to its default state and then override selected fields within
+the param struct as needed.
+
+Items specified in the `odp_ipsec_sa_param_t` struct include:
+
+* The direction of the SA (inbound or outbound).
+
+* The IPsec protocol being used (ESP or AH).
+
+* The IPsec protocol mode (Transport or Tunnel).
+
+* The parameters needed for the crypto and authentication algorithms to be
+used by this SA.
+
+* Miscellaneous SA options that control behavior such as use of Extended
+Sequence Numbers (ESNs), the use of UDP encapsulation, various copy
+options for header fields, and whether the TTL (Hop Limit) field should be
+decremented when operating in tunnel mode.
+
+* Parameters controlling the SA lifetime.
+
+* The Security Parameter Index (SPI) that packets will use to indicate that
+they belong to this SA.
+
+* The pipeline mode used by this SA.
+
+* The destination `odp_queue_t` to be used for events associated with this SA.
+
+* The user context pointer (and length) associated with this SA for
+application use.
+
+In addition, there are specific direction-specific parameters that vary
+based on whether the SA is for inbound or outbound use. For inbound SAs:
+
+* Controls for how this SA is to be looked up.
+
+* The minimum size of the anti-replay window to be used.
+
+* The default CoS to use when classification pipelining packets matching this
+SA.
+
+For outbound SAs:
+
+* Tunnel parameters to use when doing outbound processing in tunnel mode.
+
+* The fragmentation mode to be used.
+
+* The MTU to be used to control the maximum length IP packets that outbound
+IPsec operations may produce. This can be changed dynamically by the
+`odp_ipsec_sa_mtu_update()` API.
+
+As can be seen, SAs have a large degree of configurability.
+
+==== SA Lifecycle Management
+In discussing the lifecycle of an SA, it is useful to refer to the following
+state diagram:
+
+image::ipsec_fsm.svg[align="center"]
+
+After creation, IPsec services are active for this Security Association. The
+specific APIs that can be used on this SA depends on the IPsec operating mode
+that has been configured.
+
+===== IPsec Lookaside Processing
+If IPsec is operating in lookaside mode for the SA's direction (the
+`odp_ipsec_op_mode_t` is `ODP_IPSEC_OP_MODE_SYNC` or `ODP_IPSEC_OP_MODE_ASYNC`),
+then inbound or outbound lookaside operations may be performed. Asynchronous
+lookaside operations are also permitted if the SA is operating in inline
+mode, as described in the next section.
+
+The synchronous forms of these APIs are:
+
+* `odp_ipsec_in()`
+* `odp_ipsec_out()`
+
+Upon return from these calls, the return code tells the application the number
+of number of input packets that were consumed by the operation. The result of
+the operation is determined by calling the `odp_ipsec_result()` API for each
+output packet to retrieve its associated `odp_ipsec_result_t`.
+
+The asynchronous forms of these APIs are:
+
+* `odp_ipsec_in_enq()`
+* `odp_ipsec_out_enq()`
+
+Here again, the return code indicates how many input packets were
+processed. The success or failure is determined by inspecting the
+`odp_ipsec_result_t` associated with each packet completion event. These are
+presented as events of type `ODP_EVENT_PACKET` with subtype
+`ODP_EVENT_PACKET_IPSEC`.
+
+For both synchronous and asynchronous IPsec operations an input packet array
+is transformed into an output packet array as specified by a controlling
+parameter struct. For inbound operations, the `odp_ipsec_in_param_t` is
+used to specify how SA processing is to be performed for the requested
+operation. The caller may say that SA lookup processing should be performed
+for each input packet, a single (specified) SA should be used for all packets,
+or that each packet has a specified individual SA.
+
+For outbound lookaside operations, a corresponding `odp_ipsec_out_param_t`
+serves a similar role, but here the SA must be specified since the input
+packet(s) are non-IPsec packets. Again the option is to use a single SA for
+all input packets or one per input packet.
+
+For outbound operations, an associated array of `odp_ipsec_out_opt_t` structs
+is also used to control the fragmentation mode to be used as part of the
+outbound processing. Options here are to not fragment, to fragment before
+IPsec processing, after IPsec processing, or to only check whether IP
+fragmentation is needed but not to perform it. For check processing, the `mtu`
+status error bit in the `odp_ipsec_packet_result_t` is set if check processing
+detects that the resulting packet will not fit into the configured MTU. Note
+that the MTU associated with a given SA is set at SA creation and can be
+changed at any time via the `odp_ipsec_sa_mtu_update()` API.
+
+Once an asynchronous lookaside operation has been initiated, the worker thread
+that issued the asynchronous call can handle other events while waiting for
+the operation to complete. Completion of an asynchronous operation is
+indicated by the worker receiving an `ODP_EVENT_PACKET` that has subtype
+`ODP_EVENT_PACKET_IPSEC`. These events can be retrieved directly by polling
+the completion queue associated with the SA, or (more typically) via the ODP
+scheduler. Typical code for such completion processing would look as follows:
+
+[source,c]
+-----
+while (1) {
+ ev = odp_schedule(&queue, ODP_SCHED_WAIT);
+ ev_type = odp_event_types(ev, &ev_subtype);
+
+ switch (ev_type) {
+ case ODP_EVENT_PACKET:
+
+ switch (ev_subtype) {
+ case ODP_EVENT_PACKET_IPSEC:
+ pkt = odp_packet_from_event(ev);
+
+ if (odp_unlikely(odp_ipsec_result(&result, pkt) != 0)) {
+ /* Stale event, discard */
+ odp_event_free(ev);
+ continue;
+ }
+
+ if (odp_unlikely(result.status.all != ODP_IPSEC_OK)) {
+ if (result.status.error != ODP_IPSEC_OK) {
+ ...process error result
+ odp_event_free(ev);
+ continue;
+ } else {
+ ...process packet warnings
+ }
+ }
+
+ my_context = odp_ipsec_sa_context(result.sa);
+
+ if (result.flag.inline_mode) {
+ ...process inline inbound packet
+ } else {
+ ...process the async completion event
+ }
+
+ ...
+ break;
+
+ case ...
+ }
+ break;
+
+ case ODP_EVENT_IPSEC_STATUS:
+ ...process IPsec status event
+ break;
+
+ }
+}
+-----
+
+===== IPsec Inline Processing
+When IPsec is configured to operate in `ODP_IPSEC_OP_MODE_INLINE` mode,
+inbound processing is implicit. The application never sees these packets until
+after IPsec has already decrypted them. As shown in the code sketch above,
+such packets appear as events of subtype `ODP_EVENT_PACKET_IPSEC` and the
+`flag` field in the associated `odp_ipsec_packet_result_t` indicates
+`inline_mode`.
+
+For outbound IPsec processing, the `odp_ipsec_out_inline()` API operates as
+a "fire and forget" API. A success return code from this call indicates that
+the packet will be encrypted and transmitted to the `odp_pktio_t` indicated
+in the `odp_ipsec_out_inline_param_t` specified at the time of the call without
+any further application involvement. Only if a problem arises will the packet
+be returned to the application with an `odp_ipsec_packet_result_t` indicating
+the nature of the problem.
+
+Note that while operating in inline mode, asychronous lookaside operations are
+also permitted. This provide the application with additional flexibility if,
+for example, some packets need additional handling that cannot be supported
+directly with inline IPsec processing.
+
+==== SA Lifetimes
+A fundamental principle of good security is that the keying material
+associated with sessions has a limited lifetime. In effect, keys grow "stale"
+over time or due to being used to encrypt too much data. The metrics used
+to limit effective SA lifetimes are:
+
+* Duration (time)
+* Usage (volume of traffic using the keys)
+
+Associated with each of these metrics are "soft" and "hard" limits. When a
+hard limit is reached, the SA is expired and cannot be used further. To support
+graceful transition to a replacement SA, soft limits are used. A soft limit is
+similar to a "low fuel" warning light on a car. It alerts the application that
+the SA is nearing the end of its useful life and should be renegotiated even
+as the SA continues to work normally.
+
+ODP support for SA limits is based on packet/byte counts. Applications that
+wish to use time-based SA limits may do so on their own using the timing
+facilities that ODP provides. However, since especially with inline IPsec
+processing, the application may not have explicit knowledge of the traffic
+volumes associated with a given SA, support for usage-based limits is
+integrated into ODP IPsec support.
+
+At `odp_ipsec_sa_create()` time, one of the fields in the
+`odp_ipsec_sa_param_t` struct is the `odp_ipsec_lifetime_t` sub-structure.
+This struct allows hard and/or soft limits to be specified in terms of total
+bytes encrypted/decrypted, total packet count, or both. A limit specification
+of 0 indicates no limit for that metric. If either is specified, the limit
+is triggered on whichever occurs first. Given the defined behavior of hard vs.
+soft limits, the soft limits, if used, should always be specified as lower
+than the hard limits. These should be sufficiently lower to enable adequate
+time to switch over to a replacement SA before the hard limit is reached.
+
+As noted, when an SA hard limit is reached the SA immediately enters the
+expired state and attempts to use it further are failed with an
+`odp_ipsec_result_t` that indicates a hard expiration limit. When a soft
+limit is reached for packets sent via `odp_ipsec_out_inline()`, this results
+in an `ODP_EVENT_IPSEC_STATUS` event being sent to the application on the
+queue associated with the SA that has reached the soft limit. This status
+event has an `odp_ipsec_status_id_t` of `ODP_IPSEC_STATUS_WARN` with a
+`odp_ipsec_warn_t` bits set to indicate the type of soft expiration reached.
+Receipt of this event alerts the application that the SA is nearing the end of
+its useful life and that it should be replaced. It is the application's
+responsibility to heed this warning. It is implementation-defined how many
+such warnings are issued when a soft limit is exceeded (once, first N packets,
+or all packets beyond the limit), so applications should be written to
+allow for possible repeated warnings.
+
+When operating in lookaside mode, expiration limits are carried as a warning
+in the `odp_op_status_t` section of the `odp_ipsec_result_t` struct. The same
+is true for inline inbound packets. When the soft limit is reached, these
+packets will carry a warning flag indicating this condition.
+
+==== SA Disablement and Destruction
+When it is time to retire an SA, the application does so by first issuing a
+call to the `odp_ipsec_sa_disable()` API. This call initiates termination
+processing for an SA by stopping use of the SA for new operations while still
+allowing those that are "in flight" to complete processing. Following this call
+the application continues to receive and process IPsec events as normal.
+
+Disable completion is indicated by the application seeing an event of type
+`ODP_EVENT_IPSEC_STATUS` for this SA that contains an `odp_ipsec_status_id_t`
+of `ODP_IPSEC_STATUS_SA_DISABLE`. For inbound SAs, receipt of this event means
+that the application has seen all IPsec packets associatd with this SA that
+were pending at the time of the disable call. For outbound SAs, receipt of
+this event means that the application has seen all result events associated
+with packets sent via this SA.
+
+Note that once a packet has been "seen" by the application, it becomes the
+application's responsibility to ensure that it is fully processed before
+attempting to destroy its associated SA. The disable call exists to give
+the application assurance that there are no pending IPsec events for this
+SA associated with packets that it has not seen before.
+
+So after disabling the SA, the application can process pending packets
+normally until it sees the disable status event. At that point it knows that
+all pending packets that arrived before the disable have been seen and it is
+safe for the application to destroy it via `odp_ipsec_sa_destroy()`, thus
+completing the SA lifecycle.
diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc
index 0c7d3f77..7f2ad69e 100644
--- a/doc/users-guide/users-guide.adoc
+++ b/doc/users-guide/users-guide.adoc
@@ -1192,6 +1192,8 @@ include::users-guide-timer.adoc[]
include::users-guide-crypto.adoc[]
+include::users-guide-ipsec.adoc[]
+
include::users-guide-tm.adoc[]
include::users-guide-cls.adoc[]
commit 12403213da9cd4600f4e3b61a10e2369219061f0
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Sep 20 13:39:26 2017 -0500
doc: images: add graphviz source for ipsec fsm
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/images/.gitignore b/doc/images/.gitignore
index 003dbe65..0aa34793 100644
--- a/doc/images/.gitignore
+++ b/doc/images/.gitignore
@@ -1,4 +1,5 @@
resource_management.svg
+ipsec_fsm.svg
pktio_fsm.svg
timer_fsm.svg
timeout_fsm.svg
diff --git a/doc/images/ipsec_fsm.gv b/doc/images/ipsec_fsm.gv
new file mode 100644
index 00000000..1e78c8b8
--- /dev/null
+++ b/doc/images/ipsec_fsm.gv
@@ -0,0 +1,32 @@
+digraph ipsec_state_machine {
+ rankdir=LR;
+ size="12,12";
+ node [fontsize=28];
+ edge [fontsize=28];
+ node [shape=doublecircle]; Unconfigured Configured SA_Ready SA_Expired;
+ node [shape=circle];
+ Unconfigured -> Configured [label="odp_ipsec_config()"
+ constraint=false];
+ Configured -> SA_Ready [label="odp_ipsec_sa_create()"];
+ SA_Ready -> Disable_Pending [label="odp_ipsec_sa_disable()"];
+ Disable_Pending -> Disable_Check [label="odp_queue_deq()"];
+ Disable_Pending -> Disable_Check [label="odp_schedule()"];
+ SA_Disabled -> Configured [label="odp_ipsec_sa_destroy()"
+ constraint=false];
+ SA_Ready -> Processing [label="odp_ipsec_in_enq()"];
+ SA_Ready -> Processing [label="odp_ipsec_out_enq()"];
+ Processing -> Op_Complete [label="odp_queue_deq()"];
+ Processing -> Op_Complete [label="odp_schedule()"];
+ Op_Complete -> SA_Expired [label="hard limit reached" constraint=false];
+ SA_Ready -> SA_Ready [label="odp_ipsec_in()"];
+ SA_Ready -> SA_Ready [label="odp_ipsec_out()"];
+ SA_Ready -> SA_Ready [label="odp_ipsec_out_inline()"];
+ SA_Ready -> SA_Expired [label="hard limit reached"];
+ Op_Complete -> SA_Ready [label="odp_ipsec_result()"]
+ Op_Complete -> SA_Ready [label="odp_ipsec_status()"]
+ Disable_Check -> SA_Disabled [label="odp_ipsec_status()"
+ constraint=false];
+ Disable_Check -> Disable_Pending [label="odp_ipsec_result()"
+ constraint=false];
+ SA_Expired -> Disable_Pending [label="odp_ipsec_sa_disable()"];
+}
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index e6a44d98..d88d7f9e 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -10,6 +10,7 @@ SRC = users-guide.adoc \
TARGET = users-guide.html
IMAGES = $(IMAGES_DIR)/overview.svg \
$(IMAGES_DIR)/atomic_queue.svg \
+ $(IMAGES_DIR)/ipsec_fsm.svg \
$(IMAGES_DIR)/odp_components.svg \
$(IMAGES_DIR)/ODP-Logo-HQ.svg \
$(IMAGES_DIR)/odp_rx_processing.svg \
@@ -46,6 +47,7 @@ IMAGES += $(IMAGES_DIR)/resource_management.svg
endif
IMAGES_SRCS = \
+ $(IMAGES_DIR)/ipsec_fsm.gv \
$(IMAGES_DIR)/pktio_fsm.gv \
$(IMAGES_DIR)/resource_management.msc \
$(IMAGES_DIR)/timeout_fsm.gv \
commit 5cbb3749e3478d9ed22423399c2339b7fa39442f
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Wed Sep 20 13:36:42 2017 -0500
doc: images: add diagrams used for ipsec documentation
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/images/ipsec-inline.svg b/doc/images/ipsec-inline.svg
new file mode 100644
index 00000000..e5b160b1
--- /dev/null
+++ b/doc/images/ipsec-inline.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.2" width="471.92221mm" height="171.72112mm" viewBox="0 0 47192.222 17172.112" preserveAspectRatio="xMidYMid" xml:space="preserve" id="svg1189" sodipodi:docname="ipsec-inline.svg" style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" inkscape:version="0.92.1 r15371"><metadata id="metadata1193"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10"
gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1407" inkscape:window-height="722" id="namedview1191" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.55044522" inkscape:cx="939.7648" inkscape:cy="333.33699" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg1189"/><defs class="ClipPathGroup" id="defs8"><clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse"><rect x="0" y="0" width="59411" height="42012" id="rect2"/></clipPath><clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse"><rect x="59" y="42" width="59293" height="41928" id="rect5"/></clipPath></defs><defs id="defs93"><font id="EmbeddedFont_1" horiz-adv-x="2048" horiz-origin-x="0" horiz-origin-y="0" vert-origin-x="45" vert-origin-y="90" vert-adv-y="90"><font-face font-family="Liberation Sans embedded" units-per-e
m="2048" font-weight="normal" font-style="normal" ascent="1826" descent="423" id="font-face10"/><missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z" id="missing-glyph12"/><glyph unicode="y" horiz-adv-x="1059" d="M 604,1 C 579,-64 553,-123 527,-175 500,-227 471,-272 438,-309 405,-346 369,-374 329,-394 289,-413 243,-423 191,-423 168,-423 147,-423 128,-423 109,-423 88,-420 67,-414 L 67,-279 C 80,-282 94,-284 110,-284 126,-284 140,-284 151,-284 204,-284 253,-264 298,-225 343,-186 383,-124 417,-38 L 434,5 5,1082 197,1082 425,484 C 432,466 440,442 451,412 461,382 471,352 482,322 492,292 501,265 509,241 517,217 522,202 523,196 525,203 530,218 538,240 545,261 554,285 564,312 573,339 583,366 593,393 603,420 611,444 618,464 L 830,1082 1020,1082 604,1 Z" id="glyph14"/><glyph unicode="v" horiz-adv-x="1059" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,173 522,194 528
,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z" id="glyph16"/><glyph unicode="u" horiz-adv-x="901" d="M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,228 C 997,205 997,181 998,156 998,131 998,107 999,85 1000,62 1000,43 1001,27 1002,11 1002,3 1003,3 L 833,3 C 832,6 832,15 831,30 830,44 830,61 829,79 828,98 827,117 826,136 825,156 825,172 825,185 L 822,185 C 805,154 786,125 765,100 744,75 720,53 693,36 666,18 634,4 599,-6 564,-15 523,-20 476,-20 416,-20 364,-13 321,2 278,17 242,39 214,70 186,101 166,140 153,188 140,236 133,294 133,361 L 133,1082 314,1082 Z" id="glyph18"/><glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324 336,1324 336,1082
536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z" id="glyph20"/><glyph unicode="s" horiz-adv-x="927" d="M 950,299 C 950,248 940,203 921,164 901,124 872,91 835,64 798,37 752,16 698,2 643,-13 581,-20 511,-20 448,-20 392,-15 342,-6 291,4 247,20 209,41 171,62 139,91 114,126 88,161 69,203 57,254 L 216,285 C 231,227 263,185 311,158 359,131 426,117 511,117 550,117 585,120 618,125 650,130 678,140 701,153 724,166 743,183 756,205 769,226 775,253 775,285 775,318 767,345 752,366 737,387 715,404 688,418 661,432 628,444 589,455 550,465 507,476 460,489 417,500 374,513 331,527 288,541 250,560 216,583 181,606 153,634 132,668 111,702 100,745 100,796 100,895 135,970 206,1022 276,1073 378,1099 513,1099 632,1099 727,1078 798,1036 868,994 912,927 931,834 L 769,814 C 763,842 752,866 736,885 720,904 701,919 678,931 655,942 630,951 602,956 573,961 544,963 513,963 432,963 372,951 333,926 294,901 275,864 275,814 275,78
5 282,761 297,742 311,723 331,707 357,694 382,681 413,669 449,660 485,650 525,640 568,629 597,622 626,614 656,606 686,597 715,587 744,576 772,564 799,550 824,535 849,519 870,500 889,478 908,456 923,430 934,401 945,372 950,338 950,299 Z" id="glyph22"/><glyph unicode="r" horiz-adv-x="556" d="M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 636,930 622,933 606,935 590,936 572,937 552,937 511,937 476,928 447,909 418,890 394,865 376,832 357,799 344,759 335,714 326,668 322,618 322,564 L 322,0 142,0 Z" id="glyph24"/><glyph unicode="p" horiz-adv-x="953" d="M 1053,546 C 1053,464 1046,388 1033,319 1020,250 998,190 967,140 936,90 895
,51 844,23 793,-6 730,-20 655,-20 578,-20 510,-5 452,24 394,53 350,101 319,168 L 314,168 C 315,167 315,161 316,150 316,139 316,126 317,110 317,94 317,76 318,57 318,37 318,17 318,-2 L 318,-425 138,-425 138,864 C 138,891 138,916 138,940 137,964 137,986 136,1005 135,1025 135,1042 134,1056 133,1070 133,1077 132,1077 L 306,1077 C 307,1075 308,1068 309,1057 310,1045 311,1031 312,1014 313,998 314,980 315,961 316,943 316,925 316,908 L 320,908 C 337,943 356,972 377,997 398,1021 423,1041 450,1057 477,1072 508,1084 542,1091 575,1098 613,1101 655,1101 730,1101 793,1088 844,1061 895,1034 936,997 967,949 998,900 1020,842 1033,774 1046,705 1053,629 1053,546 Z M 864,542 C 864,609 860,668 852,720 844,772 830,816 811,852 791,888 765,915 732,934 699,953 658,962 609,962 569,962 531,956 496,945 461,934 430,912 404,880 377,848 356,804 341,748 326,691 318,618 318,528 318,451 324,387 337,334 350,281 368,238 393,205 417,172 447,149 483,135 519,120 560,113 607,113 657,113 699,123 732,142 765,161 791,189 811,
226 830,263 844,308 852,361 860,414 864,474 864,542 Z" id="glyph26"/><glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 381,912 355,879 329,846 309,802 296,747 282,692 275,624 275,542 275,458 282,389 297,334 312,279 332,235 358,202 383,169 414,146 449,133 484,120 522,113 563,113 609,113 651,120 688,133 725,146 757,168 783,201 809,234 829,278 843,333 857,388 864,458 864,542 Z" id="glyph28"/><glyph unicode="n" horiz-adv-x="900" d="M 825,0 L 825,686 C 825,739 821,783 814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 559,963 521,956 487,941 452,926 423
,904 399,876 374,847 355,812 342,771 329,729 322,681 322,627 L 322,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 308,1052 309,1037 310,1021 311,1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 334,928 353,957 374,982 395,1007 419,1029 446,1047 473,1064 505,1078 540,1088 575,1097 616,1102 663,1102 723,1102 775,1095 818,1080 861,1065 897,1043 925,1012 953,981 974,942 987,894 1000,845 1006,788 1006,721 L 1006,0 825,0 Z" id="glyph30"/><glyph unicode="m" horiz-adv-x="1456" d="M 768,0 L 768,686 C 768,739 765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 327,729 321,681 321,627 L 321,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 308,1052 309,1037 310,1021 311,
1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 333,928 350,957 369,982 388,1007 410,1029 435,1047 460,1064 488,1078 521,1088 553,1097 590,1102 633,1102 715,1102 780,1086 828,1053 875,1020 908,968 927,897 L 930,897 C 946,928 964,957 984,982 1004,1007 1027,1029 1054,1047 1081,1064 1111,1078 1144,1088 1177,1097 1215,1102 1258,1102 1313,1102 1360,1095 1400,1080 1439,1065 1472,1043 1497,1012 1522,981 1541,942 1553,894 1565,845 1571,788 1571,721 L 1571,0 1393,0 1393,686 C 1393,739 1390,783 1383,818 1376,853 1365,882 1350,904 1334,925 1313,941 1288,950 1263,959 1232,963 1195,963 1157,963 1123,956 1092,942 1061,927 1035,906 1014,878 992,850 975,815 964,773 952,731 946,682 946,627 L 946,0 768,0 Z" id="glyph32"/><glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z" id="glyph34"/><glyph unicode="k" horiz-adv-x="927" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,0 816,0 Z" id="glyph36"/><glyph un
icode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z" id="glyph38"/><glyph unicode="h" horiz-adv-x="874" d="M 317,897 C 337,934 359,965 382,991 405,1016 431,1037 459,1054 487,1071 518,1083 551,1091 584,1098 622,1102 663,1102 732,1102 789,1093 834,1074 878,1055 913,1029 939,996 964,962 982,922 992,875 1001,828 1006,777 1006,721 L 1006,0 825,0 825,686 C 825,732 822,772 817,807 811,842 800,871 784,894 768,917 745,934 716,946 687,957 649,963 602,963 559,963 521,955 487,940 452,925 423,903 399,875 374,847 355,813 342,773 329,733 322,688 322,638 L 322,0 142,0 142,1484 322,1484 322,1098 C 322,1076 322,1054 321,1032 320,1010 320,990 319,971 318,952 317,937 316,924 315,911 315,902 314,897 L 317,897 Z" id="glyph40"/><glyph unicode="g" horiz-adv-x="954" d="M 548,-425 C 486,-425 431,-419 383,-406 335,-393 294,-375 260,-352 226,-328 198,-300 177,-267 156,-234 140,-198 131,-158 L 312,-132 C 324,-182 351,-220 392,-248 433,-274
486,-288 553,-288 594,-288 631,-282 664,-271 697,-260 726,-241 749,-217 772,-191 790,-159 803,-119 816,-79 822,-30 822,27 L 822,201 820,201 C 807,174 790,148 771,123 751,98 727,75 699,56 670,37 637,21 600,10 563,-2 520,-8 472,-8 403,-8 345,4 296,27 247,50 207,84 176,130 145,176 122,233 108,302 93,370 86,449 86,539 86,626 93,704 108,773 122,842 145,901 178,950 210,998 252,1035 304,1061 355,1086 418,1099 492,1099 569,1099 635,1082 692,1047 748,1012 791,962 822,897 L 824,897 C 824,914 825,933 826,953 827,974 828,994 829,1012 830,1031 831,1046 832,1060 833,1073 835,1080 836,1080 L 1007,1080 C 1006,1074 1006,1064 1005,1050 1004,1035 1004,1018 1003,998 1002,978 1002,956 1002,932 1001,907 1001,882 1001,856 L 1001,30 C 1001,-121 964,-234 890,-311 815,-387 701,-425 548,-425 Z M 822,541 C 822,616 814,681 798,735 781,788 760,832 733,866 706,900 676,925 642,941 607,957 572,965 536,965 490,965 451,957 418,941 385,925 357,900 336,866 314,831 298,787 288,734 277,680 272,616 272,541 272,463 277,398
288,345 298,292 314,249 335,216 356,183 383,160 416,146 449,132 488,125 533,125 569,125 604,133 639,148 673,163 704,188 731,221 758,254 780,297 797,350 814,403 822,466 822,541 Z" id="glyph42"/><glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1243 185,1280 192,1314 199,1347 213,1377 233,1402 252,1427 279,1446 313,1461 347,1475 391,1482 445,1482 466,1482 489,1481 512,1479 535,1477 555,1474 572,1470 L 572,1333 C 561,1335 548,1337 533,1339 518,1340 504,1341 492,1341 465,1341 444,1337 427,1330 410,1323 396,1312 387,1299 377,1285 370,1268 367,1248 363,1228 361,1205 361,1179 L 361,1082 572,1082 572,951 361,951 Z" id="glyph44"/><glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,446 282,394 294,347 305,299 323,258 348,224 372,189 403,163 441,144 479,125 525,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 1008,206 992,176 972,146 951,115 924,88 890,64 856,39 814,19 763,4 712,-12 650,-20 578,-20 418,-2
0 296,28 213,123 129,218 87,360 87,548 87,649 100,735 125,806 150,876 185,933 229,977 273,1021 324,1053 383,1073 442,1092 504,1102 571,1102 662,1102 738,1087 799,1058 860,1029 909,988 946,937 983,885 1009,824 1025,754 1040,684 1048,608 1048,527 L 1048,503 276,503 Z M 862,641 C 852,755 823,838 775,891 727,943 658,969 568,969 538,969 507,964 474,955 441,945 410,928 382,903 354,878 330,845 311,803 292,760 281,706 278,641 L 862,641 Z" id="glyph46"/><glyph unicode="d" horiz-adv-x="954" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 C 823,921 823,931 823,946 822,960 822,975 822,991 821,1006 821,1021 821,1035 821,1049 821,1059 821,1065 L 821,1484 1001,1484 1001,219 C 1001,193 1001,168 1002,143 1002,119 1002,97 1003,77 1004,57 1004,40 1005,26 1006,11 1006,4 1007,4 L 835,4 C 834,11 833,20 832,32 831,44 830,58 829,73 828,89 827,105 826,123 825,140 82
5,157 825,174 L 821,174 Z M 275,542 C 275,467 280,403 289,350 298,297 313,253 334,219 355,184 381,159 413,143 445,127 484,119 530,119 577,119 619,127 656,142 692,157 722,182 747,217 771,251 789,296 802,351 815,406 821,474 821,554 821,631 815,696 802,749 789,802 771,844 746,877 721,910 691,933 656,948 620,962 579,969 532,969 488,969 450,961 418,946 386,931 359,906 338,872 317,838 301,794 291,740 280,685 275,619 275,542 Z" id="glyph48"/><glyph unicode="c" horiz-adv-x="875" d="M 275,546 C 275,484 280,427 289,375 298,323 313,278 334,241 355,203 384,174 419,153 454,132 497,122 548,122 612,122 666,139 709,173 752,206 778,258 788,328 L 970,328 C 964,283 951,239 931,197 911,155 884,118 850,86 815,54 773,28 724,9 675,-10 618,-20 553,-20 468,-20 396,-6 337,23 278,52 230,91 193,142 156,192 129,251 112,320 95,388 87,462 87,542 87,615 93,679 105,735 117,790 134,839 156,881 177,922 203,957 232,986 261,1014 293,1037 328,1054 362,1071 398,1083 436,1091 474,1098 512,1102 551,1102 612,1102 666,1094 7
13,1077 760,1060 801,1038 836,1009 870,980 898,945 919,906 940,867 955,824 964,779 L 779,765 C 770,825 746,873 708,908 670,943 616,961 546,961 495,961 452,953 418,936 383,919 355,893 334,859 313,824 298,781 289,729 280,677 275,616 275,546 Z" id="glyph50"/><glyph unicode="b" horiz-adv-x="953" d="M 1053,546 C 1053,169 920,-20 655,-20 573,-20 505,-5 451,25 396,54 352,102 318,168 L 316,168 C 316,150 316,132 315,113 314,94 313,77 312,61 311,45 310,31 309,19 308,8 307,2 306,2 L 132,2 C 133,8 133,18 134,32 135,47 135,64 136,84 137,104 137,126 138,150 138,174 138,199 138,225 L 138,1484 318,1484 318,1061 C 318,1041 318,1022 318,1004 317,985 317,969 316,955 315,938 315,923 314,908 L 318,908 C 351,977 396,1027 451,1057 506,1087 574,1102 655,1102 792,1102 892,1056 957,964 1021,872 1053,733 1053,546 Z M 864,540 C 864,615 859,679 850,732 841,785 826,829 805,864 784,898 758,923 726,939 694,955 655,963 609,963 562,963 520,955 484,940 447,925 417,900 393,866 368,832 350,787 337,732 324,677 318,609 3
18,529 318,452 324,387 337,334 350,281 368,239 393,206 417,173 447,149 483,135 519,120 560,113 607,113 651,113 689,121 721,136 753,151 780,176 801,210 822,244 838,288 849,343 859,397 864,463 864,540 Z" id="glyph52"/><glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,124 87,203 87,303 87,375 101,434 128,480 155,526 190,562 234,588 277,614 327,632 383,642 439,652 496,657 554,657 L 797,657 797,717 C 797,762 792,800 783,832 774,863 759,889 740,908 721,928 697,942 668,951 639,960 604,965 565,965 530,965 499,963 471,958 443,953 419,944 398,931 377,918 361,900 348,878 335,855 327,827 323,793 L 135,810 C 142,853 154,892 173,928 192,963 218,994 253,1020 287,1046 330,1066 382,1081 433,1095 496,1102 569,1102 705,1102 807,1071 876,1009 945,946 979,856 979,738 L 979,272 C 979,219 986,179 1000,152 1014,125 1041,111 1080,111 1090,111 1100,112 1110,113 1120,114 1130,116 1139,118 L 1139,6 C 1116,1 1094,-3 1072,-6 1049,-9 1025,-10 1000,-10 966,-10 937,-5 913,4 888,13 868,26
853,45 838,63 826,86 818,113 810,140 805,171 803,207 L 797,207 C 778,172 757,141 734,113 711,85 684,61 653,42 622,22 588,7 549,-4 510,-15 465,-20 414,-20 Z M 455,115 C 512,115 563,125 606,146 649,167 684,194 713,226 741,259 762,294 776,332 790,371 797,408 797,443 L 797,531 600,531 C 556,531 514,528 475,522 435,517 400,506 370,489 340,472 316,449 299,418 281,388 272,349 272,300 272,241 288,195 320,163 351,131 396,115 455,115 Z" id="glyph54"/><glyph unicode="_" horiz-adv-x="1191" d="M -31,-407 L -31,-277 1162,-277 1162,-407 -31,-407 Z" id="glyph56"/><glyph unicode="X" horiz-adv-x="1324" d="M 1112,0 L 689,616 257,0 46,0 582,732 87,1409 298,1409 690,856 1071,1409 1282,1409 800,739 1323,0 1112,0 Z" id="glyph58"/><glyph unicode="T" horiz-adv-x="1139" d="M 720,1253 L 720,0 530,0 530,1253 46,1253 46,1409 1204,1409 1204,1253 720,1253 Z" id="glyph60"/><glyph unicode="S" horiz-adv-x="1139" d="M 1272,389 C 1272,330 1261,275 1238,225 1215,175 1179,132 1131,96 1083,59 1023,31 950,11 877,-10 790,
-20 690,-20 515,-20 378,11 280,72 182,133 120,222 93,338 L 278,375 C 287,338 302,305 321,275 340,245 367,219 400,198 433,176 473,159 522,147 571,135 629,129 697,129 754,129 806,134 853,144 900,153 941,168 975,188 1009,208 1036,234 1055,266 1074,297 1083,335 1083,379 1083,425 1073,462 1052,491 1031,520 1001,543 963,562 925,581 880,596 827,609 774,622 716,635 652,650 613,659 573,668 534,679 494,689 456,701 420,716 383,730 349,747 317,766 285,785 257,809 234,836 211,863 192,894 179,930 166,965 159,1006 159,1053 159,1120 173,1177 200,1225 227,1272 264,1311 312,1342 360,1373 417,1395 482,1409 547,1423 618,1430 694,1430 781,1430 856,1423 918,1410 980,1396 1032,1375 1075,1348 1118,1321 1152,1287 1178,1247 1203,1206 1224,1159 1239,1106 L 1051,1073 C 1042,1107 1028,1137 1011,1164 993,1191 970,1213 941,1231 912,1249 878,1263 837,1272 796,1281 747,1286 692,1286 627,1286 572,1280 528,1269 483,1257 448,1241 421,1221 394,1201 374,1178 363,1151 351,1124 345,1094 345,1063 345,1021 356,987 377,960 3
98,933 426,910 462,892 498,874 540,859 587,847 634,835 685,823 738,811 781,801 825,791 868,781 911,770 952,758 991,744 1030,729 1067,712 1102,693 1136,674 1166,650 1191,622 1216,594 1236,561 1251,523 1265,485 1272,440 1272,389 Z" id="glyph62"/><glyph unicode="R" horiz-adv-x="1218" d="M 1164,0 L 798,585 359,585 359,0 168,0 168,1409 831,1409 C 911,1409 982,1400 1044,1382 1105,1363 1157,1337 1199,1302 1241,1267 1273,1225 1295,1175 1317,1125 1328,1069 1328,1006 1328,961 1322,917 1309,874 1296,831 1275,791 1247,755 1219,719 1183,688 1140,662 1097,636 1045,618 984,607 L 1384,0 1164,0 Z M 1136,1004 C 1136,1047 1129,1084 1114,1115 1099,1146 1078,1173 1050,1194 1022,1215 988,1230 948,1241 908,1251 863,1256 812,1256 L 359,1256 359,736 820,736 C 875,736 922,743 962,757 1002,770 1035,789 1061,813 1086,837 1105,865 1118,898 1130,931 1136,966 1136,1004 Z" id="glyph64"/><glyph unicode="Q" horiz-adv-x="1377" d="M 1495,711 C 1495,612 1482,521 1457,439 1431,356 1394,284 1346,222 1297,160 1238,110 116
8,71 1097,32 1017,6 928,-6 942,-49 958,-85 976,-115 993,-145 1013,-169 1036,-189 1059,-207 1084,-221 1112,-231 1139,-239 1170,-244 1204,-244 1223,-244 1243,-243 1264,-240 1285,-237 1304,-234 1319,-231 L 1319,-365 C 1294,-371 1266,-376 1236,-381 1205,-385 1174,-387 1141,-387 1084,-387 1034,-378 991,-361 948,-344 911,-319 879,-287 846,-255 818,-216 795,-170 772,-123 751,-71 733,-12 628,-12 535,7 456,46 376,84 310,136 257,200 204,265 164,340 137,427 110,513 97,607 97,709 97,819 112,919 143,1008 174,1097 219,1172 278,1235 337,1297 411,1346 498,1379 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,626 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,17
8 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph66"/><glyph unicode="P" horiz-adv-x="1086" d="M 1258,985 C 1258,924 1248,867 1228,814 1207,761 1177,715 1137,676 1096,637 1046,606 985,583 924,560 854,549 773,549 L 359,549 359,0 168,0 168,1409 761,1409 C 844,1409 917,1399 979,1379 1041,1358 1093,1330 1134,1293 1175,1256 1206,1211 1227,1159 1248,1106 1258,1048 1258,985 Z M 1066,983 C 1066,1072 1039,1140 984,1187 929,1233 847,1256 738,1256 L 359,1256 359,700 746,700 C 856,700 937,724 989,773 1040,822 1066,892 1066,983 Z" id="glyph68"/><glyph unicode="O" horiz-adv-x="1377" d="M 1495,711 C 1495,601 1479,501 1448,411 1416,321 1370,244 1310,180 1250,116 1177,67 1090,32 1003,-3 905,-20 795,-20 679,-20 577,-2 490,35 403,71 330,122 272,187 214,252 170,329 141,418 112,507 97,605 97,711 97,821 112,920 143,1009 174,1098 219,1173 278,1236 337,1298 411,1346 498,1380 585,1413 684,1430 797,1430 909,1430 10
09,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,626 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,178 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph70"/><glyph unicode="M" horiz-adv-x="1324" d="M 1366,0 L 1366,940 C 1366,974 1366,1009 1367,1044 1368,1079 1369,1112 1370,1141 1371,1175 1373,1208 1375,1240 1366,1206 1356,1172 1346,1139 1337,1110 1328,1080 1318,1048 1307,1015 1297,986 1287,960 L 923,0 789,0 420,960 C 416,970 412,982 408,995 403,1008 399,1023 394,1038 389,1053 384,1068 379,1084 374,1099 369,1115 364,1130 353,1165 342,1202 331,1240 332,1203 333,1166 334,1129 335,1098 336,1065
337,1031 338,996 338,966 338,940 L 338,0 168,0 168,1409 419,1409 794,432 C 799,419 804,402 811,381 818,360 824,338 830,316 836,294 842,273 847,254 852,234 855,219 857,208 859,219 863,234 868,254 873,274 880,295 887,317 894,339 900,360 907,381 914,402 920,419 925,432 L 1293,1409 1538,1409 1538,0 1366,0 Z" id="glyph72"/><glyph unicode="L" horiz-adv-x="900" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z" id="glyph74"/><glyph unicode="K" horiz-adv-x="1191" d="M 1106,0 L 543,680 359,540 359,0 168,0 168,1409 359,1409 359,703 1038,1409 1263,1409 663,797 1343,0 1106,0 Z" id="glyph76"/><glyph unicode="I" horiz-adv-x="186" d="M 189,0 L 189,1409 380,1409 380,0 189,0 Z" id="glyph78"/><glyph unicode="E" horiz-adv-x="1112" d="M 168,0 L 168,1409 1237,1409 1237,1253 359,1253 359,801 1177,801 1177,647 359,647 359,156 1278,156 1278,0 168,0 Z" id="glyph80"/><glyph unicode="D" horiz-adv-x="1218" d="M 1381,719 C 1381,602 1363,498 1328,409 1293,319 1244,244 1183,184 1122,123 1049,78 966,
47 882,16 792,0 695,0 L 168,0 168,1409 634,1409 C 743,1409 843,1396 935,1369 1026,1342 1105,1300 1171,1244 1237,1187 1289,1116 1326,1029 1363,942 1381,839 1381,719 Z M 1189,719 C 1189,814 1175,896 1148,964 1121,1031 1082,1087 1033,1130 984,1173 925,1205 856,1226 787,1246 712,1256 630,1256 L 359,1256 359,153 673,153 C 747,153 816,165 879,189 942,213 996,249 1042,296 1088,343 1124,402 1150,473 1176,544 1189,626 1189,719 Z" id="glyph82"/><glyph unicode="C" horiz-adv-x="1297" d="M 792,1274 C 712,1274 641,1261 580,1234 518,1207 466,1169 425,1120 383,1071 351,1011 330,942 309,873 298,796 298,711 298,626 310,549 333,479 356,408 389,348 432,297 475,246 527,207 590,179 652,151 722,137 800,137 855,137 905,144 950,159 995,173 1035,193 1072,219 1108,245 1140,276 1169,312 1198,347 1223,387 1245,430 L 1401,352 C 1376,299 1344,250 1307,205 1270,160 1226,120 1176,87 1125,54 1068,28 1005,9 941,-10 870,-20 791,-20 677,-20 577,-2 492,35 406,71 334,122 277,187 219,252 176,329 147,418 118,507 104,605 10
4,711 104,821 119,920 150,1009 180,1098 224,1173 283,1236 341,1298 413,1346 498,1380 583,1413 681,1430 790,1430 940,1430 1065,1401 1166,1342 1267,1283 1341,1196 1388,1081 L 1207,1021 C 1194,1054 1176,1086 1153,1117 1130,1147 1102,1174 1068,1197 1034,1220 994,1239 949,1253 903,1267 851,1274 792,1274 Z" id="glyph84"/><glyph unicode="B" horiz-adv-x="1086" d="M 1258,397 C 1258,326 1244,265 1216,215 1188,164 1150,123 1103,92 1056,60 1001,37 938,22 875,7 809,0 740,0 L 168,0 168,1409 680,1409 C 758,1409 828,1403 889,1390 950,1377 1002,1356 1045,1328 1088,1300 1120,1265 1143,1222 1165,1179 1176,1127 1176,1067 1176,1028 1171,991 1160,956 1149,921 1132,890 1110,862 1087,833 1059,809 1026,789 992,768 953,753 908,743 965,736 1015,723 1059,704 1102,685 1139,660 1168,630 1197,600 1220,565 1235,526 1250,486 1258,443 1258,397 Z M 984,1044 C 984,1120 958,1174 906,1207 854,1240 779,1256 680,1256 L 359,1256 359,810 680,810 C 736,810 783,816 822,827 861,838 892,853 916,874 940,894 957,918 968,947 979,9
76 984,1008 984,1044 Z M 1065,412 C 1065,457 1057,495 1041,526 1024,557 1001,583 970,603 939,623 903,638 860,647 817,656 768,661 715,661 L 359,661 359,153 730,153 C 779,153 824,157 865,165 906,173 941,187 971,207 1000,227 1023,254 1040,287 1057,320 1065,362 1065,412 Z" id="glyph86"/><glyph unicode="A" horiz-adv-x="1350" d="M 1167,0 L 1006,412 364,412 202,0 4,0 579,1409 796,1409 1362,0 1167,0 Z M 768,1026 C 757,1053 747,1080 738,1107 728,1134 719,1159 712,1182 705,1204 699,1223 694,1238 689,1253 686,1262 685,1265 684,1262 681,1252 676,1237 671,1222 665,1203 658,1180 650,1157 641,1132 632,1105 622,1078 612,1051 602,1024 L 422,561 949,561 768,1026 Z" id="glyph88"/><glyph unicode=" " horiz-adv-x="556" id="glyph90"/></font></defs><defs class="TextShapeIndex" id="defs97"><g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 i
d42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62 id63 id64 id65" id="g95"/></defs><defs class="EmbeddedBulletChars" id="defs129"><g id="bullet-char-template(57356)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 580,1141 1163,571 580,0 -4,571 Z" id="path99" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(57354)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 8,1128 H 1137 V 0 H 8 Z" id="path102" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10146)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z" id="path105" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10132)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 2015,739 1276,0 H 717 l 543,543 H 174 v 393 h 1086 l -543,545 h 557 z" id="path108" inkscape:connector-curvature="0"/></g><g id="
bullet-char-template(10007)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z" id="path111" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10004)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 390,-6 338,-33 285,-33 Z" id="path114" inkscape:connector-curvature="0"/></g><g id="bullet-char-template
(9679)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z" id="path117" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8226)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z" id="path120" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8211)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M -4,459 H 1135 V 606 H -4 Z" id="path123" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(61548)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 173,740 c 0,163 58,303 173,419 116,115 255,173
419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z" id="path126" inkscape:connector-curvature="0"/></g></defs><defs class="TextEmbeddedBitmaps" id="defs131"/><g id="g136" transform="translate(-4840.889,-3040)"><g id="id2" class="Master_Slide"><g id="bg-id2" class="Background"/><g id="bo-id2" class="BackgroundObjects"/></g></g><g class="SlideGroup" id="g1187" transform="translate(-4840.889,-3040)"><g id="g1185"><g id="container-id1"><g id="id1" class="Slide" clip-path="url(#presentation_clip_path)"><g class="Page" id="g1181"><g class="com.sun.star.drawing.CustomShape" id="g157"><g id="id3"><rect class="BoundingBox" x="7530" y="7229" width="3561" height="1654" id="rect138" style="fill:none;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z"
id="path140" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z" id="path142" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7531,7230 Z" id="path144" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11089,8881 Z" id="path146" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text154"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan152" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="7773" y="8276" id="tspan150"><tspan id="tspan148" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g178"><g id="id4"><rect class="BoundingBox" x="7785" y="7611" width="3561" height="1654" id="rect159" style="fill:none;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path161" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z" id="path163" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7786,7612 Z" id="path165" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11344,9263 Z" id="path167" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text175"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1
73" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8028" y="8658" id="tspan171"><tspan id="tspan169" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g199"><g id="id5"><rect class="BoundingBox" x="8037" y="7991" width="3561" height="1654" id="rect180" style="fill:none;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path182" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z" id="path184" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,7992 Z" id="path186" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,9643 Z" id="path188" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text196"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1
94" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8773" y="9038" id="tspan192"><tspan id="tspan190" style="fill:#000000;stroke:none">PKTIO </tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g220"><g id="id6"><rect class="BoundingBox" x="8037" y="10151" width="3561" height="1654" id="rect201" style="fill:none;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path203" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path205" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,10152 Z" id="path207" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,11803 Z" id="path209" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text217"><tspan class="TextParagraph" font-size="635px" font-weight="400" id=
"tspan215" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8818" y="11198" id="tspan213"><tspan id="tspan211" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g241"><g id="id7"><rect class="BoundingBox" x="12610" y="8691" width="4322" height="1654" id="rect222" style="fill:none;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path224" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z" id="path226" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 12611,8692 Z" id="path228" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 16930,10343 Z" id="path230" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text238"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span236" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="12905" y="9738" id="tspan234"><tspan id="tspan232" style="fill:#000000;stroke:none">Classification</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g266"><g id="id8"><rect class="BoundingBox" x="18072" y="7228" width="1909" height="639" id="rect243" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path245" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path247" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path249" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path251" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path253" inkscape:connector-curvature="0" style="fill:n
one;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path255" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,7865 Z" id="path257" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path259" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path261" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path263" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g291"><g id="id9"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect268" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318
z m 0,0 z m 636,636 z" id="path270" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path272" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path274" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path276" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path278" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path280" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path282" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path284" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,8246 Z" id="
path286" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,8882 Z" id="path288" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g316"><g id="id10"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect293" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path295" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path297" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path299" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899 Z" id="path301" inkscape:con
nector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path303" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path305" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path307" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path309" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path311" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path313" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g341"><g id="id11"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect318" style="fill:none;stroke:none"/><path d="m 18073,10405 h 477 l
159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path320" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path322" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path324" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path326" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path328" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path330" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path332" inkscape:connector-curvature="0" style="fill:none;str
oke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path334" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path336" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path338" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g350"><g id="id12"><rect class="BoundingBox" x="11595" y="7398" width="6479" height="1421" id="rect343" style="fill:none;stroke:none"/><path d="m 11596,8817 c 1822,0 -1285,-1218 6005,-1268" id="path345" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,7547 -451,-148 2,300 z" id="path347" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g359"><g id="id13"><rect class="BoundingBox" x="16928" y="8564" width="1146" height="955" id="rect352" style="fil
l:none;stroke:none"/><path d="m 16929,9517 c 859,0 474,-567 747,-827" id="path354" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,8564 -474,4 97,284 z" id="path356" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g368"><g id="id14"><rect class="BoundingBox" x="16928" y="9418" width="1146" height="302" id="rect361" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 491,34 710,53" id="path363" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,9581 -446,-163 -8,300 z" id="path365" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g377"><g id="id15"><rect class="BoundingBox" x="16928" y="9516" width="1146" height="1208" id="rect370" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 469,738 759,1060" id="path372" inkscape:connector-curvature="0"
style="fill:none;stroke:#000000"/><path d="m 18073,10723 -361,-308 -112,278 z" id="path374" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g386"><g id="id16"><rect class="BoundingBox" x="11595" y="8816" width="1017" height="702" id="rect379" style="fill:none;stroke:none"/><path d="m 11596,8817 c 762,0 439,365 621,568" id="path381" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 12611,9517 -372,-294 -102,282 z" id="path383" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g407"><g id="id17"><rect class="BoundingBox" x="21501" y="8246" width="4322" height="1654" id="rect388" style="fill:none;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path390" inkscape:conn
ector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138,-275 -276,-275 z" id="path392" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 21502,8247 Z" id="path394" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 25821,9898 Z" id="path396" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text404"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan402" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="22237" y="9293" id="tspan400"><tspan id="tspan398" style="fill:#000000;stroke:none">Scheduler</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g416"><g id="id18"><rect class="BoundingBox" x="19978" y="7546" width="6859" height="1257" id="rect409" style="fill:none;stroke:none"/><path d="m 19979,7547 c 8298,0 5408,934 6428,1108" id="path411" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 26836,8683 -439,-181 -20,300 z" id="path413" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g425"><g id="id19"><rect class="BoundingBox" x="19978" y="8563" width="1525" height="617" id="rect418" style="fill:none;stroke:none"/><path d="m 19979,8564 c 1143,0 584,351 1090,470" id="path420" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -434,-192 -28,299 z" id="path422" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g434"><g id="id20"><rect class="BoundingBox"
x="19978" y="8965" width="1525" height="618" id="rect427" style="fill:none;stroke:none"/><path d="m 19979,9581 c 1143,0 584,-352 1090,-470" id="path429" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -462,-107 28,299 z" id="path431" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g443"><g id="id21"><rect class="BoundingBox" x="19978" y="9047" width="1525" height="1678" id="rect436" style="fill:none;stroke:none"/><path d="m 19979,10723 c 1143,0 572,-1180 1116,-1545" id="path438" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -474,-24 81,289 z" id="path440" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g456"><g id="id22"><rect class="BoundingBox" x="17808" y="5933" width="3569" height="1214" id="rect445" style="fill:none;stroke:none"/><text class="Text
Shape" id="text453"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan451" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="18058" y="6630" id="tspan449"><tspan id="tspan447" style="fill:#000000;stroke:none">Queue</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g477"><g id="id23"><rect class="BoundingBox" x="26834" y="7857" width="3561" height="1654" id="rect458" style="fill:none;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path460" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z" id="path462" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 26835,7858 Z" id="path464" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30393,9509 Z" id="path466" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text474"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span472" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27077" y="8904" id="tspan470"><tspan id="tspan468" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g498"><g id="id24"><rect class="BoundingBox" x="27088" y="8237" width="3561" height="1654" id="rect479" style="fill:none;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path481" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z" id="path483" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27089,8238 Z" id="path485" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30647,9889 Z" id="path487" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text495"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span493" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27331" y="9284" id="tspan491"><tspan id="tspan489" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g519"><g id="id25"><rect class="BoundingBox" x="27343" y="8619" width="3561" height="1654" id="rect500" style="fill:none;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path502" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z" id="path504" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27344,8620 Z" id="path506" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30902,10271 Z" id="path508" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text516"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="
tspan514" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27522" y="9666" id="tspan512"><tspan id="tspan510" style="fill:#000000;stroke:none">odp_thread</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g528"><g id="id26"><rect class="BoundingBox" x="25819" y="8914" width="1272" height="302" id="rect521" style="fill:none;stroke:none"/><path d="m 25820,9072 c 952,0 521,-5 836,-8" id="path523" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27090,9063 -450,-149 v 300 z" id="path525" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g537"><g id="id27"><rect class="BoundingBox" x="25819" y="9071" width="1527" height="494" id="rect530" style="fill:none;stroke:none"/><path d="m 25820,9072 c 1144,0 585,257 1090,345" id="path532" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27345,9445 -438,-181 -21,299 z" id="path534" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g562"><g id="id28"><rect class="BoundingBox" x="1807
2" y="7228" width="1909" height="639" id="rect539" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path541" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path543" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path545" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path547" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path549" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path551" inkscape:connector-curvature="0" style="fill:none;str
oke:#3465a4"/><path d="M 19344,7865 Z" id="path553" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path555" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path557" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path559" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g587"><g id="id29"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect564" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path566" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d
="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path568" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path570" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path572" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path574" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path576" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path578" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path580" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,8246 Z" id="path582" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,8882 Z" id="path58
4" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g612"><g id="id30"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect589" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path591" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path593" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path595" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899 Z" id="path597" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9263 h 477 l 159,318 -159,318 h -477 l
159,-318 z" id="path599" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path601" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path603" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path605" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path607" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path609" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g637"><g id="id31"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect614" style="fill:none;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318
z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path616" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path618" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path620" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path622" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path624" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path626" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path628" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path630" inkscape:connec
tor-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path632" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path634" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g662"><g id="id32"><rect class="BoundingBox" x="35089" y="7471" width="1909" height="639" id="rect639" style="fill:none;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path641" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path643" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,7472 Z" id="path645" inkscape:connector-curvature="0" s
tyle="fill:none;stroke:#3465a4"/><path d="M 35726,8108 Z" id="path647" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path649" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,7472 Z" id="path651" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,8108 Z" id="path653" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path655" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,7472 Z" id="path657" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,8108 Z" id="path659" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g687"><g id="id33"><rect class="BoundingBox" x="35089" y="8787" width="1909" heigh
t="639" id="rect664" style="fill:none;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path666" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path668" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,8788 Z" id="path670" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,9424 Z" id="path672" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path674" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,8788 Z" id="path676" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361
,9424 Z" id="path678" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path680" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,8788 Z" id="path682" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,9424 Z" id="path684" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g712"><g id="id34"><rect class="BoundingBox" x="35089" y="9930" width="1909" height="639" id="rect689" style="fill:none;stroke:none"/><path d="m 35090,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path691" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,9931 h 477 l 159,318
-159,318 h -477 l 159,-318 z" id="path693" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,9931 Z" id="path695" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,10567 Z" id="path697" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path699" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,9931 Z" id="path701" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,10567 Z" id="path703" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path705" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,9931 Z" id="path707" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,10567 Z" id="path709" inkscape:connector-curva
ture="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g721"><g id="id35"><rect class="BoundingBox" x="30901" y="9444" width="4190" height="950" id="rect714" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1257,720 3726,797" id="path716" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,10249 -448,-157 -4,300 z" id="path718" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g730"><g id="id36"><rect class="BoundingBox" x="30901" y="8958" width="4190" height="489" id="rect723" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1258,-303 3724,-336" id="path725" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,9106 -451,-147 2,300 z" id="path727" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g73
9"><g id="id37"><rect class="BoundingBox" x="30901" y="7653" width="4190" height="1794" id="rect732" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1254,-1485 3732,-1642" id="path734" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,7790 -454,-136 9,300 z" id="path736" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g760"><g id="id38"><rect class="BoundingBox" x="38898" y="8872" width="4577" height="1654" id="rect741" style="fill:none;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z m -275,0 z m 4574,1651 z" id="path743" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z" id="path74
5" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 38899,8873 Z" id="path747" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 43473,10524 Z" id="path749" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text757"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan755" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="39511" y="9919" id="tspan753"><tspan id="tspan751" style="fill:#000000;stroke:none">Traffic Mngr</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g781"><g id="id39"><rect class="BoundingBox" x="30771" y="12437" width="3561" height="1654" id="rect762" style="fill:none;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path764" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path766" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,12438 Z" id="path768" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,14089 Z" id="path770" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text778"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan776" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31581" y="13484" id="tspan774"><tspan id="tspan772" style="fill:#000000;stroke:none">Packet</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g802"><g id="id40"><rect class="BoundingBox" x="27214" y="17390" width="3561" height="1654" id="rect783" style="fill:none;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path785" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path787" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,17391 Z" id="path789" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,19042 Z" id="path791" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text799"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan797" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28200" y="18437" id="tspan795"><tspan id="tspan793" style="fill:#000000;stroke:none">IPsec</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g823"><g id="id41"><rect class="BoundingBox" x="30771" y="14087" width="3561" height="1654" id="rect804" style="fill:none;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path806" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path808" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,14088 Z" id="path810" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,15739 Z" id="path812" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text820"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan818" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31459" y="15134" id="tspan816"><tspan id="tspan814" style="fill:#000000;stroke:none">Shmem</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g844"><g id="id42"><rect class="BoundingBox" x="27214" y="15738" width="3561" height="1654" id="rect825" style="fill:none;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path827" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path829" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,15739 Z" id="path831" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,17390 Z" id="path833" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text841"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan839" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28289" y="16785" id="tspan837"><tspan id="tspan835" style="fill:#000000;stroke:none">Sync</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g865"><g id="id43"><rect class="BoundingBox" x="30771" y="15738" width="3561" height="1654" id="rect846" style="fill:none;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path848" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path850" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,15739 Z" id="path852" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,17390 Z" id="path854" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text862"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan860" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31552" y="16785" id="tspan858"><tspan id="tspan856" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g874"><g id="id44"><rect class="BoundingBox" x="36995" y="9105" width="1906" height="716" id="rect867" style="fill:none;stroke:none"/><path d="m 36996,9106 c 1428,0 678,452 1468,566" id="path869" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -440,-178 -19,299 z" id="path871" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g883"><g id="id45"><rect class="BoundingBox" x="36995" y="9574" width="1906" height="677" id="rect876" style="fill:none;stroke:none"/><path d="m 36996,10249 c 1428,0 678,-421 1468,-527" id="path878" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -458,-123 18,299 z" id="path880" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g904"><g id="id46"><rect class="BoundingBox" x="4
5376" y="7811" width="3561" height="1654" id="rect885" style="fill:none;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path887" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z" id="path889" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45377,7812 Z" id="path891" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 48935,9463 Z" id="path893" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text901"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan899" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="
TextPosition" x="45619" y="8858" id="tspan897"><tspan id="tspan895" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g925"><g id="id47"><rect class="BoundingBox" x="45631" y="8191" width="3561" height="1654" id="rect906" style="fill:none;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path908" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z" id="path910" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45632,8192 Z" id="path912" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49190,9843 Z" id="path914" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text922"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="t
span920" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="45874" y="9238" id="tspan918"><tspan id="tspan916" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g946"><g id="id48"><rect class="BoundingBox" x="45883" y="8572" width="3561" height="1654" id="rect927" style="fill:none;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path929" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z" id="path931" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45884,8573 Z" id="path933" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49442,10224 Z" id="path935" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text943"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="
tspan941" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="46708" y="9619" id="tspan939"><tspan id="tspan937" style="fill:#000000;stroke:none">PKTIO</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g955"><g id="id49"><rect class="BoundingBox" x="43472" y="9256" width="2414" height="444" id="rect948" style="fill:none;stroke:none"/><path d="m 43473,9698 c 1809,0 802,-246 1978,-293" id="path950" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45885,9398 -453,-142 6,300 z" id="path952" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g976"><g id="id50"><rect class="BoundingBox" x="27214" y="12437" width="3561" height="1654" id="rect957" style="fill:none;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path959" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-
138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path961" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,12438 Z" id="path963" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,14089 Z" id="path965" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text973"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan971" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28037" y="13484" id="tspan969"><tspan id="tspan967" style="fill:#000000;stroke:none">Timers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g997"><g id="id51"><rect class="BoundingBox" x="27214" y="14087" width="3561" height="1654" id="rect978" style="fill:none;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path980" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path982" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,14088 Z" id="path984" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,15739 Z" id="path986" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text994"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan992" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28183" y="15134" id="tspan990"><tspan id="tspan988" style="fill:#000000;stroke:none">Event</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1006"><g id="id52"><rect class="BoundingBox" x="9223" y="3801" width="37935" height="4013" id="rect999" style="fill:none;stroke:none"/><path d="M 47156,7812 C 47156,2457 10447,2740 9336,7029" id="path1001" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 9310,7230 210,-425 -297,-41 z" id="path1003" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g1019"><g id="id53"><rect class="BoundingBox" x="26705" y="3040" width="5335" height="1017" id="rect1008" style="fill:none;stroke:none"/><text class="TextShape" id="text1016"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1014" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="26955" y="3737" id="tspan1012"><tspan id="tspan1010" style="fill:#000000;stroke:none">Loopback</tspan></tspan></tspan><
/text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g1040"><g id="id54"><rect class="BoundingBox" x="4854" y="8465" width="1967" height="1066" id="rect1021" style="fill:none;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z m 0,-265 z m 1964,1063 z" id="path1023" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z" id="path1025" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 4855,8466 Z" id="path1027" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 6819,9529 Z" id="path1029" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text1037"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1035" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="5274" y="9218" id="tspan1033"><tspa
n id="tspan1031" style="fill:#000000;stroke:none">RX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1049"><g id="id55"><rect class="BoundingBox" x="36995" y="7789" width="8384" height="994" id="rect1042" style="fill:none;stroke:none"/><path d="m 36996,7790 c 8817,0 4991,769 7903,842" id="path1044" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45378,8637 -448,-155 -4,300 z" id="path1046" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g1070"><g id="id56"><rect class="BoundingBox" x="50054" y="8465" width="1967" height="1066" id="rect1051" style="fill:none;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z m 0,-265 z m 1964,1063 z" id="path1053" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z" id="path1055" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 50055,8466
Z" id="path1057" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 52019,9529 Z" id="path1059" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text1067"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1065" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="50508" y="9218" id="tspan1063"><tspan id="tspan1061" style="fill:#000000;stroke:none">TX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g1091"><g id="id57"><rect class="BoundingBox" x="30842" y="17383" width="3561" height="1654" id="rect1072" style="fill:none;stroke:none"/><path d="m 31118,17384 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path1074" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31118,17384 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path1076" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30843,17384 Z" id="path1078" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34401,19035 Z" id="path1080" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text1088"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan1086" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31688" y="18430" id="tspan1084"><tspan id="tspan1082" style="fill:#000000;stroke:none">Crypto</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1100"><g id="id58"><rect class="BoundingBox" x="26672" y="10239" width="2453" height="7978" id="rect1093" style="fill:none;stroke:none"/><path d="m 29123,10270 c 0,-96 -1205,-81 -1870,1930 -665,2011 -739,4834 -323,5755" id="path1095" inkscape:connector-curvature="0" style="fill:none;stroke:#0000ff"/><path d="m 27216,18216 -222,-419 -207,217 z" id="path1097" inkscape:connector-curvature="0" style="fill:#0000ff;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g1113"><g id="id59"><rect class="BoundingBox" x="21574" y="18877" width="4448" height="1144" id="rect1102" style="fill:none;stroke:none"/><text class="TextShape" id="text1110"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1108" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21824" y="19669" id="tspan1106"><tspan id="tspan1104" style="fill:#000000;stroke:none">
RX Decrypted</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g1126"><g id="id60"><rect class="BoundingBox" x="26287" y="10977" width="3822" height="1144" id="rect1115" style="fill:none;stroke:none"/><text class="TextShape" id="text1123"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1121" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="26537" y="11769" id="tspan1119"><tspan id="tspan1117" style="fill:#000000;stroke:none">TX Encrypt</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g1139"><g id="id61"><rect class="BoundingBox" x="21925" y="16777" width="3746" height="1144" id="rect1128" style="fill:none;stroke:none"/><text class="TextShape" id="text1136"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1134" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="22175" y="17569" id="tspan1132"><tspan id="tspan1130" style="fill:#000000;stroke:none">RX Decrypt</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g1152"><g id="id62"><rect class="BoundingBox" x="33336" y="10978" width="4525" height="1144" id="rect1141" style="fill:none;stroke:none"/><text class="TextShape" id="text1149"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan1147" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="33586" y="11770" id="tspan1145"><tspan id="tspan1143" style="fill:#000000;stroke:none">TX Encrypted</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g1161"><g id="id63"><rect class="BoundingBox" x="11595" y="8816" width="15622" height="9550" id="rect1154" style="fill:none;stroke:none"/><path d="m 11596,8817 c 2775,0 -4933,9276 15215,9398" id="path1156" inkscape:connector-curvature="0" style="fill:none;stroke:#ff3333"/><path d="m 27216,18216 -450,-151 v 300 z" id="path1158" inkscape:connector-curvature="0" style="fill:#ff3333;stroke:none"/></g></g><g class="com.sun.star.drawing.OpenBezierShape" id="g1170"><g id="id64"><rect class="BoundingBox" x="31861" y="9540" width="3208" height="8671" id="rect1163" style="fill:none;stroke:none"/><path d="m 34401,18209 c 876,0 543,-4495 666,-4495 0,-2304 -3205,-1018 -3205,-2572 0,-1576 176,-1044 286,-1182" id="path1165" inkscape:connector-curvature="0" style="fill:none;stroke:#6666ff"/><path d="m 32235,9540 -251,412 297,68 z" id="path1167" inkscape:connector-curvature="0" style="fill:#6666ff;stroke:none"/></g></g><g class="com.sun.star
.drawing.OpenBezierShape" id="g1179"><g id="id65"><rect class="BoundingBox" x="11769" y="8874" width="23215" height="11326" id="rect1172" style="fill:none;stroke:none"/><path d="m 11922,9364 c 8,5473 152,2277 152,7144 0,2460 7353,3690 22061,3690 1150,0 1017,-1989 266,-1989" id="path1174" inkscape:connector-curvature="0" style="fill:none;stroke:#ff3333"/><path d="m 11922,8874 -152,458 305,-1 z" id="path1176" inkscape:connector-curvature="0" style="fill:#ff3333;stroke:none"/></g></g></g></g></g></g></g></svg>
diff --git a/doc/images/ipsec-lookaside.svg b/doc/images/ipsec-lookaside.svg
new file mode 100644
index 00000000..0cab3f4d
--- /dev/null
+++ b/doc/images/ipsec-lookaside.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.2" width="471.92221mm" height="188.64999mm" viewBox="0 0 47192.222 18865" preserveAspectRatio="xMidYMid" xml:space="preserve" id="svg3797" sodipodi:docname="ipsec-lookaside.svg" style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round" inkscape:version="0.92.1 r15371"><metadata id="metadata3801"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" g
ridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" id="namedview3799" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.1304858" inkscape:cx="939.7648" inkscape:cy="33.977951" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg3797"/><defs class="ClipPathGroup" id="defs2637"><clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse"><rect x="0" y="0" width="59411" height="42012" id="rect2631"/></clipPath><clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse"><rect x="59" y="42" width="59293" height="41928" id="rect2634"/></clipPath></defs><defs id="defs2726"><font id="EmbeddedFont_1" horiz-adv-x="2048" horiz-origin-x="0" horiz-origin-y="0" vert-origin-x="45" vert-origin-y="90" vert-adv-y="90"><font-face font-family="Liberation Sans embedded" uni
ts-per-em="2048" font-weight="normal" font-style="normal" ascent="1826" descent="423" id="font-face2639"/><missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z" id="missing-glyph2641"/><glyph unicode="y" horiz-adv-x="1059" d="M 604,1 C 579,-64 553,-123 527,-175 500,-227 471,-272 438,-309 405,-346 369,-374 329,-394 289,-413 243,-423 191,-423 168,-423 147,-423 128,-423 109,-423 88,-420 67,-414 L 67,-279 C 80,-282 94,-284 110,-284 126,-284 140,-284 151,-284 204,-284 253,-264 298,-225 343,-186 383,-124 417,-38 L 434,5 5,1082 197,1082 425,484 C 432,466 440,442 451,412 461,382 471,352 482,322 492,292 501,265 509,241 517,217 522,202 523,196 525,203 530,218 538,240 545,261 554,285 564,312 573,339 583,366 593,393 603,420 611,444 618,464 L 830,1082 1020,1082 604,1 Z" id="glyph2643"/><glyph unicode="v" horiz-adv-x="1059" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 442,363 447,346 454,325 460,304 466,282 473,259 480,236 486,215 492,194 497,173 502,155 506,141 510,155 515,1
73 522,194 528,215 534,236 541,258 548,280 555,302 562,323 569,344 575,361 580,376 L 826,1082 1017,1082 613,0 Z" id="glyph2645"/><glyph unicode="u" horiz-adv-x="901" d="M 314,1082 L 314,396 C 314,343 318,299 326,264 333,229 346,200 363,179 380,157 403,142 432,133 460,124 495,119 537,119 580,119 618,127 653,142 687,157 716,178 741,207 765,235 784,270 797,312 810,353 817,401 817,455 L 817,1082 997,1082 997,228 C 997,205 997,181 998,156 998,131 998,107 999,85 1000,62 1000,43 1001,27 1002,11 1002,3 1003,3 L 833,3 C 832,6 832,15 831,30 830,44 830,61 829,79 828,98 827,117 826,136 825,156 825,172 825,185 L 822,185 C 805,154 786,125 765,100 744,75 720,53 693,36 666,18 634,4 599,-6 564,-15 523,-20 476,-20 416,-20 364,-13 321,2 278,17 242,39 214,70 186,101 166,140 153,188 140,236 133,294 133,361 L 133,1082 314,1082 Z" id="glyph2647"/><glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 527,1 499,-5 471,-10 442,-14 409,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324
336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 467,127 484,128 501,131 517,134 535,137 554,141 L 554,8 Z" id="glyph2649"/><glyph unicode="s" horiz-adv-x="927" d="M 950,299 C 950,248 940,203 921,164 901,124 872,91 835,64 798,37 752,16 698,2 643,-13 581,-20 511,-20 448,-20 392,-15 342,-6 291,4 247,20 209,41 171,62 139,91 114,126 88,161 69,203 57,254 L 216,285 C 231,227 263,185 311,158 359,131 426,117 511,117 550,117 585,120 618,125 650,130 678,140 701,153 724,166 743,183 756,205 769,226 775,253 775,285 775,318 767,345 752,366 737,387 715,404 688,418 661,432 628,444 589,455 550,465 507,476 460,489 417,500 374,513 331,527 288,541 250,560 216,583 181,606 153,634 132,668 111,702 100,745 100,796 100,895 135,970 206,1022 276,1073 378,1099 513,1099 632,1099 727,1078 798,1036 868,994 912,927 931,834 L 769,814 C 763,842 752,866 736,885 720,904 701,919 678,931 655,942 630,951 602,956 573,961 544,963 513,963 432,963 372,951 333,926 294,901 27
5,864 275,814 275,785 282,761 297,742 311,723 331,707 357,694 382,681 413,669 449,660 485,650 525,640 568,629 597,622 626,614 656,606 686,597 715,587 744,576 772,564 799,550 824,535 849,519 870,500 889,478 908,456 923,430 934,401 945,372 950,338 950,299 Z" id="glyph2651"/><glyph unicode="r" horiz-adv-x="556" d="M 142,0 L 142,830 C 142,853 142,876 142,900 141,923 141,946 140,968 139,990 139,1011 138,1030 137,1049 137,1067 136,1082 L 306,1082 C 307,1067 308,1049 309,1030 310,1010 311,990 312,969 313,948 313,929 314,910 314,891 314,874 314,861 L 318,861 C 331,902 344,938 359,969 373,999 390,1024 409,1044 428,1063 451,1078 478,1088 505,1097 537,1102 575,1102 590,1102 604,1101 617,1099 630,1096 641,1094 648,1092 L 648,927 C 636,930 622,933 606,935 590,936 572,937 552,937 511,937 476,928 447,909 418,890 394,865 376,832 357,799 344,759 335,714 326,668 322,618 322,564 L 322,0 142,0 Z" id="glyph2653"/><glyph unicode="p" horiz-adv-x="953" d="M 1053,546 C 1053,464 1046,388 1033,319 1020,250 99
8,190 967,140 936,90 895,51 844,23 793,-6 730,-20 655,-20 578,-20 510,-5 452,24 394,53 350,101 319,168 L 314,168 C 315,167 315,161 316,150 316,139 316,126 317,110 317,94 317,76 318,57 318,37 318,17 318,-2 L 318,-425 138,-425 138,864 C 138,891 138,916 138,940 137,964 137,986 136,1005 135,1025 135,1042 134,1056 133,1070 133,1077 132,1077 L 306,1077 C 307,1075 308,1068 309,1057 310,1045 311,1031 312,1014 313,998 314,980 315,961 316,943 316,925 316,908 L 320,908 C 337,943 356,972 377,997 398,1021 423,1041 450,1057 477,1072 508,1084 542,1091 575,1098 613,1101 655,1101 730,1101 793,1088 844,1061 895,1034 936,997 967,949 998,900 1020,842 1033,774 1046,705 1053,629 1053,546 Z M 864,542 C 864,609 860,668 852,720 844,772 830,816 811,852 791,888 765,915 732,934 699,953 658,962 609,962 569,962 531,956 496,945 461,934 430,912 404,880 377,848 356,804 341,748 326,691 318,618 318,528 318,451 324,387 337,334 350,281 368,238 393,205 417,172 447,149 483,135 519,120 560,113 607,113 657,113 699,123 732,
142 765,161 791,189 811,226 830,263 844,308 852,361 860,414 864,474 864,542 Z" id="glyph2655"/><glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 490,-20 422,-9 363,14 304,37 254,71 213,118 172,165 140,223 119,294 97,364 86,447 86,542 86,915 248,1102 571,1102 655,1102 728,1090 789,1067 850,1044 900,1009 939,962 978,915 1006,857 1025,787 1044,717 1053,635 1053,542 Z M 864,542 C 864,626 858,695 845,750 832,805 813,848 788,881 763,914 732,937 696,950 660,963 619,969 574,969 528,969 487,962 450,949 413,935 381,912 355,879 329,846 309,802 296,747 282,692 275,624 275,542 275,458 282,389 297,334 312,279 332,235 358,202 383,169 414,146 449,133 484,120 522,113 563,113 609,113 651,120 688,133 725,146 757,168 783,201 809,234 829,278 843,333 857,388 864,458 864,542 Z" id="glyph2657"/><glyph unicode="n" horiz-adv-x="900" d="M 825,0 L 825,686 C 825,739 821,783 814,818 806,853 793,882 776,904 759,925 736,941 708,950 679,959 644,963 602,963 559,963
521,956 487,941 452,926 423,904 399,876 374,847 355,812 342,771 329,729 322,681 322,627 L 322,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 308,1052 309,1037 310,1021 311,1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 334,928 353,957 374,982 395,1007 419,1029 446,1047 473,1064 505,1078 540,1088 575,1097 616,1102 663,1102 723,1102 775,1095 818,1080 861,1065 897,1043 925,1012 953,981 974,942 987,894 1000,845 1006,788 1006,721 L 1006,0 825,0 Z" id="glyph2659"/><glyph unicode="m" horiz-adv-x="1456" d="M 768,0 L 768,686 C 768,739 765,783 758,818 751,853 740,882 725,904 709,925 688,941 663,950 638,959 607,963 570,963 532,963 498,956 467,941 436,926 410,904 389,876 367,847 350,812 339,771 327,729 321,681 321,627 L 321,0 142,0 142,853 C 142,876 142,900 142,925 141,950 141,974 140,996 139,1019 139,1038 138,1054 137,1070 137,1078 136,1078 L 306,1078 C 307,1075 307,1066 3
08,1052 309,1037 310,1021 311,1002 312,984 312,965 313,945 314,926 314,910 314,897 L 317,897 C 333,928 350,957 369,982 388,1007 410,1029 435,1047 460,1064 488,1078 521,1088 553,1097 590,1102 633,1102 715,1102 780,1086 828,1053 875,1020 908,968 927,897 L 930,897 C 946,928 964,957 984,982 1004,1007 1027,1029 1054,1047 1081,1064 1111,1078 1144,1088 1177,1097 1215,1102 1258,1102 1313,1102 1360,1095 1400,1080 1439,1065 1472,1043 1497,1012 1522,981 1541,942 1553,894 1565,845 1571,788 1571,721 L 1571,0 1393,0 1393,686 C 1393,739 1390,783 1383,818 1376,853 1365,882 1350,904 1334,925 1313,941 1288,950 1263,959 1232,963 1195,963 1157,963 1123,956 1092,942 1061,927 1035,906 1014,878 992,850 975,815 964,773 952,731 946,682 946,627 L 946,0 768,0 Z" id="glyph2661"/><glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z" id="glyph2663"/><glyph unicode="k" horiz-adv-x="927" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,
0 816,0 Z" id="glyph2665"/><glyph unicode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z" id="glyph2667"/><glyph unicode="h" horiz-adv-x="874" d="M 317,897 C 337,934 359,965 382,991 405,1016 431,1037 459,1054 487,1071 518,1083 551,1091 584,1098 622,1102 663,1102 732,1102 789,1093 834,1074 878,1055 913,1029 939,996 964,962 982,922 992,875 1001,828 1006,777 1006,721 L 1006,0 825,0 825,686 C 825,732 822,772 817,807 811,842 800,871 784,894 768,917 745,934 716,946 687,957 649,963 602,963 559,963 521,955 487,940 452,925 423,903 399,875 374,847 355,813 342,773 329,733 322,688 322,638 L 322,0 142,0 142,1484 322,1484 322,1098 C 322,1076 322,1054 321,1032 320,1010 320,990 319,971 318,952 317,937 316,924 315,911 315,902 314,897 L 317,897 Z" id="glyph2669"/><glyph unicode="g" horiz-adv-x="954" d="M 548,-425 C 486,-425 431,-419 383,-406 335,-393 294,-375 260,-352 226,-328 198,-300 177,-267 156,-234 140,-198 131,-158 L 312,-13
2 C 324,-182 351,-220 392,-248 433,-274 486,-288 553,-288 594,-288 631,-282 664,-271 697,-260 726,-241 749,-217 772,-191 790,-159 803,-119 816,-79 822,-30 822,27 L 822,201 820,201 C 807,174 790,148 771,123 751,98 727,75 699,56 670,37 637,21 600,10 563,-2 520,-8 472,-8 403,-8 345,4 296,27 247,50 207,84 176,130 145,176 122,233 108,302 93,370 86,449 86,539 86,626 93,704 108,773 122,842 145,901 178,950 210,998 252,1035 304,1061 355,1086 418,1099 492,1099 569,1099 635,1082 692,1047 748,1012 791,962 822,897 L 824,897 C 824,914 825,933 826,953 827,974 828,994 829,1012 830,1031 831,1046 832,1060 833,1073 835,1080 836,1080 L 1007,1080 C 1006,1074 1006,1064 1005,1050 1004,1035 1004,1018 1003,998 1002,978 1002,956 1002,932 1001,907 1001,882 1001,856 L 1001,30 C 1001,-121 964,-234 890,-311 815,-387 701,-425 548,-425 Z M 822,541 C 822,616 814,681 798,735 781,788 760,832 733,866 706,900 676,925 642,941 607,957 572,965 536,965 490,965 451,957 418,941 385,925 357,900 336,866 314,831 298,787 288,734
277,680 272,616 272,541 272,463 277,398 288,345 298,292 314,249 335,216 356,183 383,160 416,146 449,132 488,125 533,125 569,125 604,133 639,148 673,163 704,188 731,221 758,254 780,297 797,350 814,403 822,466 822,541 Z" id="glyph2671"/><glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1243 185,1280 192,1314 199,1347 213,1377 233,1402 252,1427 279,1446 313,1461 347,1475 391,1482 445,1482 466,1482 489,1481 512,1479 535,1477 555,1474 572,1470 L 572,1333 C 561,1335 548,1337 533,1339 518,1340 504,1341 492,1341 465,1341 444,1337 427,1330 410,1323 396,1312 387,1299 377,1285 370,1268 367,1248 363,1228 361,1205 361,1179 L 361,1082 572,1082 572,951 361,951 Z" id="glyph2673"/><glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,446 282,394 294,347 305,299 323,258 348,224 372,189 403,163 441,144 479,125 525,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 1008,206 992,176 972,146 951,115 924,88 890,64 856,39
814,19 763,4 712,-12 650,-20 578,-20 418,-20 296,28 213,123 129,218 87,360 87,548 87,649 100,735 125,806 150,876 185,933 229,977 273,1021 324,1053 383,1073 442,1092 504,1102 571,1102 662,1102 738,1087 799,1058 860,1029 909,988 946,937 983,885 1009,824 1025,754 1040,684 1048,608 1048,527 L 1048,503 276,503 Z M 862,641 C 852,755 823,838 775,891 727,943 658,969 568,969 538,969 507,964 474,955 441,945 410,928 382,903 354,878 330,845 311,803 292,760 281,706 278,641 L 862,641 Z" id="glyph2675"/><glyph unicode="d" horiz-adv-x="954" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 C 823,921 823,931 823,946 822,960 822,975 822,991 821,1006 821,1021 821,1035 821,1049 821,1059 821,1065 L 821,1484 1001,1484 1001,219 C 1001,193 1001,168 1002,143 1002,119 1002,97 1003,77 1004,57 1004,40 1005,26 1006,11 1006,4 1007,4 L 835,4 C 834,11 833,20 832,32 831,44 8
30,58 829,73 828,89 827,105 826,123 825,140 825,157 825,174 L 821,174 Z M 275,542 C 275,467 280,403 289,350 298,297 313,253 334,219 355,184 381,159 413,143 445,127 484,119 530,119 577,119 619,127 656,142 692,157 722,182 747,217 771,251 789,296 802,351 815,406 821,474 821,554 821,631 815,696 802,749 789,802 771,844 746,877 721,910 691,933 656,948 620,962 579,969 532,969 488,969 450,961 418,946 386,931 359,906 338,872 317,838 301,794 291,740 280,685 275,619 275,542 Z" id="glyph2677"/><glyph unicode="c" horiz-adv-x="875" d="M 275,546 C 275,484 280,427 289,375 298,323 313,278 334,241 355,203 384,174 419,153 454,132 497,122 548,122 612,122 666,139 709,173 752,206 778,258 788,328 L 970,328 C 964,283 951,239 931,197 911,155 884,118 850,86 815,54 773,28 724,9 675,-10 618,-20 553,-20 468,-20 396,-6 337,23 278,52 230,91 193,142 156,192 129,251 112,320 95,388 87,462 87,542 87,615 93,679 105,735 117,790 134,839 156,881 177,922 203,957 232,986 261,1014 293,1037 328,1054 362,1071 398,1083 436,109
1 474,1098 512,1102 551,1102 612,1102 666,1094 713,1077 760,1060 801,1038 836,1009 870,980 898,945 919,906 940,867 955,824 964,779 L 779,765 C 770,825 746,873 708,908 670,943 616,961 546,961 495,961 452,953 418,936 383,919 355,893 334,859 313,824 298,781 289,729 280,677 275,616 275,546 Z" id="glyph2679"/><glyph unicode="b" horiz-adv-x="953" d="M 1053,546 C 1053,169 920,-20 655,-20 573,-20 505,-5 451,25 396,54 352,102 318,168 L 316,168 C 316,150 316,132 315,113 314,94 313,77 312,61 311,45 310,31 309,19 308,8 307,2 306,2 L 132,2 C 133,8 133,18 134,32 135,47 135,64 136,84 137,104 137,126 138,150 138,174 138,199 138,225 L 138,1484 318,1484 318,1061 C 318,1041 318,1022 318,1004 317,985 317,969 316,955 315,938 315,923 314,908 L 318,908 C 351,977 396,1027 451,1057 506,1087 574,1102 655,1102 792,1102 892,1056 957,964 1021,872 1053,733 1053,546 Z M 864,540 C 864,615 859,679 850,732 841,785 826,829 805,864 784,898 758,923 726,939 694,955 655,963 609,963 562,963 520,955 484,940 447,925 417,900
393,866 368,832 350,787 337,732 324,677 318,609 318,529 318,452 324,387 337,334 350,281 368,239 393,206 417,173 447,149 483,135 519,120 560,113 607,113 651,113 689,121 721,136 753,151 780,176 801,210 822,244 838,288 849,343 859,397 864,463 864,540 Z" id="glyph2681"/><glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,124 87,203 87,303 87,375 101,434 128,480 155,526 190,562 234,588 277,614 327,632 383,642 439,652 496,657 554,657 L 797,657 797,717 C 797,762 792,800 783,832 774,863 759,889 740,908 721,928 697,942 668,951 639,960 604,965 565,965 530,965 499,963 471,958 443,953 419,944 398,931 377,918 361,900 348,878 335,855 327,827 323,793 L 135,810 C 142,853 154,892 173,928 192,963 218,994 253,1020 287,1046 330,1066 382,1081 433,1095 496,1102 569,1102 705,1102 807,1071 876,1009 945,946 979,856 979,738 L 979,272 C 979,219 986,179 1000,152 1014,125 1041,111 1080,111 1090,111 1100,112 1110,113 1120,114 1130,116 1139,118 L 1139,6 C 1116,1 1094,-3 1072,-6 1049,-9
1025,-10 1000,-10 966,-10 937,-5 913,4 888,13 868,26 853,45 838,63 826,86 818,113 810,140 805,171 803,207 L 797,207 C 778,172 757,141 734,113 711,85 684,61 653,42 622,22 588,7 549,-4 510,-15 465,-20 414,-20 Z M 455,115 C 512,115 563,125 606,146 649,167 684,194 713,226 741,259 762,294 776,332 790,371 797,408 797,443 L 797,531 600,531 C 556,531 514,528 475,522 435,517 400,506 370,489 340,472 316,449 299,418 281,388 272,349 272,300 272,241 288,195 320,163 351,131 396,115 455,115 Z" id="glyph2683"/><glyph unicode="_" horiz-adv-x="1191" d="M -31,-407 L -31,-277 1162,-277 1162,-407 -31,-407 Z" id="glyph2685"/><glyph unicode="X" horiz-adv-x="1324" d="M 1112,0 L 689,616 257,0 46,0 582,732 87,1409 298,1409 690,856 1071,1409 1282,1409 800,739 1323,0 1112,0 Z" id="glyph2687"/><glyph unicode="T" horiz-adv-x="1139" d="M 720,1253 L 720,0 530,0 530,1253 46,1253 46,1409 1204,1409 1204,1253 720,1253 Z" id="glyph2689"/><glyph unicode="S" horiz-adv-x="1139" d="M 1272,389 C 1272,330 1261,275 1238,225 1
215,175 1179,132 1131,96 1083,59 1023,31 950,11 877,-10 790,-20 690,-20 515,-20 378,11 280,72 182,133 120,222 93,338 L 278,375 C 287,338 302,305 321,275 340,245 367,219 400,198 433,176 473,159 522,147 571,135 629,129 697,129 754,129 806,134 853,144 900,153 941,168 975,188 1009,208 1036,234 1055,266 1074,297 1083,335 1083,379 1083,425 1073,462 1052,491 1031,520 1001,543 963,562 925,581 880,596 827,609 774,622 716,635 652,650 613,659 573,668 534,679 494,689 456,701 420,716 383,730 349,747 317,766 285,785 257,809 234,836 211,863 192,894 179,930 166,965 159,1006 159,1053 159,1120 173,1177 200,1225 227,1272 264,1311 312,1342 360,1373 417,1395 482,1409 547,1423 618,1430 694,1430 781,1430 856,1423 918,1410 980,1396 1032,1375 1075,1348 1118,1321 1152,1287 1178,1247 1203,1206 1224,1159 1239,1106 L 1051,1073 C 1042,1107 1028,1137 1011,1164 993,1191 970,1213 941,1231 912,1249 878,1263 837,1272 796,1281 747,1286 692,1286 627,1286 572,1280 528,1269 483,1257 448,1241 421,1221 394,1201 374,1178 36
3,1151 351,1124 345,1094 345,1063 345,1021 356,987 377,960 398,933 426,910 462,892 498,874 540,859 587,847 634,835 685,823 738,811 781,801 825,791 868,781 911,770 952,758 991,744 1030,729 1067,712 1102,693 1136,674 1166,650 1191,622 1216,594 1236,561 1251,523 1265,485 1272,440 1272,389 Z" id="glyph2691"/><glyph unicode="R" horiz-adv-x="1218" d="M 1164,0 L 798,585 359,585 359,0 168,0 168,1409 831,1409 C 911,1409 982,1400 1044,1382 1105,1363 1157,1337 1199,1302 1241,1267 1273,1225 1295,1175 1317,1125 1328,1069 1328,1006 1328,961 1322,917 1309,874 1296,831 1275,791 1247,755 1219,719 1183,688 1140,662 1097,636 1045,618 984,607 L 1384,0 1164,0 Z M 1136,1004 C 1136,1047 1129,1084 1114,1115 1099,1146 1078,1173 1050,1194 1022,1215 988,1230 948,1241 908,1251 863,1256 812,1256 L 359,1256 359,736 820,736 C 875,736 922,743 962,757 1002,770 1035,789 1061,813 1086,837 1105,865 1118,898 1130,931 1136,966 1136,1004 Z" id="glyph2693"/><glyph unicode="Q" horiz-adv-x="1377" d="M 1495,711 C 1495,612 14
82,521 1457,439 1431,356 1394,284 1346,222 1297,160 1238,110 1168,71 1097,32 1017,6 928,-6 942,-49 958,-85 976,-115 993,-145 1013,-169 1036,-189 1059,-207 1084,-221 1112,-231 1139,-239 1170,-244 1204,-244 1223,-244 1243,-243 1264,-240 1285,-237 1304,-234 1319,-231 L 1319,-365 C 1294,-371 1266,-376 1236,-381 1205,-385 1174,-387 1141,-387 1084,-387 1034,-378 991,-361 948,-344 911,-319 879,-287 846,-255 818,-216 795,-170 772,-123 751,-71 733,-12 628,-12 535,7 456,46 376,84 310,136 257,200 204,265 164,340 137,427 110,513 97,607 97,709 97,819 112,919 143,1008 174,1097 219,1172 278,1235 337,1297 411,1346 498,1379 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,62
6 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,178 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph2695"/><glyph unicode="P" horiz-adv-x="1086" d="M 1258,985 C 1258,924 1248,867 1228,814 1207,761 1177,715 1137,676 1096,637 1046,606 985,583 924,560 854,549 773,549 L 359,549 359,0 168,0 168,1409 761,1409 C 844,1409 917,1399 979,1379 1041,1358 1093,1330 1134,1293 1175,1256 1206,1211 1227,1159 1248,1106 1258,1048 1258,985 Z M 1066,983 C 1066,1072 1039,1140 984,1187 929,1233 847,1256 738,1256 L 359,1256 359,700 746,700 C 856,700 937,724 989,773 1040,822 1066,892 1066,983 Z" id="glyph2697"/><glyph unicode="O" horiz-adv-x="1377" d="M 1495,711 C 1495,601 1479,501 1448,411 1416,321 1370,244 1310,180 1250,116 1177,67 1090,32 1003,-3 905,-20 795,-20 679,-20 577,-2 490,35 403,71 330,122 272,187 214,252 170,329 141,418 112,507 97,605 97,711 97,821 112,920 143,1009 174,1098 219,1173 278,12
36 337,1298 411,1346 498,1380 585,1413 684,1430 797,1430 909,1430 1009,1413 1096,1379 1183,1345 1256,1297 1315,1234 1374,1171 1418,1096 1449,1007 1480,918 1495,820 1495,711 Z M 1300,711 C 1300,796 1289,873 1268,942 1246,1011 1214,1071 1172,1120 1129,1169 1077,1207 1014,1234 951,1261 879,1274 797,1274 713,1274 639,1261 576,1234 513,1207 460,1169 418,1120 375,1071 344,1011 323,942 302,873 291,796 291,711 291,626 302,549 324,479 345,408 377,348 420,297 462,246 515,206 578,178 641,149 713,135 795,135 883,135 959,149 1023,178 1086,207 1139,247 1180,298 1221,349 1251,409 1271,480 1290,551 1300,628 1300,711 Z" id="glyph2699"/><glyph unicode="M" horiz-adv-x="1324" d="M 1366,0 L 1366,940 C 1366,974 1366,1009 1367,1044 1368,1079 1369,1112 1370,1141 1371,1175 1373,1208 1375,1240 1366,1206 1356,1172 1346,1139 1337,1110 1328,1080 1318,1048 1307,1015 1297,986 1287,960 L 923,0 789,0 420,960 C 416,970 412,982 408,995 403,1008 399,1023 394,1038 389,1053 384,1068 379,1084 374,1099 369,1115 364,1130 3
53,1165 342,1202 331,1240 332,1203 333,1166 334,1129 335,1098 336,1065 337,1031 338,996 338,966 338,940 L 338,0 168,0 168,1409 419,1409 794,432 C 799,419 804,402 811,381 818,360 824,338 830,316 836,294 842,273 847,254 852,234 855,219 857,208 859,219 863,234 868,254 873,274 880,295 887,317 894,339 900,360 907,381 914,402 920,419 925,432 L 1293,1409 1538,1409 1538,0 1366,0 Z" id="glyph2701"/><glyph unicode="L" horiz-adv-x="900" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z" id="glyph2703"/><glyph unicode="K" horiz-adv-x="1191" d="M 1106,0 L 543,680 359,540 359,0 168,0 168,1409 359,1409 359,703 1038,1409 1263,1409 663,797 1343,0 1106,0 Z" id="glyph2705"/><glyph unicode="I" horiz-adv-x="186" d="M 189,0 L 189,1409 380,1409 380,0 189,0 Z" id="glyph2707"/><glyph unicode="E" horiz-adv-x="1112" d="M 168,0 L 168,1409 1237,1409 1237,1253 359,1253 359,801 1177,801 1177,647 359,647 359,156 1278,156 1278,0 168,0 Z" id="glyph2709"/><glyph unicode="D" horiz-adv-x="1218" d="M 1381,7
19 C 1381,602 1363,498 1328,409 1293,319 1244,244 1183,184 1122,123 1049,78 966,47 882,16 792,0 695,0 L 168,0 168,1409 634,1409 C 743,1409 843,1396 935,1369 1026,1342 1105,1300 1171,1244 1237,1187 1289,1116 1326,1029 1363,942 1381,839 1381,719 Z M 1189,719 C 1189,814 1175,896 1148,964 1121,1031 1082,1087 1033,1130 984,1173 925,1205 856,1226 787,1246 712,1256 630,1256 L 359,1256 359,153 673,153 C 747,153 816,165 879,189 942,213 996,249 1042,296 1088,343 1124,402 1150,473 1176,544 1189,626 1189,719 Z" id="glyph2711"/><glyph unicode="C" horiz-adv-x="1297" d="M 792,1274 C 712,1274 641,1261 580,1234 518,1207 466,1169 425,1120 383,1071 351,1011 330,942 309,873 298,796 298,711 298,626 310,549 333,479 356,408 389,348 432,297 475,246 527,207 590,179 652,151 722,137 800,137 855,137 905,144 950,159 995,173 1035,193 1072,219 1108,245 1140,276 1169,312 1198,347 1223,387 1245,430 L 1401,352 C 1376,299 1344,250 1307,205 1270,160 1226,120 1176,87 1125,54 1068,28 1005,9 941,-10 870,-20 791,-20 677,-
20 577,-2 492,35 406,71 334,122 277,187 219,252 176,329 147,418 118,507 104,605 104,711 104,821 119,920 150,1009 180,1098 224,1173 283,1236 341,1298 413,1346 498,1380 583,1413 681,1430 790,1430 940,1430 1065,1401 1166,1342 1267,1283 1341,1196 1388,1081 L 1207,1021 C 1194,1054 1176,1086 1153,1117 1130,1147 1102,1174 1068,1197 1034,1220 994,1239 949,1253 903,1267 851,1274 792,1274 Z" id="glyph2713"/><glyph unicode="B" horiz-adv-x="1086" d="M 1258,397 C 1258,326 1244,265 1216,215 1188,164 1150,123 1103,92 1056,60 1001,37 938,22 875,7 809,0 740,0 L 168,0 168,1409 680,1409 C 758,1409 828,1403 889,1390 950,1377 1002,1356 1045,1328 1088,1300 1120,1265 1143,1222 1165,1179 1176,1127 1176,1067 1176,1028 1171,991 1160,956 1149,921 1132,890 1110,862 1087,833 1059,809 1026,789 992,768 953,753 908,743 965,736 1015,723 1059,704 1102,685 1139,660 1168,630 1197,600 1220,565 1235,526 1250,486 1258,443 1258,397 Z M 984,1044 C 984,1120 958,1174 906,1207 854,1240 779,1256 680,1256 L 359,1256 359,810 680
,810 C 736,810 783,816 822,827 861,838 892,853 916,874 940,894 957,918 968,947 979,976 984,1008 984,1044 Z M 1065,412 C 1065,457 1057,495 1041,526 1024,557 1001,583 970,603 939,623 903,638 860,647 817,656 768,661 715,661 L 359,661 359,153 730,153 C 779,153 824,157 865,165 906,173 941,187 971,207 1000,227 1023,254 1040,287 1057,320 1065,362 1065,412 Z" id="glyph2715"/><glyph unicode="A" horiz-adv-x="1350" d="M 1167,0 L 1006,412 364,412 202,0 4,0 579,1409 796,1409 1362,0 1167,0 Z M 768,1026 C 757,1053 747,1080 738,1107 728,1134 719,1159 712,1182 705,1204 699,1223 694,1238 689,1253 686,1262 685,1265 684,1262 681,1252 676,1237 671,1222 665,1203 658,1180 650,1157 641,1132 632,1105 622,1078 612,1051 602,1024 L 422,561 949,561 768,1026 Z" id="glyph2717"/><glyph unicode=")" horiz-adv-x="557" d="M 555,528 C 555,435 548,346 534,262 520,177 498,96 468,18 438,-60 400,-136 353,-209 306,-282 251,-354 186,-424 L 12,-424 C 75,-354 129,-282 175,-209 220,-136 258,-60 287,19 316,98 338,179 353,264 367
,349 374,437 374,530 374,623 367,711 353,796 338,881 316,962 287,1041 258,1119 220,1195 175,1269 129,1342 75,1414 12,1484 L 186,1484 C 251,1414 306,1342 353,1269 400,1196 438,1120 468,1042 498,964 520,883 534,798 548,713 555,625 555,532 L 555,528 Z" id="glyph2719"/><glyph unicode="(" horiz-adv-x="557" d="M 127,532 C 127,625 134,713 148,798 162,883 184,964 214,1042 244,1120 282,1196 329,1269 376,1342 431,1414 496,1484 L 670,1484 C 607,1414 553,1342 508,1269 462,1195 424,1119 395,1041 366,962 344,881 330,796 315,711 308,623 308,530 308,437 315,349 330,264 344,179 366,98 395,19 424,-60 462,-136 508,-209 553,-282 607,-354 670,-424 L 496,-424 C 431,-354 376,-282 329,-209 282,-136 244,-60 214,18 184,96 162,177 148,262 134,346 127,435 127,528 L 127,532 Z" id="glyph2721"/><glyph unicode=" " horiz-adv-x="556" id="glyph2723"/></font></defs><defs class="TextShapeIndex" id="defs2730"><g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id
20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62" id="g2728"/></defs><defs class="EmbeddedBulletChars" id="defs2762"><g id="bullet-char-template(57356)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 580,1141 1163,571 580,0 -4,571 Z" id="path2732" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(57354)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 8,1128 H 1137 V 0 H 8 Z" id="path2735" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10146)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 174,0 602,739 174,1481 1456,739 Z M 1358,739 309,1346 659,739 Z" id="path2738" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10132)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 2015,739 1276,0 H 717 l 543,
543 H 174 v 393 h 1086 l -543,545 h 557 z" id="path2741" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10007)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z" id="path2744" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(10004)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 V 965 c 0,-36 -10,-64 -30,-84 L 442,47 C 3
90,-6 338,-33 285,-33 Z" id="path2747" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(9679)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 Z" id="path2750" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8226)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z" id="path2753" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(8211)" transform="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="M -4,459 H 1135 V 606 H -4 Z" id="path2756" inkscape:connector-curvature="0"/></g><g id="bullet-char-template(61548)" trans
form="matrix(4.8828125e-4,0,0,-4.8828125e-4,0,0)"><path d="m 173,740 c 0,163 58,303 173,419 116,115 255,173 419,173 163,0 302,-58 418,-173 116,-116 174,-256 174,-419 0,-163 -58,-303 -174,-418 C 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z" id="path2759" inkscape:connector-curvature="0"/></g></defs><defs class="TextEmbeddedBitmaps" id="defs2764"/><g id="g2769" transform="translate(-4840.889,-3040)"><g id="id2" class="Master_Slide"><g id="bg-id2" class="Background"/><g id="bo-id2" class="BackgroundObjects"/></g></g><g class="SlideGroup" id="g3795" transform="translate(-4840.889,-3040)"><g id="g3793"><g id="container-id1"><g id="id1" class="Slide" clip-path="url(#presentation_clip_path)"><g class="Page" id="g3789"><g class="com.sun.star.drawing.CustomShape" id="g2790"><g id="id3"><rect class="BoundingBox" x="7530" y="7229" width="3561" height="1654" id="rect2771" style="fill:none;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138
137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2773" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 7806,7230 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7505 c 0,-138 -138,-275 -276,-275 z" id="path2775" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7531,7230 Z" id="path2777" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11089,8881 Z" id="path2779" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2787"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan2785" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="7773" y="8276" id="tspan2783"><tspan id="tspan2781" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2811"><g id="id4"><rect class="BoundingBox" x="7785" y="7611" width="3561" height="1654" id="rect2792" style="fill:none;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2794" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8061,7612 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 7887 c 0,-138 -138,-275 -276,-275 z" id="path2796" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 7786,7612 Z" id="path2798" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11344,9263 Z" id="path2800" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2808"><tspan class="TextParagraph" font-size="635px" font-weight="400" id=
"tspan2806" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8028" y="8658" id="tspan2804"><tspan id="tspan2802" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2832"><g id="id5"><rect class="BoundingBox" x="8037" y="7991" width="3561" height="1654" id="rect2813" style="fill:none;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2815" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,7992 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8267 c 0,-138 -138,-275 -276,-275 z" id="path2817" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,7992 Z" id="path2819" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,9643 Z" id="path2821" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2829"><tspan class="TextParagraph" font-size="635px" font-weight="400" id=
"tspan2827" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8773" y="9038" id="tspan2825"><tspan id="tspan2823" style="fill:#000000;stroke:none">PKTIO </tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2853"><g id="id6"><rect class="BoundingBox" x="8037" y="10151" width="3561" height="1654" id="rect2834" style="fill:none;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path2836" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 8313,10152 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path2838" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 8038,10152 Z" id="path2840" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 11596,11803 Z" id="path2842" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2850"><tspan class="TextParagraph" font-size="635px" font-weight="4
00" id="tspan2848" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="8818" y="11198" id="tspan2846"><tspan id="tspan2844" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g2874"><g id="id7"><rect class="BoundingBox" x="12610" y="8691" width="4322" height="1654" id="rect2855" style="fill:none;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path2857" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 12886,8692 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8967 c 0,-138 -138,-275 -276,-275 z" id="path2859" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 12611,8692 Z" id="path2861" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 16930,10343 Z" id="path2863" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text2871"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan2869" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="12905" y="9738" id="tspan2867"><tspan id="tspan2865" style="fill:#000000;stroke:none">Classification</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2899"><g id="id8"><rect class="BoundingBox" x="18072" y="7228" width="1909" height="639" id="rect2876" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path2878" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2880" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path2882" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path2884" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2886" inkscape:connector-curvature="0" style=
"fill:none;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path2888" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,7865 Z" id="path2890" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2892" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path2894" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path2896" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2924"><g id="id9"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect2901" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -
477 l 159,-318 z m 0,0 z m 636,636 z" id="path2903" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2905" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path2907" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path2909" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2911" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path2913" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path2915" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2917" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d
="M 19343,8246 Z" id="path2919" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,8882 Z" id="path2921" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2949"><g id="id10"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect2926" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path2928" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2930" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path2932" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899
Z" id="path2934" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2936" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path2938" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path2940" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2942" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path2944" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path2946" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g2974"><g id="id11"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect2951" style="fill:none;stroke
:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path2953" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2955" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path2957" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path2959" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2961" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path2963" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path2965" inkscape
:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path2967" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path2969" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path2971" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g2983"><g id="id12"><rect class="BoundingBox" x="11595" y="7398" width="6479" height="1421" id="rect2976" style="fill:none;stroke:none"/><path d="m 11596,8817 c 1822,0 -1285,-1218 6005,-1268" id="path2978" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,7547 -451,-148 2,300 z" id="path2980" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g2992"><g id="id13"><rect class="BoundingBox" x="16928" y="85
64" width="1146" height="955" id="rect2985" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 474,-567 747,-827" id="path2987" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,8564 -474,4 97,284 z" id="path2989" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3001"><g id="id14"><rect class="BoundingBox" x="16928" y="9418" width="1146" height="302" id="rect2994" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 491,34 710,53" id="path2996" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,9581 -446,-163 -8,300 z" id="path2998" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3010"><g id="id15"><rect class="BoundingBox" x="16928" y="9516" width="1146" height="1208" id="rect3003" style="fill:none;stroke:none"/><path d="m 16929,9517 c 859,0 46
9,738 759,1060" id="path3005" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,10723 -361,-308 -112,278 z" id="path3007" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3019"><g id="id16"><rect class="BoundingBox" x="11595" y="8816" width="1017" height="702" id="rect3012" style="fill:none;stroke:none"/><path d="m 11596,8817 c 762,0 439,365 621,568" id="path3014" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 12611,9517 -372,-294 -102,282 z" id="path3016" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3040"><g id="id17"><rect class="BoundingBox" x="21501" y="8246" width="4322" height="1654" id="rect3021" style="fill:none;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138
,-275 -276,-275 z m -275,0 z m 4319,1651 z" id="path3023" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 21777,8247 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3768 c 138,0 276,-138 276,-276 V 8522 c 0,-138 -138,-275 -276,-275 z" id="path3025" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 21502,8247 Z" id="path3027" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 25821,9898 Z" id="path3029" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3037"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3035" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="22237" y="9293" id="tspan3033"><tspan id="tspan3031" style="fill:#000000;stroke:none">Scheduler</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3049"><g id="id18"><rect class="BoundingBox" x="19978" y="7546" width="6859" height="1257" id="rect3042" style="fill:none;stroke:none"/><path d="m 19979,7547 c 8298,0 5408,934 6428,1108" id="path3044" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 26836,8683 -439,-181 -20,300 z" id="path3046" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3058"><g id="id19"><rect class="BoundingBox" x="19978" y="8563" width="1525" height="617" id="rect3051" style="fill:none;stroke:none"/><path d="m 19979,8564 c 1143,0 584,351 1090,470" id="path3053" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -434,-192 -28,299 z" id="path3055" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3067"><g id="id20"><rect class="Boun
dingBox" x="19978" y="8965" width="1525" height="618" id="rect3060" style="fill:none;stroke:none"/><path d="m 19979,9581 c 1143,0 584,-352 1090,-470" id="path3062" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -462,-107 28,299 z" id="path3064" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3076"><g id="id21"><rect class="BoundingBox" x="19978" y="9047" width="1525" height="1678" id="rect3069" style="fill:none;stroke:none"/><path d="m 19979,10723 c 1143,0 572,-1180 1116,-1545" id="path3071" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 21502,9072 -474,-24 81,289 z" id="path3073" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" id="g3089"><g id="id22"><rect class="BoundingBox" x="17808" y="5933" width="3569" height="1214" id="rect3078" style="fill:none;stroke:none"/
><text class="TextShape" id="text3086"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3084" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="18058" y="6630" id="tspan3082"><tspan id="tspan3080" style="fill:#000000;stroke:none">Queue</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3110"><g id="id23"><rect class="BoundingBox" x="26834" y="7857" width="3561" height="1654" id="rect3091" style="fill:none;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3093" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27110,7858 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8133 c 0,-138 -138,-275 -276,-275 z" id="path3095" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 26835,7858 Z" id="path3097" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30393,9509 Z" id="path3099" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3107"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan3105" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27077" y="8904" id="tspan3103"><tspan id="tspan3101" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3131"><g id="id24"><rect class="BoundingBox" x="27088" y="8237" width="3561" height="1654" id="rect3112" style="fill:none;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3114" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27364,8238 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8513 c 0,-138 -138,-275 -276,-275 z" id="path3116" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27089,8238 Z" id="path3118" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30647,9889 Z" id="path3120" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3128"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan3126" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27331" y="9284" id="tspan3124"><tspan id="tspan3122" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3152"><g id="id25"><rect class="BoundingBox" x="27343" y="8619" width="3561" height="1654" id="rect3133" style="fill:none;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3135" inkscape:connector-curvature="0" style="fill:#ffff00;stroke:none"/><path d="m 27619,8620 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8895 c 0,-138 -138,-275 -276,-275 z" id="path3137" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27344,8620 Z" id="path3139" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30902,10271 Z" id="path3141" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3149"><tspan class="TextParagraph" font-size="635px" font-weight="40
0" id="tspan3147" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="27522" y="9666" id="tspan3145"><tspan id="tspan3143" style="fill:#000000;stroke:none">odp_thread</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3161"><g id="id26"><rect class="BoundingBox" x="25819" y="8914" width="1272" height="302" id="rect3154" style="fill:none;stroke:none"/><path d="m 25820,9072 c 952,0 521,-5 836,-8" id="path3156" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27090,9063 -450,-149 v 300 z" id="path3158" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3170"><g id="id27"><rect class="BoundingBox" x="25819" y="9071" width="1527" height="494" id="rect3163" style="fill:none;stroke:none"/><path d="m 25820,9072 c 1144,0 585,257 1090,345" id="path3165" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27345,9445 -438,-181 -21,299 z" id="path3167" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3195"><g id="id28"><rect class="BoundingBox
" x="18072" y="7228" width="1909" height="639" id="rect3172" style="fill:none;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3174" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3176" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,7229 Z" id="path3178" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,7865 Z" id="path3180" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3182" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,7229 Z" id="path3184" inkscape:connector-curvature="0" styl
e="fill:none;stroke:#3465a4"/><path d="M 19344,7865 Z" id="path3186" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,7229 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3188" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,7229 Z" id="path3190" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,7865 Z" id="path3192" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3220"><g id="id29"><rect class="BoundingBox" x="18072" y="8245" width="1909" height="639" id="rect3197" style="fill:none;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3199" inkscape:connector-curvature="0" style="fill:#729fc
f;stroke:none"/><path d="m 18073,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3201" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,8246 Z" id="path3203" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,8882 Z" id="path3205" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3207" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,8246 Z" id="path3209" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,8882 Z" id="path3211" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,8246 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3213" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,8246 Z" id="path3215" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><pat
h d="M 19979,8882 Z" id="path3217" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3245"><g id="id30"><rect class="BoundingBox" x="18072" y="9262" width="1909" height="639" id="rect3222" style="fill:none;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3224" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3226" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,9263 Z" id="path3228" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,9899 Z" id="path3230" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,9
263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3232" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,9263 Z" id="path3234" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,9899 Z" id="path3236" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,9263 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3238" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,9263 Z" id="path3240" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,9899 Z" id="path3242" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3270"><g id="id31"><rect class="BoundingBox" x="18072" y="10404" width="1909" height="639" id="rect3247" style="fill:none;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-6
36 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3249" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 18073,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3251" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18073,10405 Z" id="path3253" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18709,11041 Z" id="path3255" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 18708,10405 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3257" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 18708,10405 Z" id="path3259" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19344,11041 Z" id="path3261" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 19343,10405 h 477 l 159,318 -159,
318 h -477 l 159,-318 z" id="path3263" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19343,10405 Z" id="path3265" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 19979,11041 Z" id="path3267" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3295"><g id="id32"><rect class="BoundingBox" x="35089" y="7471" width="1909" height="639" id="rect3272" style="fill:none;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3274" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3276" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 3
5090,7472 Z" id="path3278" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,8108 Z" id="path3280" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3282" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,7472 Z" id="path3284" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,8108 Z" id="path3286" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,7472 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3288" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,7472 Z" id="path3290" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,8108 Z" id="path3292" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3320"><g id="
id33"><rect class="BoundingBox" x="35089" y="8787" width="1909" height="639" id="rect3297" style="fill:none;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3299" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3301" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,8788 Z" id="path3303" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,9424 Z" id="path3305" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3307" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,8788 Z" id="path3309" inkscap
e:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,9424 Z" id="path3311" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,8788 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3313" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,8788 Z" id="path3315" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36996,9424 Z" id="path3317" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.PolyPolygonShape" id="g3345"><g id="id34"><rect class="BoundingBox" x="35089" y="9930" width="1909" height="639" id="rect3322" style="fill:none;stroke:none"/><path d="m 35090,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z m -1,-636 h 477 l 159,318 -159,318 h -477 l 159,-318 z m 0,0 z m 636,636 z" id="path3324" inkscape:connector-cu
rvature="0" style="fill:#729fcf;stroke:none"/><path d="m 35090,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3326" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35090,9931 Z" id="path3328" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35726,10567 Z" id="path3330" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 35725,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3332" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 35725,9931 Z" id="path3334" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36361,10567 Z" id="path3336" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="m 36360,9931 h 477 l 159,318 -159,318 h -477 l 159,-318 z" id="path3338" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 36360,9931 Z" id="path3340" inkscape:connector-curvature="0" style=
"fill:none;stroke:#3465a4"/><path d="M 36996,10567 Z" id="path3342" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3354"><g id="id35"><rect class="BoundingBox" x="30901" y="9444" width="4190" height="950" id="rect3347" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1257,720 3726,797" id="path3349" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,10249 -448,-157 -4,300 z" id="path3351" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3363"><g id="id36"><rect class="BoundingBox" x="30901" y="8958" width="4190" height="489" id="rect3356" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1258,-303 3724,-336" id="path3358" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,9106 -451,-147 2,300 z" id="path3360" inkscape:connector-curvature=
"0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3372"><g id="id37"><rect class="BoundingBox" x="30901" y="7653" width="4190" height="1794" id="rect3365" style="fill:none;stroke:none"/><path d="m 30902,9445 c 3141,0 1254,-1485 3732,-1642" id="path3367" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 35090,7790 -454,-136 9,300 z" id="path3369" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3381"><g id="id38"><rect class="BoundingBox" x="17459" y="9444" width="13734" height="2353" id="rect3374" style="fill:none;stroke:none"/><path d="m 30902,9445 c 751,0 502,2350 -6573,2350 -7074,0 -7217,-778 -6677,-1009" id="path3376" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,10723 -468,-76 48,296 z" id="path3378" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.s
un.star.drawing.CustomShape" id="g3402"><g id="id39"><rect class="BoundingBox" x="38898" y="8872" width="4577" height="1654" id="rect3383" style="fill:none;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z m -275,0 z m 4574,1651 z" id="path3385" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 39174,8873 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 4023 c 137,0 275,-138 275,-276 V 9148 c 0,-138 -138,-275 -275,-275 z" id="path3387" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 38899,8873 Z" id="path3389" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 43473,10524 Z" id="path3391" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3399"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3397" style
="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="39511" y="9919" id="tspan3395"><tspan id="tspan3393" style="fill:#000000;stroke:none">Traffic Mngr</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3423"><g id="id40"><rect class="BoundingBox" x="30771" y="12437" width="3561" height="1654" id="rect3404" style="fill:none;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3406" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3408" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,12438 Z" id="path3410" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,14089 Z" id="path3412" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3420"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3418" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31581" y="13484" id="tspan3416"><tspan id="tspan3414" style="fill:#000000;stroke:none">Packet</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3444"><g id="id41"><rect class="BoundingBox" x="27214" y="17390" width="3561" height="1654" id="rect3425" style="fill:none;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3427" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,17391 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3429" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,17391 Z" id="path3431" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,19042 Z" id="path3433" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3441"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3439" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28200" y="18437" id="tspan3437"><tspan id="tspan3435" style="fill:#000000;stroke:none">IPsec</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3465"><g id="id42"><rect class="BoundingBox" x="30771" y="14087" width="3561" height="1654" id="rect3446" style="fill:none;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3448" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3450" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,14088 Z" id="path3452" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,15739 Z" id="path3454" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3462"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3460" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31459" y="15134" id="tspan3458"><tspan id="tspan3456" style="fill:#000000;stroke:none">Shmem</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3486"><g id="id43"><rect class="BoundingBox" x="27214" y="15738" width="3561" height="1654" id="rect3467" style="fill:none;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3469" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3471" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,15739 Z" id="path3473" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,17390 Z" id="path3475" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3483"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3481" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28289" y="16785" id="tspan3479"><tspan id="tspan3477" style="fill:#000000;stroke:none">Sync</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3507"><g id="id44"><rect class="BoundingBox" x="30771" y="15738" width="3561" height="1654" id="rect3488" style="fill:none;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3490" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31047,15739 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3492" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30772,15739 Z" id="path3494" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34330,17390 Z" id="path3496" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3504"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3502" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31552" y="16785" id="tspan3500"><tspan id="tspan3498" style="fill:#000000;stroke:none">Buffers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3516"><g id="id45"><rect class="BoundingBox" x="24597" y="9444" width="6944" height="8898" id="rect3509" style="fill:none;stroke:none"/><path d="m 30902,9445 c 1251,0 834,2604 -2827,2604 -3661,0 -4961,5742 -1281,6145" id="path3511" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 27216,18216 -441,-175 -17,300 z" id="path3513" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3525"><g id="id46"><rect class="BoundingBox" x="36995" y="9105" width="1906" height="716" id="rect3518" style="fill:none;stroke:none"/><path d="m 36996,9106 c 1428,0 678,452 1468,566" id="path3520" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -440,-178 -19,299 z" id="path3522" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3534
"><g id="id47"><rect class="BoundingBox" x="36995" y="9574" width="1906" height="677" id="rect3527" style="fill:none;stroke:none"/><path d="m 36996,10249 c 1428,0 678,-421 1468,-527" id="path3529" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 38900,9698 -458,-123 18,299 z" id="path3531" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3555"><g id="id48"><rect class="BoundingBox" x="45376" y="7811" width="3561" height="1654" id="rect3536" style="fill:none;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3538" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45652,7812 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8087 c 0,-138 -138,-275 -276,-275 z" id="pat
h3540" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45377,7812 Z" id="path3542" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 48935,9463 Z" id="path3544" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3552"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3550" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="45619" y="8858" id="tspan3548"><tspan id="tspan3546" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3576"><g id="id49"><rect class="BoundingBox" x="45631" y="8191" width="3561" height="1654" id="rect3557" style="fill:none;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3559" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 45907,8192 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8467 c 0,-138 -138,-275 -276,-275 z" id="path3561" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45632,8192 Z" id="path3563" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49190,9843 Z" id="path3565" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3573"><tspan class="TextParagraph" font-size="635px" font-weight="400
" id="tspan3571" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="45874" y="9238" id="tspan3569"><tspan id="tspan3567" style="fill:#000000;stroke:none">PKTIO API</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3597"><g id="id50"><rect class="BoundingBox" x="45883" y="8572" width="3561" height="1654" id="rect3578" style="fill:none;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3580" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 46159,8573 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 V 8848 c 0,-138 -138,-275 -276,-275 z" id="path3582" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 45884,8573 Z" id="path3584" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 49442,10224 Z" id="path3586" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3594"><tspan class="TextParagraph" font-size="635px" font-weight="40
0" id="tspan3592" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="46708" y="9619" id="tspan3590"><tspan id="tspan3588" style="fill:#000000;stroke:none">PKTIO</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3606"><g id="id51"><rect class="BoundingBox" x="43472" y="9256" width="2414" height="444" id="rect3599" style="fill:none;stroke:none"/><path d="m 43473,9698 c 1809,0 802,-246 1978,-293" id="path3601" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45885,9398 -453,-142 6,300 z" id="path3603" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3627"><g id="id52"><rect class="BoundingBox" x="27214" y="12437" width="3561" height="1654" id="rect3608" style="fill:none;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3610" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,12438 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,
0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3612" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,12438 Z" id="path3614" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,14089 Z" id="path3616" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3624"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3622" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28037" y="13484" id="tspan3620"><tspan id="tspan3618" style="fill:#000000;stroke:none">Timers</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3648"><g id="id53"><rect class="BoundingBox" x="27214" y="14087" width="3561" height="1654" id="rect3629" style="fill:none;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3631" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 27490,14088 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3633" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 27215,14088 Z" id="path3635" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30773,15739 Z" id="path3637" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3645"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3643" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="28183" y="15134" id="tspan3641"><tspan id="tspan3639" style="fill:#000000;stroke:none">Event</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3657"><g id="id54"><rect class="BoundingBox" x="9223" y="3801" width="37935" height="4013" id="rect3650" style="fill:none;stroke:none"/><path d="M 47156,7812 C 47156,2457 10447,2740 9336,7029" id="path3652" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 9310,7230 210,-425 -297,-41 z" id="path3654" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3666"><g id="id55"><rect class="BoundingBox" x="17708" y="10723" width="17467" height="9710" id="rect3659" style="fill:none;stroke:none"/><path d="m 34412,18264 c 1701,0 1134,2167 -7853,2167 -8987,0 -9083,-7740 -8683,-9398" id="path3661" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 18073,10723 -364,304 255,158 z" id="path3663" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.TextShape" i
d="g3679"><g id="id56"><rect class="BoundingBox" x="21199" y="20231" width="9901" height="1674" id="rect3668" style="fill:none;stroke:none"/><text class="TextShape" id="text3676"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3674" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21449" y="20928" id="tspan3672"><tspan id="tspan3670" style="fill:#000000;stroke:none">Lookaside IPsec Op Completion</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g3692"><g id="id57"><rect class="BoundingBox" x="26705" y="3040" width="5335" height="1017" id="rect3681" style="fill:none;stroke:none"/><text class="TextShape" id="text3689"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3687" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="26955" y="3737" id="tspan3685"><tspan id="tspan3683" style="fill:#000000;stroke:none">Loopback</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.TextShape" id="g3715"><g id="id58"><rect class="BoundingBox" x="21128" y="14616" width="3684" height="2385" id="rect3694" style="fill:none;stroke:none"/><text class="TextShape" id="text3712"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3700" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21378" y="15313" id="tspan3698"><tspan id="tspan3696" style="fill:#000000;stroke:none">IPsec Op</tspan></tspan></tspan><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3710" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="21378" y="16016" id="tspan3704"><tspan id="tspan3702" style="fill:#000000;stroke:none">(Encrypt or </tspan></tspan><tspan class="TextPosition" x="21378" y="16719" id="tspan3708"><tspan id="tspan3706" style="fill:#000000;stroke:none">Decrypt)</tspan></tspan></tsp
an></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3736"><g id="id59"><rect class="BoundingBox" x="4854" y="8465" width="1967" height="1066" id="rect3717" style="fill:none;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z m 0,-265 z m 1964,1063 z" id="path3719" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 4855,8731 h 1473 v -265 l 491,531 -491,532 V 9263 H 4855 Z" id="path3721" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 4855,8466 Z" id="path3723" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 6819,9529 Z" id="path3725" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3733"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3731" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="5274" y="9218" id="tspan3729"><tspa
n id="tspan3727" style="fill:#000000;stroke:none">RX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.ConnectorShape" id="g3745"><g id="id60"><rect class="BoundingBox" x="36995" y="7789" width="8384" height="994" id="rect3738" style="fill:none;stroke:none"/><path d="m 36996,7790 c 8817,0 4991,769 7903,842" id="path3740" inkscape:connector-curvature="0" style="fill:none;stroke:#000000"/><path d="m 45378,8637 -448,-155 -4,300 z" id="path3742" inkscape:connector-curvature="0" style="fill:#000000;stroke:none"/></g></g><g class="com.sun.star.drawing.CustomShape" id="g3766"><g id="id61"><rect class="BoundingBox" x="50054" y="8465" width="1967" height="1066" id="rect3747" style="fill:none;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z m 0,-265 z m 1964,1063 z" id="path3749" inkscape:connector-curvature="0" style="fill:#729fcf;stroke:none"/><path d="m 50055,8731 h 1473 v -265 l 491,531 -491,532 v -266 h -1473 z" id="path3751" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 50055,8466
Z" id="path3753" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 52019,9529 Z" id="path3755" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3763"><tspan class="TextParagraph" font-size="635px" font-weight="400" id="tspan3761" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="50508" y="9218" id="tspan3759"><tspan id="tspan3757" style="fill:#000000;stroke:none">TX</tspan></tspan></tspan></text>
+</g></g><g class="com.sun.star.drawing.CustomShape" id="g3787"><g id="id62"><rect class="BoundingBox" x="30853" y="17438" width="3561" height="1654" id="rect3768" style="fill:none;stroke:none"/><path d="m 31129,17439 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z m -275,0 z m 3558,1651 z" id="path3770" inkscape:connector-curvature="0" style="fill:#b6d7a8;stroke:none"/><path d="m 31129,17439 c -138,0 -275,137 -275,275 v 1100 c 0,138 137,276 275,276 h 3007 c 138,0 276,-138 276,-276 v -1100 c 0,-138 -138,-275 -276,-275 z" id="path3772" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 30854,17439 Z" id="path3774" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><path d="M 34412,19090 Z" id="path3776" inkscape:connector-curvature="0" style="fill:none;stroke:#3465a4"/><text class="TextShape" id="text3784"><tspan class="TextParagraph" font-size="635px" font-weig
ht="400" id="tspan3782" style="font-weight:400;font-size:635px;font-family:'Liberation Sans', sans-serif"><tspan class="TextPosition" x="31699" y="18485" id="tspan3780"><tspan id="tspan3778" style="fill:#000000;stroke:none">Crypto</tspan></tspan></tspan></text>
+</g></g></g></g></g></g></g></svg>
diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am
index 55fe7e92..e6a44d98 100644
--- a/doc/users-guide/Makefile.am
+++ b/doc/users-guide/Makefile.am
@@ -33,6 +33,8 @@ IMAGES = $(IMAGES_DIR)/overview.svg \
$(IMAGES_DIR)/release_git.svg \
$(IMAGES_DIR)/segment.svg \
$(IMAGES_DIR)/simple_release_git.svg \
+ $(IMAGES_DIR)/ipsec-lookaside.svg \
+ $(IMAGES_DIR)/ipsec-inline.svg \
$(IMAGES_DIR)/timeout_fsm.svg \
$(IMAGES_DIR)/timer_fsm.svg \
$(IMAGES_DIR)/tm_hierarchy.svg \
-----------------------------------------------------------------------
Summary of changes:
doc/images/.gitignore | 1 +
doc/images/ipsec-inline.svg | 31 +++
doc/images/ipsec-lookaside.svg | 29 ++
doc/images/ipsec_fsm.gv | 32 +++
doc/users-guide/Makefile.am | 5 +
doc/users-guide/users-guide-ipsec.adoc | 466 +++++++++++++++++++++++++++++++++
doc/users-guide/users-guide.adoc | 2 +
7 files changed, 566 insertions(+)
create mode 100644 doc/images/ipsec-inline.svg
create mode 100644 doc/images/ipsec-lookaside.svg
create mode 100644 doc/images/ipsec_fsm.gv
create mode 100644 doc/users-guide/users-guide-ipsec.adoc
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch 2.0 updated. v1.15.0.0-929-g6cd43041
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, 2.0 has been updated
via 6cd43041e55bd73a02ca202f835e590b3ad5c354 (commit)
from 65419c16086369f86dea068e54ce492526fa4f41 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6cd43041e55bd73a02ca202f835e590b3ad5c354
Author: Kevin Wang <kevin.wang(a)arm.com>
Date: Fri Nov 10 17:12:32 2017 +0800
linux-gen: buffer: remove burst metadata from odp_buffer_hdr_t
The total packet meta data size was 7 cache lines for Linux-generic.
For scalable scheduler, the burst metadata is not required. So just
remove it for scalable scheduler. After the changes, the size of
the meta data is 4 cache lines for Linux-generic.
Signed-off-by: Kevin Wang <kevin.wang(a)arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli(a)arm.com>
Reviewed-by: Brian Brooks <brian.brooks(a)arm.com>
Reviewed-by: Yi He <yi.he(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 3c505495..56ef03c6 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -261,16 +261,9 @@ __LIB__libodp_linux_la_SOURCES = \
odp_pkt_queue.c \
odp_queue_if.c \
queue/subsystem.c \
- queue/generic.c \
- queue/scalable.c \
odp_rwlock.c \
odp_rwlock_recursive.c \
odp_schedule_if.c \
- schedule/generic.c \
- schedule/iquery.c \
- schedule/scalable.c \
- schedule/scalable_ordered.c \
- schedule/sp.c \
schedule/subsystem.c \
odp_shared_memory.c \
odp_sorted_list.c \
@@ -359,19 +352,29 @@ endif
pool/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
buffer/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
if ODP_SCHEDULE_SCALABLE
+__LIB__libodp_linux_la_SOURCES += schedule/scalable.c \
+ schedule/scalable_ordered.c
schedule/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
else
-schedule/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
-endif
if ODP_SCHEDULE_SP
+__LIB__libodp_linux_la_SOURCES += schedule/sp.c
schedule/sp.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
-endif
+else
if ODP_SCHEDULE_IQUERY
+__LIB__libodp_linux_la_SOURCES += schedule/iquery.c
schedule/iquery.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
+else
+__LIB__libodp_linux_la_SOURCES += schedule/generic.c
+schedule/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
+endif
endif
+endif
+
if ODP_SCHEDULE_SCALABLE
+__LIB__libodp_linux_la_SOURCES += queue/scalable.c
queue/scalable.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
else
+__LIB__libodp_linux_la_SOURCES += queue/generic.c
queue/generic.lo: AM_CFLAGS += -DIM_ACTIVE_MODULE
endif
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index 86f6208f..514e2479 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -73,6 +73,7 @@ struct odp_buffer_hdr_t {
/* Segments */
seg_entry_t seg[CONFIG_PACKET_SEGS_PER_HDR];
+#ifndef ODP_SCHEDULE_SCALABLE
/* Burst counts */
uint8_t burst_num;
uint8_t burst_first;
@@ -82,7 +83,7 @@ struct odp_buffer_hdr_t {
/* Burst table */
struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE];
-
+#endif
/* --- Mostly read only data --- */
/* User context pointer or u64 */
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/Makefile.am | 23 ++++++++++++----------
.../linux-generic/include/odp_buffer_internal.h | 3 ++-
2 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-566-ga908a4de
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via a908a4dead95321e84d6a8a23de060051dcd8969 (commit)
via 157234c02e26c66581b9a661ab3bbb62439c906d (commit)
via ab19e58de943b3324e96a2ef92e4aa533b1be165 (commit)
from 9ff682c8d0315f3f1921d5b9fe13d62897c78710 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a908a4dead95321e84d6a8a23de060051dcd8969
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 2 19:45:10 2017 +0300
linux-gen: crypto: add AES-CTR support
Add implementation for AES-CTR cryptographic mode.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 9ebbe552..f34863bf 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -47,6 +47,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_cbc[] = {
{.key_len = 24, .iv_len = 16},
{.key_len = 32, .iv_len = 16} };
+static const odp_crypto_cipher_capability_t cipher_capa_aes_ctr[] = {
+{.key_len = 16, .iv_len = 16},
+{.key_len = 24, .iv_len = 16},
+{.key_len = 32, .iv_len = 16} };
+
static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = {
{.key_len = 16, .iv_len = 12},
{.key_len = 24, .iv_len = 12},
@@ -587,6 +592,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
capa->ciphers.bit.null = 1;
capa->ciphers.bit.trides_cbc = 1;
capa->ciphers.bit.aes_cbc = 1;
+ capa->ciphers.bit.aes_ctr = 1;
capa->ciphers.bit.aes_gcm = 1;
capa->auths.bit.null = 1;
@@ -630,6 +636,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
src = cipher_capa_aes_cbc;
num = sizeof(cipher_capa_aes_cbc) / size;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ src = cipher_capa_aes_ctr;
+ num = sizeof(cipher_capa_aes_ctr) / size;
+ break;
case ODP_CIPHER_ALG_AES_GCM:
src = cipher_capa_aes_gcm;
num = sizeof(cipher_capa_aes_gcm) / size;
@@ -753,6 +763,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
else
rc = -1;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ if (param->cipher_key.length == 16)
+ rc = process_cipher_param(session, EVP_aes_128_ctr());
+ else if (param->cipher_key.length == 24)
+ rc = process_cipher_param(session, EVP_aes_192_ctr());
+ else if (param->cipher_key.length == 32)
+ rc = process_cipher_param(session, EVP_aes_256_ctr());
+ else
+ rc = -1;
+ break;
#if ODP_DEPRECATED_API
case ODP_CIPHER_ALG_AES128_GCM:
/* AES-GCM requires to do both auth and
commit 157234c02e26c66581b9a661ab3bbb62439c906d
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 2 19:44:09 2017 +0300
validation: crypto: add tests for AES-CTR
Add AES-CTR test vectors from NIST SP800-38A.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h
index 71f862ec..ba1058f3 100644
--- a/test/validation/api/crypto/crypto.h
+++ b/test/validation/api/crypto/crypto.h
@@ -20,6 +20,10 @@ void crypto_test_enc_alg_aes_cbc(void);
void crypto_test_enc_alg_aes_cbc_ovr_iv(void);
void crypto_test_dec_alg_aes_cbc(void);
void crypto_test_dec_alg_aes_cbc_ovr_iv(void);
+void crypto_test_enc_alg_aes_ctr(void);
+void crypto_test_enc_alg_aes_ctr_ovr_iv(void);
+void crypto_test_dec_alg_aes_ctr(void);
+void crypto_test_dec_alg_aes_ctr_ovr_iv(void);
void crypto_test_enc_alg_aes_gcm(void);
void crypto_test_enc_alg_aes_gcm_ovr_iv(void);
void crypto_test_dec_alg_aes_gcm(void);
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index f0578037..1f7523de 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -325,6 +325,9 @@ static void alg_test(odp_crypto_op_t op,
if (cipher_alg == ODP_CIPHER_ALG_AES_CBC &&
!(capa.ciphers.bit.aes_cbc))
rc = -1;
+ if (cipher_alg == ODP_CIPHER_ALG_AES_CTR &&
+ !(capa.ciphers.bit.aes_ctr))
+ rc = -1;
if (cipher_alg == ODP_CIPHER_ALG_AES_GCM &&
!(capa.ciphers.bit.aes_gcm))
rc = -1;
@@ -546,6 +549,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth)
if (!capability.ciphers.bit.aes_cbc)
return ODP_TEST_INACTIVE;
break;
+ case ODP_CIPHER_ALG_AES_CTR:
+ if (!capability.ciphers.bit.aes_ctr)
+ return ODP_TEST_INACTIVE;
+ break;
case ODP_CIPHER_ALG_AES_GCM:
if (!capability.ciphers.bit.aes_gcm)
return ODP_TEST_INACTIVE;
@@ -865,6 +872,88 @@ void crypto_test_dec_alg_aes_cbc_ovr_iv(void)
}
}
+static int check_alg_aes_ctr(void)
+{
+ return check_alg_support(ODP_CIPHER_ALG_AES_CTR, ODP_AUTH_ALG_NULL);
+}
+
+/* This test verifies the correctness of encode (plaintext -> ciphertext)
+ * operation for AES128_CTR algorithm. IV for the operation is the session IV.
+ * In addition the test verifies if the implementation can use the
+ * packet buffer as completion event buffer.*/
+void crypto_test_enc_alg_aes_ctr(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_ctr_reference) /
+ sizeof(aes_ctr_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ alg_test(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_AES_CTR,
+ ODP_AUTH_ALG_NULL,
+ &aes_ctr_reference[i],
+ false);
+ }
+}
+
+/* This test verifies the correctness of encode (plaintext -> ciphertext)
+ * operation for AES128_CTR algorithm. IV for the operation is the operation IV.
+ * */
+void crypto_test_enc_alg_aes_ctr_ovr_iv(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_ctr_reference) /
+ sizeof(aes_ctr_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ alg_test(ODP_CRYPTO_OP_ENCODE,
+ ODP_CIPHER_ALG_AES_CTR,
+ ODP_AUTH_ALG_NULL,
+ &aes_ctr_reference[i],
+ true);
+ }
+}
+
+/* This test verifies the correctness of decode (ciphertext -> plaintext)
+ * operation for AES128_CTR algorithm. IV for the operation is the session IV
+ * In addition the test verifies if the implementation can use the
+ * packet buffer as completion event buffer.
+ * */
+void crypto_test_dec_alg_aes_ctr(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_ctr_reference) /
+ sizeof(aes_ctr_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_AES_CTR,
+ ODP_AUTH_ALG_NULL,
+ &aes_ctr_reference[i],
+ false);
+ }
+}
+
+/* This test verifies the correctness of decode (ciphertext -> plaintext)
+ * operation for AES128_CTR algorithm. IV for the operation is the session IV
+ * In addition the test verifies if the implementation can use the
+ * packet buffer as completion event buffer.
+ * */
+void crypto_test_dec_alg_aes_ctr_ovr_iv(void)
+{
+ unsigned int test_vec_num = (sizeof(aes_ctr_reference) /
+ sizeof(aes_ctr_reference[0]));
+ unsigned int i;
+
+ for (i = 0; i < test_vec_num; i++) {
+ alg_test(ODP_CRYPTO_OP_DECODE,
+ ODP_CIPHER_ALG_AES_CTR,
+ ODP_AUTH_ALG_NULL,
+ &aes_ctr_reference[i],
+ true);
+ }
+}
+
static int check_alg_hmac_md5(void)
{
return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC);
@@ -1098,6 +1187,14 @@ odp_testinfo_t crypto_suite[] = {
check_alg_aes_cbc),
ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc_ovr_iv,
check_alg_aes_cbc),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr,
+ check_alg_aes_ctr),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr,
+ check_alg_aes_ctr),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr_ovr_iv,
+ check_alg_aes_ctr),
+ ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv,
+ check_alg_aes_ctr),
ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm,
check_alg_aes_gcm),
ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm_ovr_iv,
diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h
index 652968be..63103227 100644
--- a/test/validation/api/crypto/test_vectors.h
+++ b/test/validation/api/crypto/test_vectors.h
@@ -184,6 +184,87 @@ static crypto_test_reference_t aes_cbc_reference[] = {
}
};
+static crypto_test_reference_t aes_ctr_reference[] = {
+ {
+ .cipher_key_length = AES128_CTR_KEY_LEN,
+ .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
+ 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c},
+ .iv_length = AES_CTR_IV_LEN,
+ .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff },
+ .length = 64,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+ 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
+ 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+ 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11,
+ 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
+ 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17,
+ 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 },
+ .ciphertext = { 0x87, 0x4d, 0x61, 0x91, 0xb6, 0x20, 0xe3, 0x26,
+ 0x1b, 0xef, 0x68, 0x64, 0x99, 0x0d, 0xb6, 0xce,
+ 0x98, 0x06, 0xf6, 0x6b, 0x79, 0x70, 0xfd, 0xff,
+ 0x86, 0x17, 0x18, 0x7b, 0xb9, 0xff, 0xfd, 0xff,
+ 0x5a, 0xe4, 0xdf, 0x3e, 0xdb, 0xd5, 0xd3, 0x5e,
+ 0x5b, 0x4f, 0x09, 0x02, 0x0d, 0xb0, 0x3e, 0xab,
+ 0x1e, 0x03, 0x1d, 0xda, 0x2f, 0xbe, 0x03, 0xd1,
+ 0x79, 0x21, 0x70, 0xa0, 0xf3, 0x00, 0x9c, 0xee }
+ },
+ {
+ .cipher_key_length = AES192_CTR_KEY_LEN,
+ .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52,
+ 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5,
+ 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b},
+ .iv_length = AES_CTR_IV_LEN,
+ .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff },
+ .length = 64,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+ 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
+ 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+ 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11,
+ 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
+ 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17,
+ 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 },
+ .ciphertext = { 0x1a, 0xbc, 0x93, 0x24, 0x17, 0x52, 0x1c, 0xa2,
+ 0x4f, 0x2b, 0x04, 0x59, 0xfe, 0x7e, 0x6e, 0x0b,
+ 0x09, 0x03, 0x39, 0xec, 0x0a, 0xa6, 0xfa, 0xef,
+ 0xd5, 0xcc, 0xc2, 0xc6, 0xf4, 0xce, 0x8e, 0x94,
+ 0x1e, 0x36, 0xb2, 0x6b, 0xd1, 0xeb, 0xc6, 0x70,
+ 0xd1, 0xbd, 0x1d, 0x66, 0x56, 0x20, 0xab, 0xf7,
+ 0x4f, 0x78, 0xa7, 0xf6, 0xd2, 0x98, 0x09, 0x58,
+ 0x5a, 0x97, 0xda, 0xec, 0x58, 0xc6, 0xb0, 0x50 }
+ },
+ {
+ .cipher_key_length = AES256_CTR_KEY_LEN,
+ .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe,
+ 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81,
+ 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7,
+ 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4},
+ .iv_length = AES_CTR_IV_LEN,
+ .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff },
+ .length = 64,
+ .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+ 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+ 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
+ 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+ 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11,
+ 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
+ 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17,
+ 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 },
+ .ciphertext = { 0x60, 0x1e, 0xc3, 0x13, 0x77, 0x57, 0x89, 0xa5,
+ 0xb7, 0xa7, 0xf5, 0x04, 0xbb, 0xf3, 0xd2, 0x28,
+ 0xf4, 0x43, 0xe3, 0xca, 0x4d, 0x62, 0xb5, 0x9a,
+ 0xca, 0x84, 0xe9, 0x90, 0xca, 0xca, 0xf5, 0xc5,
+ 0x2b, 0x09, 0x30, 0xda, 0xa2, 0x3d, 0xe9, 0x4c,
+ 0xe8, 0x70, 0x17, 0xba, 0x2d, 0x84, 0x98, 0x8d,
+ 0xdf, 0xc9, 0xc5, 0x8d, 0xb6, 0x7a, 0xad, 0xa6,
+ 0x13, 0xc2, 0xdd, 0x08, 0x45, 0x79, 0x41, 0xa6 }
+ },
+};
+
/* AES-GCM test vectors extracted from
* https://tools.ietf.org/html/draft-mcgrew-gcm-test-01#section-2
*/
diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h
index b1ce719e..0062299e 100644
--- a/test/validation/api/crypto/test_vectors_len.h
+++ b/test/validation/api/crypto/test_vectors_len.h
@@ -29,6 +29,18 @@
/* AES256-CBC */
#define AES256_CBC_KEY_LEN 32
+/* AES-CBC common */
+#define AES_CTR_IV_LEN 16
+
+/* AES128-CTR */
+#define AES128_CTR_KEY_LEN 16
+
+/* AES192-CTR */
+#define AES192_CTR_KEY_LEN 24
+
+/* AES256-CTR */
+#define AES256_CTR_KEY_LEN 32
+
/* AES-GCM common */
#define AES_GCM_IV_LEN 12
#define AES_GCM_DIGEST_LEN 16
commit ab19e58de943b3324e96a2ef92e4aa533b1be165
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Thu Nov 2 19:43:32 2017 +0300
api: crypto: add AES-CTR declarations
Add declarations for AES-CTR cryptographic mode support.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h
index 7dcb7126..ed1fd678 100644
--- a/include/odp/api/spec/crypto.h
+++ b/include/odp/api/spec/crypto.h
@@ -80,6 +80,9 @@ typedef enum {
/** AES with cipher block chaining */
ODP_CIPHER_ALG_AES_CBC,
+ /** AES with counter mode */
+ ODP_CIPHER_ALG_AES_CTR,
+
/** AES in Galois/Counter Mode
*
* @note Must be paired with cipher ODP_AUTH_ALG_AES_GCM
@@ -90,7 +93,7 @@ typedef enum {
ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC),
/** @deprecated Use ODP_CIPHER_ALG_AES_GCM instead */
- ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_GCM)
+ ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_GCM),
} odp_cipher_alg_t;
@@ -160,6 +163,9 @@ typedef union odp_crypto_cipher_algos_t {
/** ODP_CIPHER_ALG_AES_CBC */
uint32_t aes_cbc : 1;
+ /** ODP_CIPHER_ALG_AES_CTR */
+ uint32_t aes_ctr : 1;
+
/** ODP_CIPHER_ALG_AES_GCM */
uint32_t aes_gcm : 1;
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/crypto.h | 8 +-
platform/linux-generic/odp_crypto.c | 20 +++++
test/validation/api/crypto/crypto.h | 4 +
test/validation/api/crypto/odp_crypto_test_inp.c | 97 ++++++++++++++++++++++++
test/validation/api/crypto/test_vectors.h | 81 ++++++++++++++++++++
test/validation/api/crypto/test_vectors_len.h | 12 +++
6 files changed, 221 insertions(+), 1 deletion(-)
hooks/post-receive
--
8 years, 2 months
- 1
- 0
[COMMIT] branch devel/native-drivers created. v1.15.0.0-822-gc0f99c44
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, devel/native-drivers has been created
at c0f99c441feadd1566b7e92789b11c30c6ee3f64 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
8 years, 3 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0-2-gfc020907
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via fc020907bee7ec2ba976bc02399f6fd47f110d65 (commit)
via f4d6c91588b414fcb70abcc83941e8e4c1cd2f5e (commit)
from 2cfe11680ecc2186339183e94f291ce586740f8b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fc020907bee7ec2ba976bc02399f6fd47f110d65
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:45:46 2017 +0300
linux-gen: crypto: drop DES-CBC support
DES-CBC (not 3DES-CBC) support is invalid (DES should use 8 bytes key,
not 24 bytes), it is not covered by testsuite and DES is
cracable/deprecated/etc since long ago. Stop providing single-key DES
support. In case one really needs it, it can be emulated through
supplying same key triple times to 3DES-CBC.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 9cf903d0..4c708931 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -25,7 +25,6 @@
#include <string.h>
#include <stdlib.h>
-#include <openssl/des.h>
#include <openssl/rand.h>
#include <openssl/hmac.h>
#include <openssl/evp.h>
@@ -40,9 +39,6 @@
static const odp_crypto_cipher_capability_t cipher_capa_null[] = {
{.key_len = 0, .iv_len = 0} };
-static const odp_crypto_cipher_capability_t cipher_capa_des[] = {
-{.key_len = 24, .iv_len = 8} };
-
static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = {
{.key_len = 24, .iv_len = 8} };
@@ -582,7 +578,6 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
memset(capa, 0, sizeof(odp_crypto_capability_t));
capa->ciphers.bit.null = 1;
- capa->ciphers.bit.des = 1;
capa->ciphers.bit.trides_cbc = 1;
capa->ciphers.bit.aes_cbc = 1;
capa->ciphers.bit.aes_gcm = 1;
@@ -620,10 +615,6 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
src = cipher_capa_null;
num = sizeof(cipher_capa_null) / size;
break;
- case ODP_CIPHER_ALG_DES:
- src = cipher_capa_des;
- num = sizeof(cipher_capa_des) / size;
- break;
case ODP_CIPHER_ALG_3DES_CBC:
src = cipher_capa_trides_cbc;
num = sizeof(cipher_capa_trides_cbc) / size;
@@ -737,7 +728,6 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
session->cipher.func = null_crypto_routine;
rc = 0;
break;
- case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
rc = process_cipher_param(session, EVP_des_ede3_cbc());
break;
commit f4d6c91588b414fcb70abcc83941e8e4c1cd2f5e
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Nov 10 16:31:47 2017 +0300
doxygen: remove drv types
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/Doxyfile_common b/doc/Doxyfile_common
index 0471dcf3..779442d0 100644
--- a/doc/Doxyfile_common
+++ b/doc/Doxyfile_common
@@ -33,12 +33,9 @@ DOT_IMAGE_FORMAT = svg
PREDEFINED = __GNUC__ \
__attribute__(x)= \
ODP_ALIGNED(x)= \
- ODPDRV_ALIGNED(x)= \
__BIG_ENDIAN_BITFIELD \
__LITTLE_ENDIAN_BITFIELD \
__x86_64__ \
ODP_PACKED \
- ODPDRV_PACKED \
ODP_DEPRECATE(x)=x \
- "ODP_HANDLE_T(type)=odp_handle_t type" \
- "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type"
+ "ODP_HANDLE_T(type)=odp_handle_t type"
-----------------------------------------------------------------------
Summary of changes:
doc/Doxyfile_common | 5 +----
platform/linux-generic/odp_crypto.c | 10 ----------
2 files changed, 1 insertion(+), 14 deletions(-)
hooks/post-receive
--
8 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-563-g9ff682c8
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via 9ff682c8d0315f3f1921d5b9fe13d62897c78710 (commit)
via 1ae234f54c17374997a89e5858f9e0d7855f8cf0 (commit)
via 58bc37399f6bdb2426bf2eb6ba4eee6791a9c8a4 (commit)
via 9b3a29ddb261d2b030a7806933787aaaee497aab (commit)
via a57dc0bce7aab4600548096dd358e88ca2f4fe1c (commit)
from a1312ccf383637b5711c0f8c4bab6f43e63325dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9ff682c8d0315f3f1921d5b9fe13d62897c78710
Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Date: Wed Nov 8 20:45:46 2017 +0300
linux-gen: crypto: drop DES-CBC support
DES-CBC (not 3DES-CBC) support is invalid (DES should use 8 bytes key,
not 24 bytes), it is not covered by testsuite and DES is
cracable/deprecated/etc since long ago. Stop providing single-key DES
support. In case one really needs it, it can be emulated through
supplying same key triple times to 3DES-CBC.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 47816279..9ebbe552 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -25,7 +25,6 @@
#include <string.h>
#include <stdlib.h>
-#include <openssl/des.h>
#include <openssl/rand.h>
#include <openssl/hmac.h>
#include <openssl/evp.h>
@@ -40,9 +39,6 @@
static const odp_crypto_cipher_capability_t cipher_capa_null[] = {
{.key_len = 0, .iv_len = 0} };
-static const odp_crypto_cipher_capability_t cipher_capa_des[] = {
-{.key_len = 24, .iv_len = 8} };
-
static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = {
{.key_len = 24, .iv_len = 8} };
@@ -589,7 +585,6 @@ int odp_crypto_capability(odp_crypto_capability_t *capa)
memset(capa, 0, sizeof(odp_crypto_capability_t));
capa->ciphers.bit.null = 1;
- capa->ciphers.bit.des = 1;
capa->ciphers.bit.trides_cbc = 1;
capa->ciphers.bit.aes_cbc = 1;
capa->ciphers.bit.aes_gcm = 1;
@@ -627,10 +622,6 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher,
src = cipher_capa_null;
num = sizeof(cipher_capa_null) / size;
break;
- case ODP_CIPHER_ALG_DES:
- src = cipher_capa_des;
- num = sizeof(cipher_capa_des) / size;
- break;
case ODP_CIPHER_ALG_3DES_CBC:
src = cipher_capa_trides_cbc;
num = sizeof(cipher_capa_trides_cbc) / size;
@@ -741,7 +732,6 @@ odp_crypto_session_create(odp_crypto_session_param_t *param,
session->cipher.func = null_crypto_routine;
rc = 0;
break;
- case ODP_CIPHER_ALG_DES:
case ODP_CIPHER_ALG_3DES_CBC:
rc = process_cipher_param(session, EVP_des_ede3_cbc());
break;
commit 1ae234f54c17374997a89e5858f9e0d7855f8cf0
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Thu Nov 2 12:25:14 2017 +0200
example: generator: use L3/L4 checksum validation status functions
Update odp_generator example application to use L3/L4 checksum
validation status functions.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 771bd1a2..912fe7e9 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -784,15 +784,13 @@ static void print_pkts(int thr, odp_packet_t pkt_tbl[], unsigned len)
static int gen_recv_thread(void *arg)
{
int thr;
- thread_args_t *thr_args;
odp_packet_t pkts[MAX_RX_BURST], pkt;
odp_event_t events[MAX_RX_BURST];
int pkt_cnt, ev_cnt, i;
- interface_t *itfs, *itf;
+ odp_packet_chksum_status_t csum_status;
+ (void)arg;
thr = odp_thread_id();
- thr_args = (thread_args_t *)arg;
- itfs = thr_args->rx.ifs;
printf(" [%02i] created mode: RECEIVE\n", thr);
odp_barrier_wait(&barrier);
@@ -811,21 +809,14 @@ static int gen_recv_thread(void *arg)
continue;
for (i = 0, pkt_cnt = 0; i < ev_cnt; i++) {
pkt = odp_packet_from_event(events[i]);
- itf = &itfs[odp_pktio_index(odp_packet_input(pkt))];
- if (odp_packet_has_ipv4(pkt)) {
- if (itf->config.pktin.bit.ipv4_chksum) {
- if (odp_packet_has_l3_error(pkt))
- printf("HW detected L3 error\n");
- }
- }
+ csum_status = odp_packet_l3_chksum_status(pkt);
+ if (csum_status == ODP_PACKET_CHKSUM_BAD)
+ printf("L3 checksum error detected.\n");
- if (odp_packet_has_udp(pkt)) {
- if (itf->config.pktin.bit.udp_chksum) {
- if (odp_packet_has_l4_error(pkt))
- printf("HW detected L4 error\n");
- }
- }
+ csum_status = odp_packet_l4_chksum_status(pkt);
+ if (csum_status == ODP_PACKET_CHKSUM_BAD)
+ printf("L4 checksum error detected.\n");
/* Drop packets with errors */
if (odp_unlikely(odp_packet_has_error(pkt))) {
commit 58bc37399f6bdb2426bf2eb6ba4eee6791a9c8a4
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Thu Nov 2 11:49:53 2017 +0200
linux-gen: pktio: dpdk: set L3/L4 checksum validation flags
L3/L4 checksum validation flags are used to report L3/L4
checksum check status for the incoming packets.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 9782d60c..764ed37d 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -337,9 +337,9 @@ static struct rte_mempool_ops ops_stack = {
MEMPOOL_REGISTER_OPS(ops_stack);
-#define HAS_IP4_CSUM_FLAG(m, f) ((m->ol_flags & PKT_RX_IP_CKSUM_MASK) == f)
+#define IP4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_IP_CKSUM_MASK)
+#define L4_CSUM_RESULT(m) (m->ol_flags & PKT_RX_L4_CKSUM_MASK)
#define HAS_L4_PROTO(m, proto) ((m->packet_type & RTE_PTYPE_L4_MASK) == proto)
-#define HAS_L4_CSUM_FLAG(m, f) ((m->ol_flags & PKT_RX_L4_CKSUM_MASK) == f)
#define PKTIN_CSUM_BITS 0x1C
@@ -347,29 +347,52 @@ static inline int pkt_set_ol_rx(odp_pktin_config_opt_t *pktin_cfg,
odp_packet_hdr_t *pkt_hdr,
struct rte_mbuf *mbuf)
{
+ uint64_t packet_csum_result;
+
if (pktin_cfg->bit.ipv4_chksum &&
- RTE_ETH_IS_IPV4_HDR(mbuf->packet_type) &&
- HAS_IP4_CSUM_FLAG(mbuf, PKT_RX_IP_CKSUM_BAD)) {
- if (pktin_cfg->bit.drop_ipv4_err)
- return -1;
+ RTE_ETH_IS_IPV4_HDR(mbuf->packet_type)) {
+ packet_csum_result = IP4_CSUM_RESULT(mbuf);
+
+ if (packet_csum_result == PKT_RX_IP_CKSUM_GOOD) {
+ pkt_hdr->p.input_flags.l3_chksum_done = 1;
+ } else if (packet_csum_result != PKT_RX_IP_CKSUM_UNKNOWN) {
+ if (pktin_cfg->bit.drop_ipv4_err)
+ return -1;
- pkt_hdr->p.error_flags.ip_err = 1;
+ pkt_hdr->p.input_flags.l3_chksum_done = 1;
+ pkt_hdr->p.error_flags.ip_err = 1;
+ pkt_hdr->p.error_flags.l3_chksum = 1;
+ }
}
if (pktin_cfg->bit.udp_chksum &&
- HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_UDP) &&
- HAS_L4_CSUM_FLAG(mbuf, PKT_RX_L4_CKSUM_BAD)) {
- if (pktin_cfg->bit.drop_udp_err)
- return -1;
+ HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_UDP)) {
+ packet_csum_result = L4_CSUM_RESULT(mbuf);
- pkt_hdr->p.error_flags.udp_err = 1;
+ if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) {
+ pkt_hdr->p.input_flags.l4_chksum_done = 1;
+ } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) {
+ if (pktin_cfg->bit.drop_udp_err)
+ return -1;
+
+ pkt_hdr->p.input_flags.l4_chksum_done = 1;
+ pkt_hdr->p.error_flags.udp_err = 1;
+ pkt_hdr->p.error_flags.l4_chksum = 1;
+ }
} else if (pktin_cfg->bit.tcp_chksum &&
- HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_TCP) &&
- HAS_L4_CSUM_FLAG(mbuf, PKT_RX_L4_CKSUM_BAD)) {
- if (pktin_cfg->bit.drop_tcp_err)
- return -1;
+ HAS_L4_PROTO(mbuf, RTE_PTYPE_L4_TCP)) {
+ packet_csum_result = L4_CSUM_RESULT(mbuf);
- pkt_hdr->p.error_flags.tcp_err = 1;
+ if (packet_csum_result == PKT_RX_L4_CKSUM_GOOD) {
+ pkt_hdr->p.input_flags.l4_chksum_done = 1;
+ } else if (packet_csum_result != PKT_RX_L4_CKSUM_UNKNOWN) {
+ if (pktin_cfg->bit.drop_tcp_err)
+ return -1;
+
+ pkt_hdr->p.input_flags.l4_chksum_done = 1;
+ pkt_hdr->p.error_flags.tcp_err = 1;
+ pkt_hdr->p.error_flags.l4_chksum = 1;
+ }
}
return 0;
commit 9b3a29ddb261d2b030a7806933787aaaee497aab
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Thu Nov 2 10:23:52 2017 +0200
linux-gen: packet: implement checksum validation status functions
Checksum validation status functions return the status of the latest
checksum check done for the packet based on packet input flags and
packet error flags.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 74e3ff2b..61162932 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -1292,6 +1292,32 @@ uint16_t odp_packet_ones_comp(odp_packet_t pkt, odp_packet_data_range_t *range)
return 0;
}
+odp_packet_chksum_status_t odp_packet_l3_chksum_status(odp_packet_t pkt)
+{
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ if (!pkt_hdr->p.input_flags.l3_chksum_done)
+ return ODP_PACKET_CHKSUM_UNKNOWN;
+
+ if (pkt_hdr->p.error_flags.l3_chksum)
+ return ODP_PACKET_CHKSUM_BAD;
+
+ return ODP_PACKET_CHKSUM_OK;
+}
+
+odp_packet_chksum_status_t odp_packet_l4_chksum_status(odp_packet_t pkt)
+{
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+
+ if (!pkt_hdr->p.input_flags.l4_chksum_done)
+ return ODP_PACKET_CHKSUM_UNKNOWN;
+
+ if (pkt_hdr->p.error_flags.l4_chksum)
+ return ODP_PACKET_CHKSUM_BAD;
+
+ return ODP_PACKET_CHKSUM_OK;
+}
+
void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
commit a57dc0bce7aab4600548096dd358e88ca2f4fe1c
Author: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Date: Thu Nov 2 10:02:31 2017 +0200
linux-gen: packet: add L3/L4 checksum validation flags
Add L3/L4 checksum validation flags to signal if operation was performed
by the platform and its result.
Signed-off-by: Bogdan Pricope <bogdan.pricope(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h
index 68c66312..050f69dc 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_types.h
@@ -150,6 +150,9 @@ typedef union {
uint64_t color:2; /**< Packet color for traffic mgmt */
uint64_t nodrop:1; /**< Drop eligibility status */
+
+ uint64_t l3_chksum_done:1; /**< L3 checksum validation done */
+ uint64_t l4_chksum_done:1; /**< L4 checksum validation done */
};
} _odp_packet_input_flags_t;
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 97efcec4..fc10d61c 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -51,8 +51,10 @@ typedef union {
uint32_t snap_len:1; /**< Snap length error */
uint32_t l2_chksum:1; /**< L2 checksum error, checks TBD */
uint32_t ip_err:1; /**< IP error, checks TBD */
+ uint32_t l3_chksum:1; /**< L3 checksum error */
uint32_t tcp_err:1; /**< TCP error, checks TBD */
uint32_t udp_err:1; /**< UDP error, checks TBD */
+ uint32_t l4_chksum:1; /**< L4 checksum error */
};
} error_flags_t;
-----------------------------------------------------------------------
Summary of changes:
example/generator/odp_generator.c | 25 +++-------
.../include/odp/api/plat/packet_types.h | 3 ++
.../linux-generic/include/odp_packet_internal.h | 2 +
platform/linux-generic/odp_crypto.c | 10 ----
platform/linux-generic/odp_packet.c | 26 ++++++++++
platform/linux-generic/pktio/dpdk.c | 57 +++++++++++++++-------
6 files changed, 79 insertions(+), 44 deletions(-)
hooks/post-receive
--
8 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-558-ga1312ccf
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via a1312ccf383637b5711c0f8c4bab6f43e63325dc (commit)
via 4da1cb6040dece2ece108cd383ab4212e7f7fe85 (commit)
via f6d3bc302664e2c4121e798e86758d93fdb156f5 (commit)
via 6333b39f1bd5ebe184780260566b84340104efeb (commit)
via 78ced32df325dac7ff58ff28684fdb941f5ec1b3 (commit)
via fbb6a7feba146acb1495fbdcd93e1b691a7363a0 (commit)
via 23b6eee83bc5717f4797441bddbb035e3388ff10 (commit)
via 0ec5bc6b5c3a178d7b316bdf9e18db452ba5ed58 (commit)
via 9c389e1785fd000203eb2198f9fc2778be8f83e6 (commit)
from 3d254a24a1a911aad72f0535412644824872307f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a1312ccf383637b5711c0f8c4bab6f43e63325dc
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Oct 20 11:08:52 2017 +0300
validation: packet: add call to ones complement
Call ones complement function. Actual validation of
correctness of the sum is to be done, when an implementation
exist which sets the sum on packet input.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index f96347b5..ce4d66c0 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -504,6 +504,7 @@ void packet_test_basic_metadata(void)
{
odp_packet_t pkt = test_packet;
odp_time_t ts;
+ odp_packet_data_range_t range;
CU_ASSERT_PTR_NOT_NULL(odp_packet_head(pkt));
CU_ASSERT_PTR_NOT_NULL(odp_packet_data(pkt));
@@ -513,6 +514,11 @@ void packet_test_basic_metadata(void)
CU_ASSERT(odp_packet_input(pkt) == ODP_PKTIO_INVALID);
CU_ASSERT(odp_packet_input_index(pkt) < 0);
+ /* Packet was not received from a packet IO, shouldn't have ones
+ * complement calculated. */
+ odp_packet_ones_comp(pkt, &range);
+ CU_ASSERT(range.length == 0);
+
odp_packet_flow_hash_set(pkt, UINT32_MAX);
CU_ASSERT(odp_packet_has_flow_hash(pkt));
CU_ASSERT(odp_packet_flow_hash(pkt) == UINT32_MAX);
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 72070735..004379cd 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -48,6 +48,9 @@ static int num_ifaces;
interface that just become up.*/
static bool wait_for_network;
+/* Dummy global variable to avoid compiler optimizing out API calls */
+static volatile uint64_t test_pktio_dummy_u64;
+
/** local container for pktio attributes */
typedef struct {
const char *name;
@@ -661,10 +664,24 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b,
CU_ASSERT(num_rx == num_pkts);
for (i = 0; i < num_rx; ++i) {
- CU_ASSERT_FATAL(rx_pkt[i] != ODP_PACKET_INVALID);
- CU_ASSERT(odp_packet_input(rx_pkt[i]) == pktio_b->id);
- CU_ASSERT(odp_packet_has_error(rx_pkt[i]) == 0);
- odp_packet_free(rx_pkt[i]);
+ odp_packet_data_range_t range;
+ uint16_t sum;
+ odp_packet_t pkt = rx_pkt[i];
+
+ CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID);
+ CU_ASSERT(odp_packet_input(pkt) == pktio_b->id);
+ CU_ASSERT(odp_packet_has_error(pkt) == 0);
+
+ /* Dummy read to ones complement in case pktio has set it */
+ sum = odp_packet_ones_comp(pkt, &range);
+ if (range.length > 0)
+ test_pktio_dummy_u64 += sum;
+
+ /* Dummy read to flow hash in case pktio has set it */
+ if (odp_packet_has_flow_hash(pkt))
+ test_pktio_dummy_u64 += odp_packet_flow_hash(pkt);
+
+ odp_packet_free(pkt);
}
}
commit 4da1cb6040dece2ece108cd383ab4212e7f7fe85
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 19 17:07:33 2017 +0300
linux-gen: packet: dummy ones complement implementation
Added dummy implementation of ones complement calls. Linux
generic implementation does not calculate the sum for all
incoming packets as it would be wasteful in SW. It's better
to wait until application asks it with odp_chksum_ones_comp16().
Later on, the sum could be stored into the packet header,
if we found a way to get it from the HW.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 0bba3098..74e3ff2b 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -1284,6 +1284,14 @@ int odp_packet_l4_offset_set(odp_packet_t pkt, uint32_t offset)
return 0;
}
+uint16_t odp_packet_ones_comp(odp_packet_t pkt, odp_packet_data_range_t *range)
+{
+ (void)pkt;
+ range->length = 0;
+ range->offset = 0;
+ return 0;
+}
+
void odp_packet_flow_hash_set(odp_packet_t pkt, uint32_t flow_hash)
{
odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
commit f6d3bc302664e2c4121e798e86758d93fdb156f5
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Oct 19 16:48:45 2017 +0300
api: packet: ones complement sum
Added packet metadata for ones complement sum over
packet data. Some NICs calculate the sum during packet
input (at least for IP fragments) and store the value
into the packet descriptor. This offloads L4 checksum
calculation for IP fragments as SW does not need sum
all payload data, but just combine pre-calculated
sums from packet descriptors and remove extra header fields
from the sum.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index da522c6c..b897c9d3 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -1556,6 +1556,26 @@ void odp_packet_l3_chksum_insert(odp_packet_t pkt, int insert);
*/
void odp_packet_l4_chksum_insert(odp_packet_t pkt, int insert);
+/**
+ * Ones' complement sum of packet data
+ *
+ * Returns 16-bit ones' complement sum that was calculated over a portion of
+ * packet data during a packet processing operation (e.g. packet input or
+ * IPSEC offload). The data range is output with 'range' parameter, and usually
+ * includes IP payload (L4 headers and payload). When 'range.length' is zero,
+ * the sum has not been calculated. In case of odd number of bytes,
+ * calculation uses a zero byte as padding at the end. The sum may be used as
+ * part of e.g. UDP/TCP checksum checking, especially with IP fragments.
+ *
+ * @param pkt Packet handle
+ * @param[out] range Data range of the sum (output). The calculation started
+ * from range.offset and included range.length bytes. When
+ * range.length is zero, the sum has not been calculated.
+ *
+ * @return Ones' complement sum over the data range
+ */
+uint16_t odp_packet_ones_comp(odp_packet_t pkt, odp_packet_data_range_t *range);
+
/**
* Packet flow hash value
*
commit 6333b39f1bd5ebe184780260566b84340104efeb
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 8 14:40:13 2017 +0200
validation: packet: add parse tests
Added validation tests for the new packet parse APIs.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index 37550a2f..f96347b5 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -10,6 +10,7 @@
#include <odp_api.h>
#include <odp_cunit_common.h>
+#include <test_packet_parser.h>
#include "packet.h"
/* Reserve some tailroom for tests */
@@ -2390,6 +2391,201 @@ void packet_test_ref(void)
odp_packet_free(ref_pkt[1]);
}
+void packet_test_parse(void)
+{
+ odp_pool_t pool;
+ odp_pool_param_t param;
+ odp_packet_parse_param_t parse;
+ int ret, num_test_pkt, i;
+ uint32_t len, max_len;
+ int num_pkt = 10;
+ odp_packet_t pkt[num_pkt];
+ uint32_t offset[num_pkt];
+ uint32_t test_pkt_len[] = {sizeof(test_packet_arp),
+ sizeof(test_packet_ipv4_icmp),
+ sizeof(test_packet_ipv4_tcp),
+ sizeof(test_packet_ipv4_udp),
+ sizeof(test_packet_vlan_ipv4_udp),
+ sizeof(test_packet_vlan_qinq_ipv4_udp),
+ sizeof(test_packet_ipv6_icmp),
+ sizeof(test_packet_ipv6_tcp),
+ sizeof(test_packet_ipv6_udp),
+ sizeof(test_packet_vlan_ipv6_udp) };
+
+ num_test_pkt = sizeof(test_pkt_len) / sizeof(uint32_t);
+ max_len = 0;
+
+ for (i = 0; i < num_test_pkt; i++) {
+ if (max_len < test_pkt_len[i])
+ max_len = test_pkt_len[i];
+ }
+
+ odp_pool_param_init(¶m);
+
+ param.type = ODP_POOL_PACKET;
+ param.pkt.seg_len = max_len;
+ param.pkt.len = max_len;
+ param.pkt.num = 100;
+
+ pool = odp_pool_create("test_parse_pool", ¶m);
+ CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+
+ /* Ethernet/IPv4/UDP */
+ len = sizeof(test_packet_ipv4_udp);
+ ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+
+ for (i = 0; i < num_pkt; i++) {
+ ret = odp_packet_copy_from_mem(pkt[i], 0, len,
+ test_packet_ipv4_udp);
+ CU_ASSERT(ret == 0);
+
+ offset[i] = 0;
+ }
+
+ parse.proto = ODP_PROTO_ETH;
+ parse.layer = ODP_PROTO_LAYER_ALL;
+ parse.all_check = 0;
+
+ CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
+ CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
+ num_pkt - 1, &parse) == (num_pkt - 1));
+
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT(odp_packet_has_eth(pkt[i]));
+ CU_ASSERT(odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(odp_packet_has_udp(pkt[i]));
+ CU_ASSERT(!odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(!odp_packet_has_tcp(pkt[i]));
+ }
+
+ odp_packet_free_multi(pkt, num_pkt);
+
+ /* IPv4/UDP */
+ len = sizeof(test_packet_ipv4_udp);
+ ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+
+ for (i = 0; i < num_pkt; i++) {
+ ret = odp_packet_copy_from_mem(pkt[i], 0, len,
+ test_packet_ipv4_udp);
+ CU_ASSERT(ret == 0);
+
+ offset[i] = 14;
+ }
+
+ parse.proto = ODP_PROTO_IPV4;
+ parse.layer = ODP_PROTO_LAYER_L4;
+ parse.all_check = 0;
+
+ CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
+ CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
+ num_pkt - 1, &parse) == (num_pkt - 1));
+
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT(odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(odp_packet_has_udp(pkt[i]));
+ CU_ASSERT(!odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(!odp_packet_has_tcp(pkt[i]));
+ }
+
+ odp_packet_free_multi(pkt, num_pkt);
+
+ /* Ethernet/IPv4/TCP */
+ len = sizeof(test_packet_ipv4_tcp);
+ ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+
+ for (i = 0; i < num_pkt; i++) {
+ ret = odp_packet_copy_from_mem(pkt[i], 0, len,
+ test_packet_ipv4_tcp);
+ CU_ASSERT(ret == 0);
+
+ offset[i] = 0;
+ }
+
+ parse.proto = ODP_PROTO_ETH;
+ parse.layer = ODP_PROTO_LAYER_L4;
+ parse.all_check = 0;
+
+ CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
+ CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
+ num_pkt - 1, &parse) == (num_pkt - 1));
+
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT(odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(odp_packet_has_tcp(pkt[i]));
+ CU_ASSERT(!odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(!odp_packet_has_udp(pkt[i]));
+ }
+
+ odp_packet_free_multi(pkt, num_pkt);
+
+ /* Ethernet/IPv6/UDP */
+ len = sizeof(test_packet_ipv6_udp);
+ ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+
+ for (i = 0; i < num_pkt; i++) {
+ ret = odp_packet_copy_from_mem(pkt[i], 0, len,
+ test_packet_ipv6_udp);
+ CU_ASSERT(ret == 0);
+
+ offset[i] = 0;
+ }
+
+ parse.proto = ODP_PROTO_ETH;
+ parse.layer = ODP_PROTO_LAYER_L4;
+ parse.all_check = 0;
+
+ CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
+ CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
+ num_pkt - 1, &parse) == (num_pkt - 1));
+
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT(odp_packet_has_eth(pkt[i]));
+ CU_ASSERT(odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(odp_packet_has_udp(pkt[i]));
+ CU_ASSERT(!odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(!odp_packet_has_tcp(pkt[i]));
+ }
+
+ odp_packet_free_multi(pkt, num_pkt);
+
+ /* Ethernet/IPv6/TCP */
+ len = sizeof(test_packet_ipv6_tcp);
+ ret = odp_packet_alloc_multi(pool, len, pkt, num_pkt);
+ CU_ASSERT_FATAL(ret == num_pkt);
+
+ for (i = 0; i < num_pkt; i++) {
+ ret = odp_packet_copy_from_mem(pkt[i], 0, len,
+ test_packet_ipv6_tcp);
+ CU_ASSERT(ret == 0);
+
+ offset[i] = 0;
+ }
+
+ parse.proto = ODP_PROTO_ETH;
+ parse.layer = ODP_PROTO_LAYER_ALL;
+ parse.all_check = 0;
+
+ CU_ASSERT(odp_packet_parse(pkt[0], offset[0], &parse) == 0);
+ CU_ASSERT(odp_packet_parse_multi(&pkt[1], &offset[1],
+ num_pkt - 1, &parse) == (num_pkt - 1));
+
+ for (i = 0; i < num_pkt; i++) {
+ CU_ASSERT(odp_packet_has_eth(pkt[i]));
+ CU_ASSERT(odp_packet_has_ipv6(pkt[i]));
+ CU_ASSERT(odp_packet_has_tcp(pkt[i]));
+ CU_ASSERT(!odp_packet_has_ipv4(pkt[i]));
+ CU_ASSERT(!odp_packet_has_udp(pkt[i]));
+ }
+
+ odp_packet_free_multi(pkt, num_pkt);
+
+ odp_pool_destroy(pool);
+}
+
odp_testinfo_t packet_suite[] = {
ODP_TEST_INFO(packet_test_alloc_free),
ODP_TEST_INFO(packet_test_alloc_free_multi),
@@ -2420,6 +2616,7 @@ odp_testinfo_t packet_suite[] = {
ODP_TEST_INFO(packet_test_align),
ODP_TEST_INFO(packet_test_offset),
ODP_TEST_INFO(packet_test_ref),
+ ODP_TEST_INFO(packet_test_parse),
ODP_TEST_INFO_NULL,
};
diff --git a/test/validation/api/packet/packet.h b/test/validation/api/packet/packet.h
index 783b7a11..4e99679e 100644
--- a/test/validation/api/packet/packet.h
+++ b/test/validation/api/packet/packet.h
@@ -39,6 +39,7 @@ void packet_test_extend_ref(void);
void packet_test_align(void);
void packet_test_offset(void);
void packet_test_ref(void);
+void packet_test_parse(void);
/* test arrays: */
extern odp_testinfo_t packet_suite[];
commit 78ced32df325dac7ff58ff28684fdb941f5ec1b3
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 8 13:52:13 2017 +0200
validation: pktio: add parser test packet header
Moved parser test packet definitions into a new, common
header file. The same test packets can be used in various
test suites.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index a3419e0f..fbd5d52f 100644
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -14,5 +14,5 @@ libthrmask_common_la_CFLAGS = $(AM_CFLAGS) -DTEST_THRMASK
endif
-noinst_HEADERS = test_debug.h
+noinst_HEADERS = test_debug.h test_packet_parser.h
dist_test_SCRIPTS = run-test.sh
diff --git a/test/validation/api/pktio/parser.h b/test/common/test_packet_parser.h
similarity index 88%
copy from test/validation/api/pktio/parser.h
copy to test/common/test_packet_parser.h
index 5cc2b988..918e0ad6 100644
--- a/test/validation/api/pktio/parser.h
+++ b/test/common/test_packet_parser.h
@@ -4,29 +4,20 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef _ODP_TEST_PARSER_H_
-#define _ODP_TEST_PARSER_H_
-
-#include <odp_cunit_common.h>
-
-/* test functions: */
-void parser_test_arp(void);
-void parser_test_ipv4_icmp(void);
-void parser_test_ipv4_tcp(void);
-void parser_test_ipv4_udp(void);
-void parser_test_vlan_ipv4_udp(void);
-void parser_test_vlan_qinq_ipv4_udp(void);
-void parser_test_ipv6_icmp(void);
-void parser_test_ipv6_tcp(void);
-void parser_test_ipv6_udp(void);
-void parser_test_vlan_ipv6_udp(void);
-
-/* test array init/term functions: */
-int parser_suite_term(void);
-int parser_suite_init(void);
-
-/* test arrays: */
-extern odp_testinfo_t parser_suite[];
+/**
+ * @file
+ *
+ * Test packets for parser tests
+ */
+
+#ifndef TEST_PACKET_PARSER_H_
+#define TEST_PACKET_PARSER_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/* Test packets without CRC */
@@ -177,4 +168,8 @@ static const uint8_t test_packet_vlan_ipv6_udp[] = {
0x9B, 0x68
};
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c
index dd293a44..66e726d0 100644
--- a/test/validation/api/pktio/parser.c
+++ b/test/validation/api/pktio/parser.c
@@ -8,6 +8,7 @@
#include <odp_api.h>
#include <odp_cunit_common.h>
+#include <test_packet_parser.h>
#include <odp/helper/odph_api.h>
diff --git a/test/validation/api/pktio/parser.h b/test/validation/api/pktio/parser.h
index 5cc2b988..d95ecca1 100644
--- a/test/validation/api/pktio/parser.h
+++ b/test/validation/api/pktio/parser.h
@@ -28,153 +28,4 @@ int parser_suite_init(void);
/* test arrays: */
extern odp_testinfo_t parser_suite[];
-/* Test packets without CRC */
-
-/**
- * ARP request
- */
-static const uint8_t test_packet_arp[] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x06, 0x00, 0x01,
- 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0xC0, 0xA8, 0x01, 0x01,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xA8,
- 0x01, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11
-};
-
-/**
- * ICMPv4 echo reply
- */
-static const uint8_t test_packet_ipv4_icmp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01,
- 0xF3, 0x7B, 0xC0, 0xA8, 0x01, 0x01, 0xC4, 0xA8,
- 0x01, 0x02, 0x00, 0x00, 0xB7, 0xAB, 0x00, 0x01,
- 0x00, 0x02, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11
-};
-
-/**
- * IPv4 TCP
- */
-static const uint8_t test_packet_ipv4_tcp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x06,
- 0xF3, 0x76, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
- 0x01, 0x01, 0x04, 0xD2, 0x10, 0xE1, 0x00, 0x00,
- 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x50, 0x00,
- 0x00, 0x00, 0x0C, 0xCC, 0x00, 0x00, 0x00, 0x01,
- 0x02, 0x03, 0x04, 0x05
-};
-
-/**
- * IPv4 UDP
- */
-static const uint8_t test_packet_ipv4_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
- 0xF3, 0x6B, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
- 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x1A,
- 0x2F, 0x97, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11
-};
-
-/**
- * VLAN IPv4 UDP
- * - ID: 23
- */
-static const uint8_t test_packet_vlan_ipv4_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
- 0x08, 0x00, 0x45, 0x00, 0x00, 0x2A, 0x00, 0x00,
- 0x00, 0x00, 0x40, 0x11, 0xF3, 0x6F, 0xC0, 0xA8,
- 0x01, 0x02, 0xC4, 0xA8, 0x01, 0x01, 0x00, 0x3F,
- 0x00, 0x3F, 0x00, 0x16, 0x4D, 0xBF, 0x00, 0x01,
- 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
- 0x0A, 0x0B, 0x0C, 0x0D
-};
-
-/**
- * VLAN Q-in-Q IPv4 UDP
- * - Outer: Tag Protocol ID 0x88a8, VLAN ID 1
- * - Inner: Tag Protocol ID 0x8100, VLAN ID 2
- */
-static const uint8_t test_packet_vlan_qinq_ipv4_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x88, 0xA8, 0x00, 0x01,
- 0x81, 0x00, 0x00, 0x02, 0x08, 0x00, 0x45, 0x00,
- 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x40, 0x11,
- 0xF3, 0x73, 0xC0, 0xA8, 0x01, 0x02, 0xC4, 0xA8,
- 0x01, 0x01, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x12,
- 0x63, 0xDF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
- 0x06, 0x07, 0x08, 0x09
-};
-
-/**
- * ICMPv6 echo request
- */
-static const uint8_t test_packet_ipv6_icmp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
- 0x00, 0x00, 0x00, 0x08, 0x3A, 0xFF, 0xFE, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
- 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
- 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
- 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x80, 0x00,
- 0x1B, 0xC2, 0x00, 0x01, 0x00, 0x02
-};
-
-/**
- * IPv6 TCP
- */
-static const uint8_t test_packet_ipv6_tcp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
- 0x00, 0x00, 0x00, 0x14, 0x06, 0xFF, 0xFE, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
- 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
- 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
- 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x04, 0xD2,
- 0x10, 0xE1, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
- 0x00, 0x02, 0x50, 0x00, 0x00, 0x00, 0x36, 0x37,
- 0x00, 0x00
-};
-
-/**
- * IPv6 UDP
- */
-static const uint8_t test_packet_ipv6_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x86, 0xDD, 0x60, 0x30,
- 0x00, 0x00, 0x00, 0x08, 0x11, 0xFF, 0xFE, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
- 0x09, 0xFF, 0xFE, 0x00, 0x04, 0x00, 0x35, 0x55,
- 0x55, 0x55, 0x66, 0x66, 0x66, 0x66, 0x77, 0x77,
- 0x77, 0x77, 0x88, 0x88, 0x88, 0x88, 0x00, 0x3F,
- 0x00, 0x3F, 0x00, 0x08, 0x9B, 0x68
-};
-
-/**
- * VLAN IPv6
- * - ID: 23
- */
-static const uint8_t test_packet_vlan_ipv6_udp[] = {
- 0x00, 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x00,
- 0x09, 0x00, 0x04, 0x00, 0x81, 0x00, 0x00, 0x17,
- 0x86, 0xDD, 0x60, 0x30, 0x00, 0x00, 0x00, 0x08,
- 0x11, 0xFF, 0xFE, 0x80, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x02, 0x00, 0x09, 0xFF, 0xFE, 0x00,
- 0x04, 0x00, 0x35, 0x55, 0x55, 0x55, 0x66, 0x66,
- 0x66, 0x66, 0x77, 0x77, 0x77, 0x77, 0x88, 0x88,
- 0x88, 0x88, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x08,
- 0x9B, 0x68
-};
-
#endif
commit fbb6a7feba146acb1495fbdcd93e1b691a7363a0
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Wed Nov 8 13:31:27 2017 +0200
linux-gen: packet: add parse API
Implemented new API functions for packet parsing.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index fed562aa..97efcec4 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -322,8 +322,7 @@ static inline void packet_set_ts(odp_packet_hdr_t *pkt_hdr, odp_time_t *ts)
}
int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr,
- uint32_t pkt_len, uint32_t seg_len,
- odp_pktio_parser_layer_t layer);
+ uint32_t pkt_len, uint32_t seg_len, int layer);
int _odp_cls_parse(odp_packet_hdr_t *pkt_hdr, const uint8_t *parseptr);
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 3b2fac21..0bba3098 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -2098,8 +2098,7 @@ static inline
int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
uint32_t offset,
uint32_t frame_len, uint32_t seg_len,
- odp_pktio_parser_layer_t layer,
- uint16_t ethtype)
+ int layer, uint16_t ethtype)
{
uint8_t ip_proto;
@@ -2199,7 +2198,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
*/
int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
uint32_t frame_len, uint32_t seg_len,
- odp_pktio_parser_layer_t layer)
+ int layer)
{
uint32_t offset;
uint16_t ethtype;
@@ -2252,6 +2251,63 @@ int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr,
layer, ethtype);
}
+int odp_packet_parse(odp_packet_t pkt, uint32_t offset,
+ const odp_packet_parse_param_t *param)
+{
+ odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt);
+ void *data;
+ uint32_t seg_len;
+ uint32_t packet_len = pkt_hdr->frame_len;
+ odp_proto_t proto = param->proto;
+ odp_proto_layer_t layer = param->layer;
+ int ret;
+ uint16_t ethtype;
+
+ if (proto == ODP_PROTO_NONE || layer == ODP_PROTO_LAYER_NONE)
+ return -1;
+
+ data = packet_map(pkt_hdr, offset, &seg_len, NULL);
+
+ if (data == NULL)
+ return -1;
+
+ packet_parse_reset(pkt_hdr);
+
+ if (proto == ODP_PROTO_ETH) {
+ ret = packet_parse_common(&pkt_hdr->p, data, packet_len,
+ seg_len, layer);
+
+ if (ret)
+ return -1;
+ } else {
+ if (proto == ODP_PROTO_IPV4)
+ ethtype = _ODP_ETHTYPE_IPV4;
+ else
+ ethtype = _ODP_ETHTYPE_IPV6;
+
+ ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset,
+ packet_len, seg_len,
+ layer, ethtype);
+
+ if (ret)
+ return -1;
+ }
+
+ return 0;
+}
+
+int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[],
+ int num, const odp_packet_parse_param_t *param)
+{
+ int i;
+
+ for (i = 0; i < num; i++)
+ if (odp_packet_parse(pkt[i], offset[i], param))
+ return i;
+
+ return num;
+}
+
uint64_t odp_packet_to_u64(odp_packet_t hdl)
{
return _odp_pri(hdl);
commit 23b6eee83bc5717f4797441bddbb035e3388ff10
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Nov 3 14:19:52 2017 +0200
api: ipsec: use common protocol layer enum
Use common values between ipsec parse and
packet protocol layer enums.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h
index 26e852fc..4a33af8e 100644
--- a/include/odp/api/spec/ipsec.h
+++ b/include/odp/api/spec/ipsec.h
@@ -74,19 +74,19 @@ typedef enum odp_ipsec_op_mode_t {
*/
typedef enum odp_ipsec_proto_layer_t {
/** No layers */
- ODP_IPSEC_LAYER_NONE = 0,
+ ODP_IPSEC_LAYER_NONE = ODP_PROTO_LAYER_NONE,
/** Layer L2 protocols (Ethernet, VLAN, etc) */
- ODP_IPSEC_LAYER_L2,
+ ODP_IPSEC_LAYER_L2 = ODP_PROTO_LAYER_L2,
/** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */
- ODP_IPSEC_LAYER_L3,
+ ODP_IPSEC_LAYER_L3 = ODP_PROTO_LAYER_L3,
/** Layer L4 protocols (UDP, TCP, SCTP) */
- ODP_IPSEC_LAYER_L4,
+ ODP_IPSEC_LAYER_L4 = ODP_PROTO_LAYER_L4,
/** All layers */
- ODP_IPSEC_LAYER_ALL
+ ODP_IPSEC_LAYER_ALL = ODP_PROTO_LAYER_ALL
} odp_ipsec_proto_layer_t;
commit 0ec5bc6b5c3a178d7b316bdf9e18db452ba5ed58
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Fri Nov 3 13:48:38 2017 +0200
api: pktio: use common protocol layer enum
Use common values between pktio parser layer and
packet protocol layer enums.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h
index 52af646a..6e4f8810 100644
--- a/include/odp/api/spec/packet_io.h
+++ b/include/odp/api/spec/packet_io.h
@@ -23,6 +23,7 @@ extern "C" {
#include <odp/api/packet_io_stats.h>
#include <odp/api/queue.h>
#include <odp/api/time.h>
+#include <odp/api/packet.h>
/** @defgroup odp_packet_io ODP PACKET IO
* Operations on a packet Input/Output interface.
@@ -381,19 +382,19 @@ typedef union odp_pktout_config_opt_t {
*/
typedef enum odp_pktio_parser_layer_t {
/** No layers */
- ODP_PKTIO_PARSER_LAYER_NONE = 0,
+ ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE,
/** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */
- ODP_PKTIO_PARSER_LAYER_L2,
+ ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2,
/** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */
- ODP_PKTIO_PARSER_LAYER_L3,
+ ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3,
/** Layer L4 protocols (UDP, TCP, SCTP) */
- ODP_PKTIO_PARSER_LAYER_L4,
+ ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4,
/** All layers */
- ODP_PKTIO_PARSER_LAYER_ALL
+ ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL
} odp_pktio_parser_layer_t;
diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
index 1804fa6f..22f5aca3 100644
--- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h
@@ -15,7 +15,9 @@
#include <odp/api/plat/packet_types.h>
#include <odp/api/pool.h>
-#include <odp/api/packet_io.h>
+#include <odp/api/time.h>
+#include <odp/api/plat/packet_io_types.h>
+#include <odp/api/plat/buffer_types.h>
#include <odp/api/hints.h>
/** @internal Inline function offsets */
commit 9c389e1785fd000203eb2198f9fc2778be8f83e6
Author: Petri Savolainen <petri.savolainen(a)linaro.org>
Date: Thu Nov 2 16:02:32 2017 +0200
api: packet: add parse functions
Application may need help on packet parsing e.g. after decrypt
or IP reassembly of a packet. Application specifies from where
to start and where to stop parsing. Implementation may be
vectorized (more efficient) when multiple packets are parsed
together with the same parse requirements.
Signed-off-by: Petri Savolainen <petri.savolainen(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/packet.h b/include/odp/api/spec/packet.h
index fac7790b..da522c6c 100644
--- a/include/odp/api/spec/packet.h
+++ b/include/odp/api/spec/packet.h
@@ -71,6 +71,45 @@ extern "C" {
* Packet is red
*/
+/**
+ * Protocol
+ */
+typedef enum odp_proto_t {
+ /** No protocol defined */
+ ODP_PROTO_NONE = 0,
+
+ /** Ethernet (including VLAN) */
+ ODP_PROTO_ETH,
+
+ /** IP version 4 */
+ ODP_PROTO_IPV4,
+
+ /** IP version 6 */
+ ODP_PROTO_IPV6
+
+} odp_proto_t;
+
+/**
+ * Protocol layer
+ */
+typedef enum odp_proto_layer_t {
+ /** No layers */
+ ODP_PROTO_LAYER_NONE = 0,
+
+ /** Layer L2 protocols (Ethernet, VLAN, etc) */
+ ODP_PROTO_LAYER_L2,
+
+ /** Layer L3 protocols (IPv4, IPv6, ICMP, IPSEC, etc) */
+ ODP_PROTO_LAYER_L3,
+
+ /** Layer L4 protocols (UDP, TCP, SCTP) */
+ ODP_PROTO_LAYER_L4,
+
+ /** All layers */
+ ODP_PROTO_LAYER_ALL
+
+} odp_proto_layer_t;
+
/**
* Packet API data range specifier
*/
@@ -1139,6 +1178,87 @@ int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset,
*
*/
+/**
+ * Packet parse parameters
+ */
+typedef struct odp_packet_parse_param_t {
+ /** Protocol header at parse starting point. Valid values for this
+ * field are: ODP_PROTO_ETH, ODP_PROTO_IPV4, ODP_PROTO_IPV6. */
+ odp_proto_t proto;
+
+ /** Continue parsing until this layer. Must be the same or higher
+ * layer than the layer of 'proto'. */
+ odp_proto_layer_t layer;
+
+ /** Flags to control payload data checks up to the selected parse
+ * layer. Checksum checking status can be queried for each packet with
+ * odp_packet_l3_chksum_status() and odp_packet_l4_chksum_status().
+ */
+ union {
+ /** Individual check bits. */
+ struct {
+ /** Check IPv4 header checksum */
+ uint32_t ipv4_chksum : 1;
+
+ /** Check UDP checksum */
+ uint32_t udp_chksum : 1;
+
+ /** Check TCP checksum */
+ uint32_t tcp_chksum : 1;
+
+ /** Check SCTP checksum */
+ uint32_t sctp_chksum : 1;
+
+ } check;
+
+ /** All check bits. This can be used to set/clear all flags. */
+ uint32_t all_check;
+ };
+
+} odp_packet_parse_param_t;
+
+/**
+ * Parse packet
+ *
+ * Parse protocol headers in packet data. Parsing starts at 'offset', which
+ * is the first header byte of protocol 'param.proto'. Parameter 'param.layer'
+ * defines the last layer application is interested about.
+ * Use ODP_PROTO_LAYER_ALL for all layers. A successful operation sets or resets
+ * packet metadata for all layers from the layer of 'param.proto' to the
+ * application defined last layer. Metadata of other layers have undefined
+ * values. When operation fails, metadata of all protocol layers have undefined
+ * values.
+ *
+ * @param pkt Packet handle
+ * @param offset Byte offset into the packet
+ * @param param Parse parameters. Proto and layer fields must be set. Clear
+ * all check bits that are not used.
+ *
+ * @retval 0 on success
+ * @retval <0 on failure
+ */
+int odp_packet_parse(odp_packet_t pkt, uint32_t offset,
+ const odp_packet_parse_param_t *param);
+
+/**
+ * Parse multiple packets
+ *
+ * Otherwise like odp_packet_parse(), but parses multiple packets. Packets may
+ * have unique offsets, but must start with the same protocol. Also, packets are
+ * parsed up to the same protocol layer.
+ *
+ * @param pkt Packet handle array
+ * @param offset Byte offsets into the packets
+ * @param num Number of packets and offsets
+ * @param param Parse parameters. Proto and layer fields must be set. Clear
+ * all check bits that are not used.
+ *
+ * @return Number of packets parsed successfully (0 ... num)
+ * @retval <0 on failure
+ */
+int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[],
+ int num, const odp_packet_parse_param_t *param);
+
/**
* Packet pool
*
-----------------------------------------------------------------------
Summary of changes:
include/odp/api/spec/ipsec.h | 10 +-
include/odp/api/spec/packet.h | 140 ++++++++++++++
include/odp/api/spec/packet_io.h | 11 +-
.../include/odp/api/plat/packet_inlines.h | 4 +-
.../linux-generic/include/odp_packet_internal.h | 3 +-
platform/linux-generic/odp_packet.c | 70 ++++++-
test/common/Makefile.am | 2 +-
.../pktio/parser.h => common/test_packet_parser.h} | 41 ++---
test/validation/api/packet/packet.c | 203 +++++++++++++++++++++
test/validation/api/packet/packet.h | 1 +
test/validation/api/pktio/parser.c | 1 +
test/validation/api/pktio/parser.h | 149 ---------------
test/validation/api/pktio/pktio.c | 25 ++-
13 files changed, 467 insertions(+), 193 deletions(-)
copy test/{validation/api/pktio/parser.h => common/test_packet_parser.h} (88%)
hooks/post-receive
--
8 years, 3 months
- 1
- 0
[COMMIT] branch api-next updated. v1.16.0.0-549-g3d254a24
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via 3d254a24a1a911aad72f0535412644824872307f (commit)
via 2cfe11680ecc2186339183e94f291ce586740f8b (commit)
via bb6abbb8a5a8f92a7b18c7c2b3336be1ef264e11 (commit)
via 45d422099d86461c48871879e0f7abbf37acfd5c (commit)
via 614161c1a440d13d866975dc13df13cde2e8b3f3 (commit)
via 279621af7fd8bf2b84b16acce85ff5bf040e7771 (commit)
via 29195afb96cd539e4d4a94bd3d64336acf34bcaa (commit)
via b653ea8ac54aea1a81ce9f49d4ec60f81bec2d2d (commit)
via 3c8f24c52d80bd7e032ba3a1788c8dbc4d5ea0ad (commit)
via 9b98d35daf7736b34e51400c6a7e32bf81537ce6 (commit)
via 774b652640be4ab7147db0a337f84ce8d602b665 (commit)
via 8999344484a2c3b4c08b84c5b27e2b355fa312d5 (commit)
via e475a06dba8b79eace4131ea7327e87a10546351 (commit)
via c5fbca288838d39f3f6434d381acb25f12c1dc9e (commit)
via 22921366d8a2f9155d43f7022d645c6d364c8b58 (commit)
via 0278905b45145a168f5b63afa0dbf0be30e808be (commit)
via da0198f610f10c8af2c19eb4148001d1759eb401 (commit)
via 6b24e0905df12ba075d86e471a48035f6c7b91ef (commit)
via c8f25051021015221ec8d46cf2e06914eb8ca868 (commit)
via 5f095cc66bc3fcafe8f44ed7348ef127f40c9026 (commit)
via 3d6cf1de61e0b5c846317b3ffcbd0cfd07531b90 (commit)
via 43d7f57b9f9f24526330c51fda8554d52414b82f (commit)
via c4a8f43ff08b954d14857c5a59544f8d914205e3 (commit)
via f972ef61a9693b7895cb7f85084c1c53c3b13131 (commit)
via b6b667b1e95635a6ba77a19078d7d28013bcde1d (commit)
via bae53291795e9c19cbfde9c0d0e11a19d9870623 (commit)
via dd31792d10772c3e41519fc0b6d68cf13b0fe9d4 (commit)
via 0e04be4851ecc94da8b4cac3c576260c0518c936 (commit)
via d59c00c5f0255a5f1fc462332eef291bb2993f64 (commit)
via 29c7a054f7151d33795a0d8d7df5594bf4fddb55 (commit)
from fd192cba9c4e1f36a1bf3819f35f5e684ca80b1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3d254a24a1a911aad72f0535412644824872307f
Merge: fd192cba 2cfe1168
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Fri Nov 10 16:31:14 2017 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 222 ++++++++++++++++++++++++++++++++++++
configure.ac | 6 +-
example/l2fwd/README | 3 +-
example/l2fwd/odp_l2fwd.c | 2 +-
platform/linux-generic/odp_crypto.c | 19 +--
test/performance/odp_l2fwd_run.sh | 6 +-
6 files changed, 235 insertions(+), 23 deletions(-)
hooks/post-receive
--
8 years, 3 months
- 1
- 0
[COMMIT] branch master updated. v1.16.0.0
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 2cfe11680ecc2186339183e94f291ce586740f8b (commit)
via bb6abbb8a5a8f92a7b18c7c2b3336be1ef264e11 (commit)
via 45d422099d86461c48871879e0f7abbf37acfd5c (commit)
via 614161c1a440d13d866975dc13df13cde2e8b3f3 (commit)
via 279621af7fd8bf2b84b16acce85ff5bf040e7771 (commit)
via 29195afb96cd539e4d4a94bd3d64336acf34bcaa (commit)
via b653ea8ac54aea1a81ce9f49d4ec60f81bec2d2d (commit)
via 3c8f24c52d80bd7e032ba3a1788c8dbc4d5ea0ad (commit)
via 9b98d35daf7736b34e51400c6a7e32bf81537ce6 (commit)
via 774b652640be4ab7147db0a337f84ce8d602b665 (commit)
via 8999344484a2c3b4c08b84c5b27e2b355fa312d5 (commit)
via e475a06dba8b79eace4131ea7327e87a10546351 (commit)
via c5fbca288838d39f3f6434d381acb25f12c1dc9e (commit)
via 22921366d8a2f9155d43f7022d645c6d364c8b58 (commit)
via 0278905b45145a168f5b63afa0dbf0be30e808be (commit)
via da0198f610f10c8af2c19eb4148001d1759eb401 (commit)
via 6b24e0905df12ba075d86e471a48035f6c7b91ef (commit)
via c8f25051021015221ec8d46cf2e06914eb8ca868 (commit)
via 5f095cc66bc3fcafe8f44ed7348ef127f40c9026 (commit)
via 3d6cf1de61e0b5c846317b3ffcbd0cfd07531b90 (commit)
via 43d7f57b9f9f24526330c51fda8554d52414b82f (commit)
via c4a8f43ff08b954d14857c5a59544f8d914205e3 (commit)
via f972ef61a9693b7895cb7f85084c1c53c3b13131 (commit)
via b6b667b1e95635a6ba77a19078d7d28013bcde1d (commit)
via bae53291795e9c19cbfde9c0d0e11a19d9870623 (commit)
via dd31792d10772c3e41519fc0b6d68cf13b0fe9d4 (commit)
from 0e04be4851ecc94da8b4cac3c576260c0518c936 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 222 +++++++++++++++++++++
configure.ac | 6 +-
doc/Doxyfile_common | 12 ++
doc/application-api-guide/Doxyfile | 2 -
doc/helper-guide/Doxyfile | 8 -
doc/images/reflen.svg | 45 -----
doc/platform-api-guide/Doxyfile | 9 -
doc/users-guide/users-guide-packet.adoc | 26 +--
doc/users-guide/users-guide.adoc | 36 +++-
include/Makefile.am | 1 +
include/odp/api/spec/feature.h | 69 +++++++
include/odp/api/spec/init.h | 15 ++
include/odp/api/spec/packet.h | 40 ++--
include/odp/api/spec/packet_io.h | 13 +-
include/odp/api/spec/system_info.h | 19 ++
include/odp/api/spec/timer.h | 36 +++-
include/odp/api/spec/traffic_mngr.h | 6 +-
include/odp/arch/default/api/abi/event.h | 3 +-
include/odp_api.h | 1 +
platform/linux-generic/Makefile.am | 1 +
.../include/odp/api/{deprecated.h => feature.h} | 16 +-
.../linux-generic/include/odp_debug_internal.h | 2 +-
.../linux-generic/include/odp_packet_internal.h | 2 -
platform/linux-generic/odp_init.c | 5 +
platform/linux-generic/odp_packet.c | 88 +++++---
platform/linux-generic/odp_packet_io.c | 2 +-
platform/linux-generic/odp_system_info.c | 36 ++++
scripts/Dockerfile | 4 +-
test/Makefile.inc | 4 +-
test/performance/odp_bench_packet.c | 13 --
test/performance/odp_pktio_ordered.c | 4 +
test/validation/api/init/init.c | 8 +-
test/validation/api/packet/packet.c | 154 +-------------
test/validation/api/system/system.c | 21 ++
test/validation/api/system/system.h | 1 +
35 files changed, 595 insertions(+), 335 deletions(-)
delete mode 100644 doc/images/reflen.svg
create mode 100644 include/odp/api/spec/feature.h
copy platform/linux-generic/include/odp/api/{deprecated.h => feature.h} (57%)
hooks/post-receive
--
8 years, 3 months
- 1
- 0