consolidate kdbus_cmd_{bus,ep,ns}_make structs

While at it, make the bloom_size struct member a kdbus item.

6 files changed, 101 insertions, 24 deletions

diff --git a/test/test-kdbus-activator.c b/test/test-kdbus-activator.c
index d5d5f319eed..6d4ac61b0a6 100644
--- a/test/test-kdbus-activator.c
+++ b/test/test-kdbus-activator.c
@@ -69,7 +69,14 @@ static struct conn *make_activator(const char *path, const char *name)
 int main(int argc, char *argv[])
 {
 	struct {
-		struct kdbus_cmd_bus_make head;
+		struct kdbus_cmd_make head;
+
+		/* bloom size item */
+		struct {
+			uint64_t size;
+			uint64_t type;
+			uint64_t bloom_size;
+		} bs;
 
 		/* name item */
 		uint64_t n_size;
@@ -90,13 +97,16 @@ int main(int argc, char *argv[])
 	}
 
 	memset(&bus_make, 0, sizeof(bus_make));
-	bus_make.head.bloom_size = 64;
+	bus_make.bs.size = sizeof(bus_make.bs);
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+	bus_make.bs.bloom_size = 64;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
 
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
+			     sizeof(bus_make.bs) +
 			     bus_make.n_size;
 
 	printf("-- creating bus '%s'\n", bus_make.name);
diff --git a/test/test-kdbus-benchmark.c b/test/test-kdbus-benchmark.c
index c4967daf10d..daa11dddb31 100644
--- a/test/test-kdbus-benchmark.c
+++ b/test/test-kdbus-benchmark.c
@@ -205,7 +205,14 @@ handle_echo_reply(struct conn *conn)
 int main(int argc, char *argv[])
 {
 	struct {
-		struct kdbus_cmd_bus_make head;
+		struct kdbus_cmd_make head;
+
+		/* bloom size item */
+		struct {
+			uint64_t size;
+			uint64_t type;
+			uint64_t bloom_size;
+		} bs;
 
 		/* name item */
 		uint64_t n_size;
@@ -231,13 +238,16 @@ int main(int argc, char *argv[])
 	}
 
 	memset(&bus_make, 0, sizeof(bus_make));
-	bus_make.head.bloom_size = 64;
+	bus_make.bs.size = sizeof(bus_make.bs);
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+	bus_make.bs.bloom_size = 64;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
 
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
+			     sizeof(bus_make.bs) +
 			     bus_make.n_size;
 
 	printf("-- creating bus '%s'\n", bus_make.name);
diff --git a/test/test-kdbus-chat.c b/test/test-kdbus-chat.c
index 00980b85b51..ef61c8db571 100644
--- a/test/test-kdbus-chat.c
+++ b/test/test-kdbus-chat.c
@@ -17,7 +17,14 @@
 int main(int argc, char *argv[])
 {
 	struct {
-		struct kdbus_cmd_bus_make head;
+		struct kdbus_cmd_make head;
+
+		/* bloom size item */
+		struct {
+			uint64_t size;
+			uint64_t type;
+			uint64_t bloom_size;
+		} bs;
 
 		/* name item */
 		uint64_t n_size;
@@ -39,13 +46,16 @@ int main(int argc, char *argv[])
 	}
 
 	memset(&bus_make, 0, sizeof(bus_make));
-	bus_make.head.bloom_size = 64;
+	bus_make.bs.size = sizeof(bus_make.bs);
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+	bus_make.bs.bloom_size = 64;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
 
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
+			     sizeof(bus_make.bs) +
 			     bus_make.n_size;
 
 	printf("-- creating bus '%s'\n", bus_make.name);
diff --git a/test/test-kdbus-daemon.c b/test/test-kdbus-daemon.c
index fa7058858a3..f010ab051a3 100644
--- a/test/test-kdbus-daemon.c
+++ b/test/test-kdbus-daemon.c
@@ -18,7 +18,15 @@
 int main(int argc, char *argv[])
 {
 	struct {
-		struct kdbus_cmd_bus_make head;
+		struct kdbus_cmd_make head;
+
+		/* bloom size item */
+		struct {
+			uint64_t size;
+			uint64_t type;
+			uint64_t bloom_size;
+		} bs;
+
 		uint64_t n_size;
 		uint64_t n_type;
 		char name[64];
@@ -39,13 +47,16 @@ int main(int argc, char *argv[])
 	}
 
 	memset(&bus_make, 0, sizeof(bus_make));
-	bus_make.head.bloom_size = 64;
+	bus_make.bs.size = sizeof(bus_make.bs);
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+	bus_make.bs.bloom_size = 64;
 
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-testbus", getuid());
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
 
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) +
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
+			     sizeof(bus_make.bs) +
 			     bus_make.n_size;
 
 	ret = ioctl(fd_owner, KDBUS_CMD_BUS_MAKE, &bus_make);
diff --git a/test/test-kdbus-fuzz.c b/test/test-kdbus-fuzz.c
index a1a7564c3d2..3536a2d2558 100644
--- a/test/test-kdbus-fuzz.c
+++ b/test/test-kdbus-fuzz.c
@@ -80,7 +80,18 @@ static void add_fd(int fd)
 static int make_bus(void)
 {
 	struct {
-		struct kdbus_cmd_bus_make head;
+		struct kdbus_cmd_make head;
+
+		/* bloom size item */
+		struct {
+			uint64_t size;
+			uint64_t type;
+			uint64_t bloom_size;
+		} bs;
+
+		/* name item */
+		uint64_t n_size;
+		uint64_t n_type;
 		char name[64];
 	} bus_make;
 	char name[10];
@@ -105,8 +116,11 @@ static int make_bus(void)
 	memset(&bus_make, 0, sizeof(bus_make));
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-%s", getuid(), name);
 	bus_make.head.flags = KDBUS_MAKE_ACCESS_WORLD;
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + strlen(bus_make.name) + 1;
-	bus_make.head.bloom_size = 64;
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) + strlen(bus_make.name) + 1;
+
+	bus_make.bs.size = sizeof(bus_make.bs);
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+	bus_make.bs.bloom_size = 64;
 
 	printf("-- creating bus '%s'\n", bus_make.name);
 	ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, &bus_make);
diff --git a/test/test-kdbus.c b/test/test-kdbus.c
index 27fb46161a3..7e8aa670fce 100644
--- a/test/test-kdbus.c
+++ b/test/test-kdbus.c
@@ -258,7 +258,7 @@ static int check_nsmake(struct kdbus_check_env *env)
 {
 	int fd, fd2;
 	struct {
-		struct kdbus_cmd_ns_make head;
+		struct kdbus_cmd_make head;
 
 		/* name item */
 		uint64_t n_size;
@@ -277,7 +277,7 @@ static int check_nsmake(struct kdbus_check_env *env)
 	/* create a new namespace */
 	snprintf(ns_make.name, sizeof(ns_make.name), "blah");
 	ns_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(ns_make.name) + 1;
-	ns_make.head.size = sizeof(struct kdbus_cmd_ns_make) + ns_make.n_size;
+	ns_make.head.size = sizeof(struct kdbus_cmd_make) + ns_make.n_size;
 	ret = ioctl(fd, KDBUS_CMD_NS_MAKE, &ns_make);
 	if (ret < 0 && errno == EPERM)
 		return CHECK_SKIP;
@@ -306,7 +306,14 @@ static int check_nsmake(struct kdbus_check_env *env)
 static int check_busmake(struct kdbus_check_env *env)
 {
 	struct {
-		struct kdbus_cmd_bus_make head;
+		struct kdbus_cmd_make head;
+
+		/* bloom size item */
+		struct {
+			uint64_t size;
+			uint64_t type;
+			uint64_t bloom_size;
+		} bs;
 
 		/* name item */
 		uint64_t n_size;
@@ -320,7 +327,10 @@ static int check_busmake(struct kdbus_check_env *env)
 	ASSERT_RETURN(env->control_fd >= 0);
 
 	memset(&bus_make, 0, sizeof(bus_make));
-	bus_make.head.bloom_size = 64;
+
+	bus_make.bs.size = sizeof(bus_make.bs);
+	bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+	bus_make.bs.bloom_size = 64;
 
 	bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 
@@ -328,7 +338,7 @@ static int check_busmake(struct kdbus_check_env *env)
 	/* check some illegal names */
 	snprintf(bus_make.name, sizeof(bus_make.name), "foo");
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + bus_make.n_size;
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) + bus_make.n_size;
 	ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);
 	ASSERT_RETURN(ret == -1 && errno == EINVAL);
 #endif
@@ -336,7 +346,9 @@ static int check_busmake(struct kdbus_check_env *env)
 	/* create a new bus */
 	snprintf(bus_make.name, sizeof(bus_make.name), "%u-blah", getuid());
 	bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
-	bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + bus_make.n_size;
+	bus_make.head.size = sizeof(struct kdbus_cmd_make) +
+			     sizeof(uint64_t) * 3 +
+			     bus_make.n_size;
 	ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);
 	ASSERT_RETURN(ret == 0);
 	snprintf(s, sizeof(s), "/dev/kdbus/%u-blah/bus", getuid());
@@ -651,7 +663,14 @@ static int check_prepare_env(const struct kdbus_check *c, struct kdbus_check_env
 {
 	if (c->flags & CHECK_CREATE_BUS) {
 		struct {
-			struct kdbus_cmd_bus_make head;
+			struct kdbus_cmd_make head;
+
+			/* bloom size item */
+			struct {
+				uint64_t size;
+				uint64_t type;
+				uint64_t bloom_size;
+			} bs;
 
 			/* name item */
 			uint64_t n_size;
@@ -666,7 +685,9 @@ static int check_prepare_env(const struct kdbus_check *c, struct kdbus_check_env
 		ASSERT_RETURN(env->control_fd >= 0);
 
 		memset(&bus_make, 0, sizeof(bus_make));
-		bus_make.head.bloom_size = 64;
+		bus_make.bs.size = sizeof(bus_make.bs);
+		bus_make.bs.type = KDBUS_ITEM_BLOOM_SIZE;
+		bus_make.bs.bloom_size = 64;
 
 		for (i = 0; i < sizeof(n); i++)
 			n[i] = 'a' + (random() % ('z' - 'a'));
@@ -676,7 +697,8 @@ static int check_prepare_env(const struct kdbus_check *c, struct kdbus_check_env
 		bus_make.n_type = KDBUS_ITEM_MAKE_NAME;
 		bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
 
-		bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) +
+		bus_make.head.size = sizeof(struct kdbus_cmd_make) +
+				     sizeof(bus_make.bs) +
 				     bus_make.n_size;
 
 		ret = ioctl(env->control_fd, KDBUS_CMD_BUS_MAKE, &bus_make);