From: claudio <claudio@openbsd.org>
Date: Mon, 30 Jan 2023 17:02:48 +0000 (+0000)
Subject: Extend community unittests to cover more bits
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9b645b305ac81b72253d6392e17117decbc444b5;p=openbsd

Extend community unittests to cover more bits
---

diff --git a/regress/usr.sbin/bgpd/unittests/rde_community_test.c b/regress/usr.sbin/bgpd/unittests/rde_community_test.c
index 6c7c1156a02..38c2a8a50d2 100644
--- a/regress/usr.sbin/bgpd/unittests/rde_community_test.c
+++ b/regress/usr.sbin/bgpd/unittests/rde_community_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_community_test.c,v 1.5 2022/05/31 09:46:54 claudio Exp $ */
+/*	$OpenBSD: rde_community_test.c,v 1.6 2023/01/30 17:02:48 claudio Exp $ */
 
 /*
  * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org>
@@ -27,10 +27,6 @@
 
 struct rde_memstats rdemem;
 struct rde_community comm;
-struct rde_peer peer = {
-	.conf.remote_as = 22512,
-	.conf.local_as = 42,
-};
 
 static void
 dump(uint8_t *b, size_t len)
@@ -117,10 +113,15 @@ test_filter(size_t num, struct testfilter *f)
 {
 	size_t l;
 	int r;
+	struct rde_peer *p = &peer;
 
 	communities_clean(&comm);
+
+	if (f->peer != NULL)
+		p = f->peer;
+
 	for (l = 0; f->in[l] != -1; l++) {
-		r = community_set(&comm, &filters[f->in[l]], &peer);
+		r = community_set(&comm, &filters[f->in[l]], p);
 		if (r != 1) {
 			printf("Test %zu: community_set %zu "
 			    "unexpected return %d != 1\n",
@@ -130,7 +131,7 @@ test_filter(size_t num, struct testfilter *f)
 	}
 
 	if (f->match != -1) {
-		r = community_match(&comm, &filters[f->match], &peer);
+		r = community_match(&comm, &filters[f->match], p);
 		if (r != f->mout) {
 			printf("Test %zu: community_match "
 			    "unexpected return %d != %d\n", num, r, f->mout);
@@ -139,9 +140,9 @@ test_filter(size_t num, struct testfilter *f)
 	}
 
 	if (f->delete != -1) {
-		community_delete(&comm, &filters[f->delete], &peer);
+		community_delete(&comm, &filters[f->delete], p);
 
-		if (community_match(&comm, &filters[f->delete], &peer) != 0) {
+		if (community_match(&comm, &filters[f->delete], p) != 0) {
 			printf("Test %zu: community_delete still around\n",
 			    num);
 			return -1;
diff --git a/regress/usr.sbin/bgpd/unittests/rde_community_test.h b/regress/usr.sbin/bgpd/unittests/rde_community_test.h
index 4a74072eebb..2d2439a0e02 100644
--- a/regress/usr.sbin/bgpd/unittests/rde_community_test.h
+++ b/regress/usr.sbin/bgpd/unittests/rde_community_test.h
@@ -1,3 +1,20 @@
+struct rde_peer peer = {
+	.conf.local_as = 42,
+	.conf.remote_as = 22512,
+};
+struct rde_peer peer_l4 = {
+	.conf.local_as = 196618,
+	.conf.remote_as = 22512,
+};
+struct rde_peer peer_r4 = {
+	.conf.local_as = 22512,
+	.conf.remote_as = 196618,
+};
+struct rde_peer peer_b4 = {
+	.conf.local_as = 196618,
+	.conf.remote_as = 424242,
+};
+
 struct vector {
 	uint8_t	*data;
 	size_t	size;
@@ -409,17 +426,100 @@ struct community filters[] = {
 		.data1 = 22512,
 		.data2 = 15,
 	},
+	{ /* 28 */
+		.flags = COMMUNITY_TYPE_BASIC | (COMMUNITY_LOCAL_AS << 8) |
+		    (COMMUNITY_NEIGHBOR_AS << 16),
+	},
+	{ /* 29 */
+		.flags = COMMUNITY_TYPE_LARGE | (COMMUNITY_LOCAL_AS << 8) |
+		    (COMMUNITY_NEIGHBOR_AS << 24),
+	},
+	{ /* 30 */
+		.flags = COMMUNITY_TYPE_EXT | (COMMUNITY_LOCAL_AS << 8) |
+		    (COMMUNITY_NEIGHBOR_AS << 16),
+		.data3 = EXT_COMMUNITY_TRANS_TWO_AS << 8 | 0x02,
+	},
+	{ /* 31 */
+		.flags = COMMUNITY_TYPE_BASIC,
+		.data1 = 42,
+		.data2 = 22512,
+	},
+	{ /* 32 */
+		.flags = COMMUNITY_TYPE_BASIC,
+		.data1 = 65366,
+		.data2 = 22512,
+	},
+	{ /* 33 */
+		.flags = COMMUNITY_TYPE_BASIC,
+		.data1 = 42,
+		.data2 = 65366,
+	},
+	{ /* 34 */
+		.flags = COMMUNITY_TYPE_LARGE,
+		.data1 = 42,
+		.data2 = 0,
+		.data3 = 22512,
+	},
+	{ /* 35 */
+		.flags = COMMUNITY_TYPE_LARGE,
+		.data1 = 196618,
+		.data2 = 0,
+		.data3 = 22512,
+	},
+	{ /* 36 */
+		.flags = COMMUNITY_TYPE_LARGE,
+		.data1 = 22512,
+		.data2 = 0,
+		.data3 = 196618,
+	},
+	{ /* 37 */
+		.flags = COMMUNITY_TYPE_LARGE,
+		.data1 = 196618,
+		.data2 = 0,
+		.data3 = 424242,
+	},
+	{ /* 38 */
+		.flags = COMMUNITY_TYPE_EXT,
+		.data1 = 42,
+		.data2 = 22512,
+		.data3 = EXT_COMMUNITY_TRANS_TWO_AS << 8 | 0x02,
+	},
+	{ /* 39 */
+		.flags = COMMUNITY_TYPE_EXT,
+		.data1 = 42,
+		.data2 = 22512,
+		.data3 = EXT_COMMUNITY_TRANS_FOUR_AS << 8 | 0x02,
+	},
+	{ /* 40 */
+		.flags = COMMUNITY_TYPE_EXT,
+		.data1 = 196618,
+		.data2 = 22512,
+		.data3 = EXT_COMMUNITY_TRANS_FOUR_AS << 8 | 0x02,
+	},
+	{ /* 41 */
+		.flags = COMMUNITY_TYPE_EXT,
+		.data1 = 22512,
+		.data2 = 196618,
+		.data3 = EXT_COMMUNITY_TRANS_TWO_AS << 8 | 0x02,
+	},
 };
 
 struct testfilter {
-	ssize_t	in[8];
-	ssize_t	delete;
-	ssize_t	match;
-	int	mout;
-	int	ncomm;
-	int	next;
-	int	nlarge;
+	int		 in[8];
+	int		 delete;
+	int		 match;
+	int		 mout;
+	int		 ncomm;
+	int		 next;
+	int		 nlarge;
+	struct rde_peer *peer;
 } testfilters[] = {
+	{
+		.in = { 38, -1 },
+		.match = 30,
+		.mout = 1,
+		.peer = &peer,
+	},
 	{
 		.in = { 1, 2, -1 },
 		.match = 1,
@@ -555,4 +655,302 @@ struct testfilter {
 		.next = 1 + 1,
 		.nlarge = 1 + 1,
 	},
+	{
+		.in = { 28, -1 },
+		.match = 28,
+		.mout = 1,
+		.delete = 28,
+		.peer = &peer,
+	},
+	{
+		.in = { 31, -1 },
+		.match = 28,
+		.mout = 1,
+		.delete = 28,
+		.peer = &peer,
+	},
+	{
+		.in = { 31, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 31, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{ /* 25 */
+		.in = { 31, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_b4,
+	},
+	{
+		.in = { 32, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 32, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 32, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 32, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_b4,
+	},
+	{ /* 30 */
+		.in = { 33, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 33, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 33, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 33, -1 },
+		.match = 28,
+		.mout = 0,
+		.peer = &peer_b4,
+	},
+	{
+		.in = { 29, -1 },
+		.match = 29,
+		.mout = 1,
+		.delete = 29,
+		.peer = &peer,
+	},
+	{ /* 35 */
+		.in = { 29, -1 },
+		.match = 29,
+		.mout = 1,
+		.delete = 29,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 29, -1 },
+		.match = 29,
+		.mout = 1,
+		.delete = 29,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 29, -1 },
+		.match = 29,
+		.mout = 1,
+		.delete = 29,
+		.peer = &peer_b4,
+	},
+	{
+		.in = { 34, -1 },
+		.match = 29,
+		.mout = 1,
+		.peer = &peer,
+	},
+	{
+		.in = { 34, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{ /* 40 */
+		.in = { 34, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 34, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_b4,
+	},
+	{
+		.in = { 35, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 35, -1 },
+		.match = 29,
+		.mout = 1,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 35, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{ /* 45 */
+		.in = { 35, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_b4,
+	},
+	{
+		.in = { 36, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 36, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 36, -1 },
+		.match = 29,
+		.mout = 1,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 36, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_b4,
+	},
+	{ /* 50 */
+		.in = { 37, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 37, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 37, -1 },
+		.match = 29,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 37, -1 },
+		.match = 29,
+		.mout = 1,
+		.peer = &peer_b4,
+	},
+	{
+		.in = { 30, -1 },
+		.match = 30,
+		.mout = 1,
+		.delete = 30,
+		.peer = &peer,
+	},
+	{ /* 55 */
+		.in = { 30, -1 },
+		.match = 30,
+		.mout = 1,
+		.delete = 30,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 30, -1 },
+		.match = 30,
+		.mout = 1,
+		.delete = 30,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 38, -1 },
+		.match = 30,
+		.mout = 1,
+		.peer = &peer,
+	},
+	{
+		.in = { 38, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 38, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{ /* 60 */
+		.in = { 39, -1 },
+		.match = 30,
+		.mout = 1,
+		.peer = &peer,
+	},
+	{
+		.in = { 39, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 39, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 40, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 40, -1 },
+		.match = 30,
+		.mout = 1,
+		.peer = &peer_l4,
+	},
+	{ /* 65 */
+		.in = { 40, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer_r4,
+	},
+	{
+		.in = { 41, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer,
+	},
+	{
+		.in = { 41, -1 },
+		.match = 30,
+		.mout = 0,
+		.peer = &peer_l4,
+	},
+	{
+		.in = { 41, -1 },
+		.match = 30,
+		.mout = 1,
+		.peer = &peer_r4,
+	},
 };
+