Commit d4a7726a authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

selftests: mptcp: add port argument for pm_nl_ctl 



This patch adds a new argument for pm_nl_ctl tool. We can use it like
this:

 # pm_nl_ctl add 10.0.2.1 flags signal port 10100
 # pm_nl_ctl dump
 id 1 flags signal 10.0.2.1 10100

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a77e9179

tools/testing/selftests/net/mptcp/pm_nl_ctl.c

+22 −2
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ int add_addr(int fd, int pm_family, int argc, char *argv[]) 
		  1024];

	struct rtattr *rta, *nest;

	struct nlmsghdr *nh;

	u_int32_t flags = 0;

	u_int16_t family;

	u_int32_t flags;

	int nest_start;

	u_int8_t id;

	int off = 0;
@@ -224,7 +224,6 @@ int add_addr(int fd, int pm_family, int argc, char *argv[]) 
			char *tok, *str;



			/* flags */

			flags = 0;

			if (++arg >= argc)

				error(1, 0, " missing flags value");
@@ -272,6 +271,20 @@ int add_addr(int fd, int pm_family, int argc, char *argv[]) 
			rta->rta_len = RTA_LENGTH(4);

			memcpy(RTA_DATA(rta), &ifindex, 4);

			off += NLMSG_ALIGN(rta->rta_len);

		} else if (!strcmp(argv[arg], "port")) {

			u_int16_t port;



			if (++arg >= argc)

				error(1, 0, " missing port value");

			if (!(flags & MPTCP_PM_ADDR_FLAG_SIGNAL))

				error(1, 0, " flags must be signal when using port");



			port = atoi(argv[arg]);

			rta = (void *)(data + off);

			rta->rta_type = MPTCP_PM_ADDR_ATTR_PORT;

			rta->rta_len = RTA_LENGTH(2);

			memcpy(RTA_DATA(rta), &port, 2);

			off += NLMSG_ALIGN(rta->rta_len);

		} else

			error(1, 0, "unknown keyword %s", argv[arg]);

	}
@@ -324,6 +337,7 @@ int del_addr(int fd, int pm_family, int argc, char *argv[]) 
static void print_addr(struct rtattr *attrs, int len)

{

	uint16_t family = 0;

	uint16_t port = 0;

	char str[1024];

	uint32_t flags;

	uint8_t id;
@@ -331,12 +345,16 @@ static void print_addr(struct rtattr *attrs, int len) 
	while (RTA_OK(attrs, len)) {

		if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_FAMILY)

			memcpy(&family, RTA_DATA(attrs), 2);

		if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_PORT)

			memcpy(&port, RTA_DATA(attrs), 2);

		if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_ADDR4) {

			if (family != AF_INET)

				error(1, errno, "wrong IP (v4) for family %d",

				      family);

			inet_ntop(AF_INET, RTA_DATA(attrs), str, sizeof(str));

			printf("%s", str);

			if (port)

				printf(" %d", port);

		}

		if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_ADDR6) {

			if (family != AF_INET6)
@@ -344,6 +362,8 @@ static void print_addr(struct rtattr *attrs, int len) 
				      family);

			inet_ntop(AF_INET6, RTA_DATA(attrs), str, sizeof(str));

			printf("%s", str);

			if (port)

				printf(" %d", port);

		}

		if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_ID) {

			memcpy(&id, RTA_DATA(attrs), 1);