Simplify network setup + fix some multicast network stress tests

Signed-off-by Petr Vorel <[email protected]>

---
 testcases/lib/test_net.sh | 66 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

...

testcases/lib/test_net.sh +22 -0

+
+	[ "$TST_IPV6" ] && max_net_id=65535 || max_net_id=255
+
+	if [ $# -eq 0 -o "$1" = "lhost" -o "$1" = "rhost" ]; then
+		[ -z "$counter" ] && counter=1
+		[ $counter -lt 1 ] && counter=1
+		type="${1:-lhost}"
+		max_host_id=$((max_net_id - 1))
+		tmp=$((counter * 2))
+		[ "$type" = "rhost" ] && tmp=$((tmp - 1))
+
+		host_id=$((tmp % max_host_id))
+		net_id=$((tmp / max_host_id))
+
+		if [ $host_id -eq 0 ]; then
+			host_id=$max_host_id
+			net_id=$((net_id - 1))
+		fi
+	else
+		net_id="$1"
+		host_id="${2:-0}"
+		max_host_id=$max_net_id

+ use it in interface stress tests

test_net_stress.sh:
* test_net_stress.sh library is intended to be used throughout all stress tests reduce duplicity and use code from test_net.sh where possible instead of legacy scripts in testcases/network/stress/ns-tools/.
* TCID set automatically from basename.
* Add "unused network" related variables. So far used only IPv4 ones.
* Functions from if-lib.sh moved and (and some renamed) to test_net_stress.sh as they are going to be reused in other tests (not just interface stress tests).

Interfaces stress tests:
* Interfaces tests use test_net_stress.sh.
* Remove restore_ipaddr from cleanup functions as these functions would break netns testing with RTNETLINK errors. Use them just in setup during if-mtu-change where are really needed.

testcases/network/stress/interface/if-mtu-change +0 -3

index 637fa6389..03e6ba9d6 100644
@@ -18,9 +18,6 @@
 # Author: Mitsuru Chinen <[email protected]>
 
 TST_TOTAL=2
-TCID=if-mtu-change
-
-. if-lib.sh
 
 TST_CLEANUP="do_cleanup"
 

testcases/network/stress/ns-tools/test_net_stress.sh line 45

Quoted 6 lines

testcases/network/stress/ns-tools/test_net_stress.sh new file +6 -0

+LINK_TOTAL=$(echo $LHOST_HWADDRS | wc -w)
+RHOST_LINK_TOTAL=$(echo $RHOST_HWADDRS | wc -w)
+[ $LINK_TOTAL -ne $RHOST_LINK_TOTAL ] && \
+	tst_brkm TBROK "the number of element in LHOST_HWADDRS differs from RHOST_HWADDRS" \
+	"($LINK_TOTAL vs. $RHOST_LINK_TOTAL," \
+	"LHOST_HWADDRS: '$LHOST_HWADDRS' RHOST_HWADDRS: '$RHOST_HWADDRS')"

Didn't find the place where you need these variables. Are you going to use them somewhere or they are here just for checking network configuration? I've removed them and applied the patch.

Signed-off-by Petr Vorel <[email protected]>

---
 testcases/network/stress/interface/if-addr-adddel    | 6 +-----
 testcases/network/stress/interface/if-addr-addlarge  | 6 +-----
 testcases/network/stress/interface/if-mtu-change     | 7 ++-----
 testcases/network/stress/interface/if-route-adddel   | 7 ++-----
 testcases/network/stress/interface/if-route-addlarge | 6 +-----
 testcases/network/stress/ns-tools/test_net_stress.sh | 2 ++
 6 files changed, 9 insertions(+), 25 deletions(-)

Values reduced to one fifth resp. one tenth should be still enough even for stress testing.

Signed-off-by Petr Vorel <[email protected]>

---
 testcases/lib/test_net.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

testcases/lib/test_net.sh +5 -5

index b23c35553..f72e4755f 100644
@@ -614,20 +614,20 @@ export FTP_UPLOAD_DIR="${FTP_UPLOAD_DIR:-/var/ftp/pub}"
 export FTP_UPLOAD_URLDIR="${FTP_UPLOAD_URLDIR:-pub}"
 
 # network/stress tests require additional parameters
-export NS_DURATION="${NS_DURATION:-3600}"
-export NS_TIMES="${NS_TIMES:-10000}"
+export NS_DURATION="${NS_DURATION:-720}"
+export NS_TIMES="${NS_TIMES:-2000}"
 export CONNECTION_TOTAL="${CONNECTION_TOTAL:-4000}"
-export IP_TOTAL="${IP_TOTAL:-10000}"
+export IP_TOTAL="${IP_TOTAL:-2000}"
 export IP_TOTAL_FOR_TCPIP="${IP_TOTAL_FOR_TCPIP:-100}"
-export ROUTE_TOTAL="${ROUTE_TOTAL:-10000}"
+export ROUTE_TOTAL="${ROUTE_TOTAL:-2000}"
 export MTU_CHANGE_TIMES="${MTU_CHANGE_TIMES:-1000}"
-export IF_UPDOWN_TIMES="${IF_UPDOWN_TIMES:-10000}"
+export IF_UPDOWN_TIMES="${IF_UPDOWN_TIMES:-2000}"

* Fix test for SSH and netns based testing.
* Remove hardcoded rsh dependency.
* Create shell library mcast4-lib.sh (multicast IPv4 specific) to reduce duplicity in tests. Library uses test_stress_net.sh (and therefore test_net.sh).
* Cleanup code + fixed typos.

Signed-off-by Petr Vorel <[email protected]>

---
Although it's easy to convert these tests to handle both IPv4 and IPv6 I'll do it in a next patch-set.

---
 .../stress/multicast/grp-operation/mcast4-grpope01 | 221 ++-----------------
 .../stress/multicast/grp-operation/mcast4-grpope02 | 230 ++------------------
 .../stress/multicast/grp-operation/mcast4-grpope03 | 217 ++-----------------
 .../stress/multicast/grp-operation/mcast4-grpope04 | 236 ++-------------------
 .../stress/multicast/grp-operation/mcast4-lib.sh   | 118 +++++++++++
 5 files changed, 196 insertions(+), 826 deletions(-)
 create mode 100644 testcases/network/stress/multicast/grp-operation/mcast4-lib.sh

...

testcases/network/stress/multicast/grp-operation/mcast4-grpope04 +5 -7

-
-#-----------------------------------------------------------------------
-#
-# Clean up
-#
+. mcast4-lib.sh
 
-tst_resm TPASS "Test is finished successfully."
+tst_resm TINFO "joining and leaving the same IPv4 multicast group with a different source filters on $MCASTNUM_NORMAL sockets in $NS_TIMES times"
 
-exit 0
+mcast_setup $MCASTNUM_NORMAL
+do_multicast_test_join_leave true
+tst_exit

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh new file +98 -0

new file mode 100644
index 000000000..b3ef44baa
@@ -0,0 +1,118 @@
+#!/bin/sh
+# Copyright (c) International Business Machines  Corp., 2006
+# Copyright (c) 2017 Petr Vorel <[email protected]>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Petr Vorel <[email protected]>
+#
+# Setup script for mcast4-grpope* tests.
+
+TST_TOTAL=1
+TST_CLEANUP="mcast_cleanup"
+
+. test_net_stress.sh
+
+mcast_setup()
+{
+	local igmp_max_memberships="$1"
+	local increase_max="${2:-}"
+
+	netstress_setup
+	tst_tmpdir
+
+	SYSFS_IGMP_MAX_MEMBERSHIPS=$(sysctl -b net.ipv4.igmp_max_memberships)
+	SYSFS_IGMP_MAX_MSF=$(sysctl -b net.ipv4.igmp_max_msf)
+	SYSFS_FORCE_IGMP_VERSION=$(sysctl -b net.ipv4.conf.$(tst_iface).force_igmp_version)
+	SYSFS_ALL_FORCE_IGMP_VERSION=$(sysctl -b net.ipv4.conf.all.force_igmp_version)
+
+	if [ "$increase_max" = "true" ]; then
+		# Increase the maximum number of open file descriptors
+		[ $(ulimit -n) -lt $igmp_max_memberships ] && ROD ulimit -n $igmp_max_memberships
+	fi
+
+	ROD sysctl -qw net.ipv4.igmp_max_memberships=$igmp_max_memberships
+	ROD sysctl -qw net.ipv4.igmp_max_msf=10
+	ROD sysctl -qw net.ipv4.conf.$(tst_iface).force_igmp_version=0
+	ROD sysctl -qw net.ipv4.conf.all.force_igmp_version=0
+}
+
+mcast_cleanup()
+{
+	[ -n "$SYSFS_IGMP_MAX_MEMBERSHIPS" ] && sysctl -qw net.ipv4.igmp_max_memberships=$SYSFS_IGMP_MAX_MEMBERSHIPS
+	[ -n "$SYSFS_IGMP_MAX_MSF" ] && sysctl -qw net.ipv4.igmp_max_msf=$SYSFS_IGMP_MAX_MSF
+	[ -n "$SYSFS_FORCE_IGMP_VERSION" ] && sysctl -qw net.ipv4.conf.$(tst_iface).force_igmp_version=$SYSFS_FORCE_IGMP_VERSION
+	[ -n "$SYSFS_ALL_FORCE_IGMP_VERSION" ] && sysctl -qw net.ipv4.conf.all.force_igmp_version=$SYSFS_ALL_FORCE_IGMP_VERSION
+
+	pkill -SIGHUP -x ns-mcast_join
+	tst_sleep 10ms
+	pkill -9 -x ns-mcast_join
+
+	tst_rhost_run -c "pkill -SIGHUP -x ns-igmp_querier"
+
+	restore_ipaddr
+	restore_ipaddr rhost
+}
+
+do_multicast_test_multiple_join()
+{
+	local igmp_max_memberships="$1"
+	local param_multi_socket ret tmpfile
+
+	[ "${2:-}" = true ] && param_multi_socket="-m"
+
+	# Run a multicast join tool
+	tmpfile=ns-mcast_join.$$
+
+	EXPECT_PASS ns-mcast_join $param_multi_socket -f 4 -I $(tst_iface) -n $igmp_max_memberships -p $MCAST_IPV4_ADDR_PREFIX \> $tmpfile
+
+	tst_resm TINFO "joined $(grep groups $tmpfile)"
+
+	# Send IGMP General Query from the remote host
+	EXPECT_RHOST_PASS ns-igmp_querier -I $(tst_iface rhost) -o -r 1 -m $MCAST_IPV4_ADDR
+}
+
+do_multicast_test_join_leave()
+{
+	local cnt define_src_addr filter params ret src_addr x y
+
+	[ "$1" = true ] && define_src_addr=true
+
+	# Send IGMP General Query from the remote host
+	tst_rhost_run -s -c "ns-igmp_querier -I $(tst_iface rhost) -i 1000000000 -r 1 -b"
+
+	# Run a multicast join tool
+	cnt=0
+	while [ $cnt -lt $NS_TIMES ]; do
+		if [ "$define_src_addr" ]; then

Quoted 1 line

+++ b/testcases/network/stress/multicast/grp-operation/mcast4-lib.sh

Quoted 4 lines

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh new file +4 -0

+do_multicast_test_join_leave()
+{
+	local cnt define_src_addr filter params ret src_addr x y
+

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh line 97

Quoted 8 lines

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh new file +8 -0

+	[ "$1" = true ] && define_src_addr=true
+
+	# Send IGMP General Query from the remote host
+	tst_rhost_run -s -c "ns-igmp_querier -I $(tst_iface rhost) -i 1000000000 -r 1 -b"
+
+	# Run a multicast join tool
+	cnt=0
+	while [ $cnt -lt $NS_TIMES ]; do

Quoted 6 lines

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh new file +6 -0

+		if [ "$define_src_addr" ]; then
+			x=$(($cnt / 254))
+			y=$(($cnt % 254 + 1))
+			if [ $x -gt 254 ]; then
+				tst_resm TINFO "the number of the connection is less than $cnt"
+				break

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh line 108

Quoted 5 lines

testcases/network/stress/multicast/grp-operation/mcast4-lib.sh new file +5 -0

+			fi
+			src_addr=$(tst_ipaddr_un $x $y)
+
+			[ $((cnt % 5)) -ne 2 ] && filter="include" || filter="exclude"
+			params="-F $filter -s $src_addr"

Why not params="-F $filter -s $(tst_ipaddr_un -c$cnt)"?

New tools:
* tst_net_ip_prefix
Strip prefix from IP address and save both
If no prefix found sets default prefix.

* tst_net_iface_prefix
tst_net_iface_prefix reads prefix and interface from rtnetlink.

* tst_net_vars takes input of local and remote address and setup most of test link (IP related) environment variables.

NOTABLE CHANGES IN ENVIRONMENT VARIABLES:
Network variables are defined for both local and remote:
IPV4_NETWORK was replaced by IPV4_LNETWORK and IPV4_RNETWORK IPV6_NETWORK was replaced by IPV6_LNETWORK and IPV6_RNETWORK

NEW VARIABLES:
IPV4_LHOST, IPV4_RHOST, IPV4_LNETMASK, IPV4_RNETMASK, IPV4_LPREFIX, IPV4_RPREFIX, IPV6_LHOST, IPV6_RHOST, IPV6_LNETMASK, IPV6_RNETMASK, IPV6_LPREFIX, IPV6_RPREFIX,

For full list of environment variables which tools setup run:
tst_net_ip_prefix -h
tst_net_iface_prefix -h
tst_net_vars -h

Thanks a lot to Alexey Kodanev who reviewed many versions of this patch and give feedback and pointed out errors, as well as to Cyril Hrubis who reviewed orignal version of tst_net_vars.c.

Signed-off-by Petr Vorel <[email protected]>

---
 include/tst_net.h                    | 153 +++++++++
 testcases/lib/.gitignore             |   3 +
 testcases/lib/Makefile               |   2 +-
 testcases/lib/tst_net_iface_prefix.c | 180 ++++++++++
 testcases/lib/tst_net_ip_prefix.c    | 123 +++++++
 testcases/lib/tst_net_vars.c         | 645 +++++++++++++++++++++++++++++++++++
 6 files changed, 1105 insertions(+), 1 deletion(-)
 create mode 100644 include/tst_net.h
 create mode 100644 testcases/lib/tst_net_iface_prefix.c
 create mode 100644 testcases/lib/tst_net_ip_prefix.c
 create mode 100644 testcases/lib/tst_net_vars.c

include/tst_net.h new file +153 -0

new file mode 100644
index 000000000..cb97b7b61
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2017 Petr Vorel <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <arpa/inet.h>
+#include <errno.h>
+
+#define MAX_IPV4_PREFIX 32
+#define MAX_IPV6_PREFIX 128
+
+#define tst_res_comment(...) { \
+	fprintf(stderr, "# "); \
+	tst_res(__VA_ARGS__); } \
+
+
+#define tst_brk_comment(...) { \
+	fprintf(stderr, "# "); \
+	tst_brk(TCONF, __VA_ARGS__); } \
+
+static inline void print_svar(const char *name, const char *val)
+{
+	if (name && val)
+		printf("export %s=\"%s\"\n", name, val);
+}
+
+static inline void print_svar_change(const char *name, const char *val)
+{
+	if (name && val)
+		printf("export %s=\"${%s:-%s}\"\n", name, name, val);
+}
+
+/*
+ * Function bit_count is from ipcalc project, ipcalc.c.
+ */
+static int bit_count(uint32_t i)
+{
+	int c = 0;
+	unsigned int seen_one = 0;
+
+	while (i > 0) {
+		if (i & 1) {
+			seen_one = 1;
+			c++;
+		} else {
+			if (seen_one)
+				return -1;
+		}
+		i >>= 1;
+	}
+
+	return c;
+}
+
+/*
+ * Function mask2prefix is from ipcalc project, ipcalc.c.
+ */
+static int mask2prefix(struct in_addr mask)
+{
+	return bit_count(ntohl(mask.s_addr));
+}
+
+/*
+ * Function ipv4_mask_to_int is from ipcalc project, ipcalc.c.
+ */
+static int ipv4_mask_to_int(const char *prefix)
+{
+	int ret;
+	struct in_addr in;
+
+	ret = inet_pton(AF_INET, prefix, &in);
+	if (ret == 0)
+		return -1;
+
+	return mask2prefix(in);
+}
+
+/*
+ * Function safe_atoi is from ipcalc project, ipcalc.c.
+ */
+static int safe_atoi(const char *s, int *ret_i)
+{
+	char *x = NULL;
+	long l;
+
+	errno = 0;
+	l = strtol(s, &x, 0);
+
+	if (!x || x == s || *x || errno)
+		return errno > 0 ? -errno : -EINVAL;
+
+	if ((long)(int)l != l)
+		return -ERANGE;
+
+	*ret_i = (int)l;
+
+	return 0;
+}
+
+/*
+ * Function get_prefix use code from ipcalc project, str_to_prefix/ipcalc.c.
+ */
+static int get_prefix(const char *ip_str, int is_ipv6)
+{
+	char *prefix_str = NULL;
+	int prefix = -1, r;
+
+	prefix_str = strchr(ip_str, '/');
+	if (!prefix_str)
+		return -1;
+
+	*(prefix_str++) = '\0';
+
+	if (!is_ipv6 && strchr(prefix_str, '.'))
+		prefix = ipv4_mask_to_int(prefix_str);
+	else {
+		r = safe_atoi(prefix_str, &prefix);
+		if (r != 0)
+			tst_brk_comment("conversion error: '%s' is not integer",
+					prefix_str);
+	}
+
+	if (prefix < 0 || ((is_ipv6 && prefix > MAX_IPV6_PREFIX) ||
+		(!is_ipv6 && prefix > MAX_IPV4_PREFIX)))
+		tst_brk_comment("bad %s prefix: %s", is_ipv6 ?  "IPv6" : "IPv4",
+				prefix_str);
+
+	return prefix;
+}
+
+static void get_in_addr(const char *ip_str, struct in_addr *ip)
+{
+	if (inet_pton(AF_INET, ip_str, ip) <= 0)
+		tst_brk_comment("bad IPv4 address: '%s'", ip_str);
+}
+
+static void get_in6_addr(const char *ip_str, struct in6_addr *ip6)
+{
+	if (inet_pton(AF_INET6, ip_str, ip6) <= 0)
+		tst_brk_comment("bad IPv6 address: '%s'", ip_str);
+}

testcases/lib/.gitignore +3 -0

index 522889bed..f36ed99fa 100644
@@ -4,3 +4,6 @@
 /tst_rod
 /tst_kvcmp
 /tst_device
+/tst_net_iface_prefix
+/tst_net_ip_prefix
+/tst_net_vars

testcases/lib/Makefile +1 -1

index 1127a59fe..398150ae0 100644
@@ -27,6 +27,6 @@ include $(top_srcdir)/include/mk/testcases.mk
 INSTALL_TARGETS		:= *.sh
 
 MAKE_TARGETS		:= tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\
-			   tst_device
+			   tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/lib/tst_net_iface_prefix.c new file +23 -0

new file mode 100644
index 000000000..c5cc61a0b
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2017 Petr Vorel <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/rtnetlink.h>
+#include <net/if.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define TST_NO_DEFAULT_MAIN

testcases/lib/tst_net_iface_prefix.c new file +6 -0

+
+static void usage(const char *cmd)
+{
+	fprintf(stderr, "USAGE:\n"
+		"%s IPV4_LHOST/IPV4_LPREFIX\n"
+		"%s -r IPV4_RHOST/IPV4_RPREFIX\n"

testcases/lib/tst_net_iface_prefix.c new file +70 -0

+		"EXPORTED VARIABLES:\n"
+		"Export one of following variables:\n"
+		"Export one of following variables:\n"
+		"IPV4_LPREFIX: IPv4 prefix for IPV4_LNETWORK\n"
+		"IPV4_RPREFIX: IPv4 prefix for IPV4_RNETWORK\n"
+		"IPV6_LPREFIX: IPv6 prefix for IPV6_LNETWORK\n"
+		"IPV6_RPREFIX: IPv6 prefix for IPV6_RNETWORK\n"
+		"Export one of following variables (if found):\n"
+		"LHOST_IFACES: iface name of the local host (*)\n"
+		"RHOST_IFACES: iface name of the remote host (*)\n\n"
+		"(*): respect user settings\n"
+		"Iface (LHOST_IFACES, RHOST_IFACES) as user might want to use more ifaces.\n\n"
+		"PARAMS:\n"
+		"-h this help\n"
+		"-r export remote environment variables\n",
+		cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd);
+}
+
+static int read_iface_prefix(const char *ip_str, int is_ipv6)
+{
+	uint8_t family = is_ipv6 ? AF_INET6 : AF_INET;
+
+	char buf[16384];
+	int len;
+
+	struct {
+		struct nlmsghdr nlhdr;
+		struct ifaddrmsg addrmsg;
+	} msg;
+
+	struct nlmsghdr *retmsg;
+
+	int sock = SAFE_SOCKET(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+
+	memset(&msg, 0, sizeof(msg));
+	msg.nlhdr.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
+	msg.nlhdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_ROOT;
+	msg.nlhdr.nlmsg_type = RTM_GETADDR;
+	msg.addrmsg.ifa_family = family;
+
+	SAFE_SEND(1, sock, &msg, msg.nlhdr.nlmsg_len, 0);
+	len = recv(sock, buf, sizeof(buf), 0);
+	retmsg = (struct nlmsghdr *)buf;
+
+	while NLMSG_OK(retmsg, len) {
+		char ifname[IFNAMSIZ];
+		struct ifaddrmsg *retaddr;
+		struct rtattr *retrta;
+		char pradd[128];
+		int attlen;
+
+		retaddr = (struct ifaddrmsg *)NLMSG_DATA(retmsg);
+		retrta = (struct rtattr *)IFA_RTA(retaddr);
+		attlen = IFA_PAYLOAD(retmsg);
+
+		while RTA_OK(retrta, attlen) {
+			if (retrta->rta_type == IFA_ADDRESS) {
+				inet_ntop(family, RTA_DATA(retrta), pradd,
+					  sizeof(pradd));
+
+				if_indextoname(retaddr->ifa_index, ifname);
+
+				if (!strcmp(pradd, ip_str)) {
+					vars.prefix = retaddr->ifa_prefixlen;
+					vars.ifname = strdup(ifname);
+					return 0;
+				}
+			}
+			retrta = RTA_NEXT(retrta, attlen);
+		}

testcases/lib/tst_net_iface_prefix.c new file +51 -0

+}
+
+int main(int argc, char *argv[])
+{
+	char *ip_str = NULL, *prefix_str = NULL;
+	int is_ipv6, is_rhost = 0;
+	struct in_addr ip;
+	struct in6_addr ip6;
+
+	int is_usage = argc > 1 && (!strcmp(argv[1], "-h") ||
+		!strcmp(argv[1], "--help"));
+	if (argc < 2 || is_usage) {
+		usage(argv[0]);
+		exit(is_usage ? EXIT_SUCCESS : EXIT_FAILURE);
+	}
+	if (!strcmp(argv[1], "-r"))
+		is_rhost = 1;
+
+	ip_str = argv[is_rhost ? 2 : 1];
+	is_ipv6 = !!strchr(ip_str, ':');
+
+	prefix_str = strchr(ip_str, '/');
+	if (prefix_str) {
+		vars.prefix = get_prefix(ip_str, is_ipv6);
+		tst_res_comment(TINFO,
+			"IP address '%s' contains prefix %d, using it and don't search for iface.\n",
+			ip_str, vars.prefix);
+	} else if (read_iface_prefix(ip_str, is_ipv6)) {
+		tst_res_comment(TINFO,
+			"prefix and interface not found for '%s'.\n", ip_str);
+		exit(EXIT_SUCCESS);
+	}
+
+	/* checks for validity of IP string */
+	if (is_ipv6)
+		get_in6_addr(ip_str, &ip6);
+	else
+		get_in_addr(ip_str, &ip);
+
+	if (is_ipv6) {
+		print_svar_change("LHOST_IFACES", vars.ifname);
+		print_ivar(is_rhost ? "IPV6_RPREFIX" : "IPV6_LPREFIX",
+			vars.prefix);
+	} else {
+		print_svar_change("RHOST_IFACES", vars.ifname);
+		print_ivar(is_rhost ? "IPV4_RPREFIX" : "IPV4_LPREFIX",
+			vars.prefix);
+	}
+
+	exit(EXIT_SUCCESS);
+}

testcases/lib/tst_net_ip_prefix.c new file +25 -0

new file mode 100644
index 000000000..6654f75a9
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2017 Petr Vorel <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/rtnetlink.h>
+#include <net/if.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
+

testcases/lib/tst_net_ip_prefix.c new file +5 -0

+
+static void usage(const char *cmd)
+{
+	fprintf(stderr, "USAGE:\n"
+		"%s IPV4_LHOST/IPV4_LPREFIX\n"

New tools:
* tst_net_ip_prefix
Strip prefix from IP address and save both
If no prefix found sets default prefix.

* tst_net_iface_prefix
tst_net_iface_prefix reads prefix and interface from rtnetlink.

* tst_net_vars takes input of local and remote address and setup most of test link (IP related) environment variables.

NOTABLE CHANGES IN ENVIRONMENT VARIABLES:
Network variables are defined for both local and remote:
IPV4_NETWORK was replaced by IPV4_LNETWORK and IPV4_RNETWORK IPV6_NETWORK was replaced by IPV6_LNETWORK and IPV6_RNETWORK

NEW VARIABLES:
IPV4_LHOST, IPV4_RHOST, IPV4_LNETMASK, IPV4_RNETMASK, IPV4_LPREFIX, IPV4_RPREFIX,
IPV6_LHOST, IPV6_RHOST, IPV6_LNETMASK, IPV6_RNETMASK, IPV6_LPREFIX, IPV6_RPREFIX,

For full list of environment variables which tools setup run:
tst_net_ip_prefix -h
tst_net_iface_prefix -h
tst_net_vars -h

Thanks a lot to Alexey Kodanev who reviewed many versions of this patch and give feedback and pointed out errors, as well as to Cyril Hrubis who reviewed orignal version of tst_net_vars.c.

Applied with minor changes below, thank you!

Hi,

this breaks the build for me on older RHELs.
I can build it OK with HEAD at
782ed69385e1 "network/stress: Reduce the default number of cycles for various tests"
but later commits fail.

RHEL5.6:
---------

make[2]: Entering directory `/root/ltp/testcases/lib'
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -D_FORTIFY_SOURCE=2 -I../../include -I../../include -I../../in
clude/old/ -L../../lib tst_net_iface_prefix.c -lltp -o tst_net_iface_prefix
In file included from /usr/include/net/if.h:26,

                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:46: error: conflicting types for ‘loff_t’ /usr/include/linux/types.h:30: error: previous declaration of ‘loff_t’ was here /usr/include/sys/types.h:62: error: conflicting types for ‘dev_t’ /usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ was here In file included from /usr/include/sys/types.h:133,

                 from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:
/usr/include/time.h:105: error: conflicting types for ‘timer_t’
/usr/include/linux/types.h:22: error: previous declaration of ‘timer_t’ was here
In file included from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:198: error: conflicting types for ‘int64_t’ /usr/include/linux/types.h:98: error: previous declaration of ‘int64_t’ was here /usr/include/sys/types.h:204: error: conflicting types for ‘u_int64_t’ /usr/include/linux/types.h:97: error: previous declaration of ‘u_int64_t’ was here In file included from /usr/include/sys/types.h:220,

                 from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:
/usr/include/sys/select.h:78: error: conflicting types for ‘fd_set’
/usr/include/linux/types.h:12: error: previous declaration of ‘fd_set’ was here
In file included from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:
/usr/include/sys/types.h:235: error: conflicting types for ‘blkcnt_t’
/usr/include/linux/types.h:114: error: previous declaration of ‘blkcnt_t’ was here
In file included from /usr/include/sys/uio.h:29,
                 from /usr/include/sys/socket.h:27,
                 from /usr/include/net/if.h:27,
                 from tst_net_iface_prefix.c:19:
/usr/include/bits/uio.h:45: error: redefinition of ‘struct iovec’
In file included from /usr/include/sys/socket.h:35,
                 from /usr/include/net/if.h:27,
                 from tst_net_iface_prefix.c:19:

/usr/include/bits/socket.h:146: error: redefinition of ‘struct sockaddr’ /usr/include/bits/socket.h:163: error: redefinition of ‘struct __kernel_sockaddr_storage’ /usr/include/bits/socket.h:173: error: expected identifier before numeric constant /usr/include/bits/socket.h:216: error: redefinition of ‘struct msghdr’ /usr/include/bits/socket.h:234: error: redefinition of ‘struct cmsghdr’ /usr/include/bits/socket.h:264: error: conflicting types for ‘__cmsg_nxthdr’ /usr/include/linux/socket.h:129: error: previous definition of ‘__cmsg_nxthdr’ was here /usr/include/bits/socket.h:292: error: expected identifier before numeric constant /usr/include/bits/socket.h:303: error: redefinition of ‘struct ucred’ /usr/include/bits/socket.h:315: error: redefinition of ‘struct linger’
In file included from /usr/include/netinet/in.h:23,

                 from ../../include/tst_safe_net.h:23,
                 from ../../include/tst_test.h:82,
                 from tst_net_iface_prefix.c:24:

/usr/include/stdint.h:56: error: conflicting types for ‘uint64_t’ /usr/include/linux/types.h:96: error: previous declaration of ‘uint64_t’ was here tst_net_iface_prefix.c: In function ‘read_iface_prefix’:
tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned make[2]: *** [tst_net_iface_prefix] Error 1
make[2]: Leaving directory `/root/ltp/testcases/lib'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/root/ltp/testcases'
make: *** [testcases-all] Error 2

RHEL6.0:
---------

make[2]: Entering directory `/root/ltp/testcases/lib'
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -D_FORTIFY_SOURCE=2 -I../../include -I../../include -I../../include/old/ -L../../lib tst_net_iface_prefix.c -lltp -o tst_net_iface_prefix
In file included from /usr/include/linux/rtnetlink.h:5,

                 from tst_net_iface_prefix.c:18:

/usr/include/linux/netlink.h:34: error: expected specifier-qualifier-list before ‘sa_family_t’ tst_net_iface_prefix.c: In function ‘read_iface_prefix’:
tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned integer expressions make[2]: *** [tst_net_iface_prefix] Error 1
make[2]: Leaving directory `/root/ltp/testcases/lib'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/root/ltp/testcases'
make: *** [testcases-all] Error 2

----- Original Message -----

Quoted 31 lines · Petr Vorel

New tools:
* tst_net_ip_prefix
Strip prefix from IP address and save both
If no prefix found sets default prefix.

* tst_net_iface_prefix
tst_net_iface_prefix reads prefix and interface from rtnetlink.

* tst_net_vars takes input of local and remote address and setup most of test link (IP related) environment variables.

NOTABLE CHANGES IN ENVIRONMENT VARIABLES:
Network variables are defined for both local and remote:
IPV4_NETWORK was replaced by IPV4_LNETWORK and IPV4_RNETWORK IPV6_NETWORK was replaced by IPV6_LNETWORK and IPV6_RNETWORK

NEW VARIABLES:
IPV4_LHOST, IPV4_RHOST, IPV4_LNETMASK, IPV4_RNETMASK, IPV4_LPREFIX, IPV4_RPREFIX,
IPV6_LHOST, IPV6_RHOST, IPV6_LNETMASK, IPV6_RNETMASK, IPV6_LPREFIX, IPV6_RPREFIX,

For full list of environment variables which tools setup run:
tst_net_ip_prefix -h
tst_net_iface_prefix -h
tst_net_vars -h

Quoted 5 lines

Thanks a lot to Alexey Kodanev who reviewed many versions of this patch and give feedback and pointed out errors, as well as to Cyril Hrubis who reviewed orignal version of tst_net_vars.c.

Applied with minor changes below, thank you!

Hi,

this breaks the build for me on older RHELs.
I can build it OK with HEAD at
782ed69385e1 "network/stress: Reduce the default number of cycles for various tests"
but later commits fail.

RHEL5.6:
---------

make[2]: Entering directory `/root/ltp/testcases/lib'
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -D_FORTIFY_SOURCE=2 -I../../include -I../../include -I../../in
clude/old/ -L../../lib tst_net_iface_prefix.c -lltp -o tst_net_iface_prefix
In file included from /usr/include/net/if.h:26,

                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:46: error: conflicting types for ‘loff_t’ /usr/include/linux/types.h:30: error: previous declaration of ‘loff_t’ was here /usr/include/sys/types.h:62: error: conflicting types for ‘dev_t’ /usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ was here In file included from /usr/include/sys/types.h:133,

                 from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:
/usr/include/time.h:105: error: conflicting types for ‘timer_t’
/usr/include/linux/types.h:22: error: previous declaration of ‘timer_t’ was here
In file included from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:198: error: conflicting types for ‘int64_t’ /usr/include/linux/types.h:98: error: previous declaration of ‘int64_t’ was here /usr/include/sys/types.h:204: error: conflicting types for ‘u_int64_t’ /usr/include/linux/types.h:97: error: previous declaration of ‘u_int64_t’ was here In file included from /usr/include/sys/types.h:220,

                 from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:
/usr/include/sys/select.h:78: error: conflicting types for ‘fd_set’
/usr/include/linux/types.h:12: error: previous declaration of ‘fd_set’ was here
In file included from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:
/usr/include/sys/types.h:235: error: conflicting types for ‘blkcnt_t’
/usr/include/linux/types.h:114: error: previous declaration of ‘blkcnt_t’ was here
In file included from /usr/include/sys/uio.h:29,
                 from /usr/include/sys/socket.h:27,
                 from /usr/include/net/if.h:27,
                 from tst_net_iface_prefix.c:19:
/usr/include/bits/uio.h:45: error: redefinition of ‘struct iovec’
In file included from /usr/include/sys/socket.h:35,
                 from /usr/include/net/if.h:27,
                 from tst_net_iface_prefix.c:19:

/usr/include/bits/socket.h:146: error: redefinition of ‘struct sockaddr’ /usr/include/bits/socket.h:163: error: redefinition of ‘struct __kernel_sockaddr_storage’ /usr/include/bits/socket.h:173: error: expected identifier before numeric constant /usr/include/bits/socket.h:216: error: redefinition of ‘struct msghdr’ /usr/include/bits/socket.h:234: error: redefinition of ‘struct cmsghdr’ /usr/include/bits/socket.h:264: error: conflicting types for ‘__cmsg_nxthdr’ /usr/include/linux/socket.h:129: error: previous definition of ‘__cmsg_nxthdr’ was here /usr/include/bits/socket.h:292: error: expected identifier before numeric constant /usr/include/bits/socket.h:303: error: redefinition of ‘struct ucred’ /usr/include/bits/socket.h:315: error: redefinition of ‘struct linger’
In file included from /usr/include/netinet/in.h:23,

                 from ../../include/tst_safe_net.h:23,
                 from ../../include/tst_test.h:82,
                 from tst_net_iface_prefix.c:24:

/usr/include/stdint.h:56: error: conflicting types for ‘uint64_t’ /usr/include/linux/types.h:96: error: previous declaration of ‘uint64_t’ was here tst_net_iface_prefix.c: In function ‘read_iface_prefix’:
tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned make[2]: *** [tst_net_iface_prefix] Error 1
make[2]: Leaving directory `/root/ltp/testcases/lib'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/root/ltp/testcases'
make: *** [testcases-all] Error 2

RHEL6.0:
---------

make[2]: Entering directory `/root/ltp/testcases/lib'
gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W -Wold-style-definition -D_FORTIFY_SOURCE=2 -I../../include -I../../include -I../../include/old/ -L../../lib tst_net_iface_prefix.c -lltp -o tst_net_iface_prefix
In file included from /usr/include/linux/rtnetlink.h:5,

                 from tst_net_iface_prefix.c:18:

/usr/include/linux/netlink.h:34: error: expected specifier-qualifier-list before ‘sa_family_t’ tst_net_iface_prefix.c: In function ‘read_iface_prefix’:
tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned integer expressions make[2]: *** [tst_net_iface_prefix] Error 1
make[2]: Leaving directory `/root/ltp/testcases/lib'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/root/ltp/testcases'
make: *** [testcases-all] Error 2

Quoted 137 lines

----- Original Message -----

Quoted 31 lines · Petr Vorel

New tools:
* tst_net_ip_prefix
Strip prefix from IP address and save both
If no prefix found sets default prefix.

* tst_net_iface_prefix
tst_net_iface_prefix reads prefix and interface from rtnetlink.

* tst_net_vars takes input of local and remote address and setup most of test link (IP related) environment variables.

NOTABLE CHANGES IN ENVIRONMENT VARIABLES:
Network variables are defined for both local and remote:
IPV4_NETWORK was replaced by IPV4_LNETWORK and IPV4_RNETWORK IPV6_NETWORK was replaced by IPV6_LNETWORK and IPV6_RNETWORK

NEW VARIABLES:
IPV4_LHOST, IPV4_RHOST, IPV4_LNETMASK, IPV4_RNETMASK, IPV4_LPREFIX, IPV4_RPREFIX,
IPV6_LHOST, IPV6_RHOST, IPV6_LNETMASK, IPV6_RNETMASK, IPV6_LPREFIX, IPV6_RPREFIX,

For full list of environment variables which tools setup run:
tst_net_ip_prefix -h
tst_net_iface_prefix -h
tst_net_vars -h

Quoted 5 lines

Thanks a lot to Alexey Kodanev who reviewed many versions of this patch and give feedback and pointed out errors, as well as to Cyril Hrubis who reviewed orignal version of tst_net_vars.c.

Applied with minor changes below, thank you!

Hi,

this breaks the build for me on older RHELs.
I can build it OK with HEAD at
782ed69385e1 "network/stress: Reduce the default number of cycles for various tests"
but later commits fail.

RHEL5.6:
---------

make[2]: Entering directory `/root/ltp/testcases/lib' gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W

(quoted diff) +0 -2

-Wold-style-definition -D_FORTIFY_SOURCE=2 -I../../include -I../../include
-I../../in

clude/old/ -L../../lib tst_net_iface_prefix.c -lltp -o
tst_net_iface_prefix
In file included from /usr/include/net/if.h:26,

                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:46: error: conflicting types for ‘loff_t’ /usr/include/linux/types.h:30: error: previous declaration of ‘loff_t’ was here
/usr/include/sys/types.h:62: error: conflicting types for ‘dev_t’ /usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ was here
In file included from /usr/include/sys/types.h:133,

                 from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:

/usr/include/time.h:105: error: conflicting types for ‘timer_t’ /usr/include/linux/types.h:22: error: previous declaration of ‘timer_t’ was here
In file included from /usr/include/net/if.h:26,

                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:198: error: conflicting types for ‘int64_t’ /usr/include/linux/types.h:98: error: previous declaration of ‘int64_t’ was here
/usr/include/sys/types.h:204: error: conflicting types for ‘u_int64_t’ /usr/include/linux/types.h:97: error: previous declaration of ‘u_int64_t’ was here
In file included from /usr/include/sys/types.h:220,

                 from /usr/include/net/if.h:26,
                 from tst_net_iface_prefix.c:19:

/usr/include/sys/select.h:78: error: conflicting types for ‘fd_set’ /usr/include/linux/types.h:12: error: previous declaration of ‘fd_set’ was here
In file included from /usr/include/net/if.h:26,

                 from tst_net_iface_prefix.c:19:

/usr/include/sys/types.h:235: error: conflicting types for ‘blkcnt_t’ /usr/include/linux/types.h:114: error: previous declaration of ‘blkcnt_t’ was here
In file included from /usr/include/sys/uio.h:29,

                 from /usr/include/sys/socket.h:27,
                 from /usr/include/net/if.h:27,
                 from tst_net_iface_prefix.c:19:
/usr/include/bits/uio.h:45: error: redefinition of ‘struct iovec’
In file included from /usr/include/sys/socket.h:35,
                 from /usr/include/net/if.h:27,
                 from tst_net_iface_prefix.c:19:

/usr/include/bits/socket.h:146: error: redefinition of ‘struct sockaddr’ /usr/include/bits/socket.h:163: error: redefinition of ‘struct __kernel_sockaddr_storage’
/usr/include/bits/socket.h:173: error: expected identifier before numeric constant
/usr/include/bits/socket.h:216: error: redefinition of ‘struct msghdr’ /usr/include/bits/socket.h:234: error: redefinition of ‘struct cmsghdr’ /usr/include/bits/socket.h:264: error: conflicting types for ‘__cmsg_nxthdr’
/usr/include/linux/socket.h:129: error: previous definition of ‘__cmsg_nxthdr’ was here
/usr/include/bits/socket.h:292: error: expected identifier before numeric constant
/usr/include/bits/socket.h:303: error: redefinition of ‘struct ucred’ /usr/include/bits/socket.h:315: error: redefinition of ‘struct linger’ In file included from /usr/include/netinet/in.h:23,

                 from ../../include/tst_safe_net.h:23,
                 from ../../include/tst_test.h:82,
                 from tst_net_iface_prefix.c:24:

/usr/include/stdint.h:56: error: conflicting types for ‘uint64_t’ /usr/include/linux/types.h:96: error: previous declaration of ‘uint64_t’ was here
tst_net_iface_prefix.c: In function ‘read_iface_prefix’:
tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned make[2]: *** [tst_net_iface_prefix] Error 1
make[2]: Leaving directory `/root/ltp/testcases/lib'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/root/ltp/testcases'
make: *** [testcases-all] Error 2

RHEL6.0:
---------

make[2]: Entering directory `/root/ltp/testcases/lib' gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -W

(quoted diff) +0 -2

-Wold-style-definition -D_FORTIFY_SOURCE=2 -I../../include -I../../include
-I../../include/old/   -L../../lib  tst_net_iface_prefix.c   -lltp -o

tst_net_iface_prefix
In file included from /usr/include/linux/rtnetlink.h:5,

                 from tst_net_iface_prefix.c:18:

Quoted 10 lines

/usr/include/linux/netlink.h:34: error: expected specifier-qualifier-list before ‘sa_family_t’
tst_net_iface_prefix.c: In function ‘read_iface_prefix’:
tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned integer expressions
make[2]: *** [tst_net_iface_prefix] Error 1
make[2]: Leaving directory `/root/ltp/testcases/lib'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/root/ltp/testcases'
make: *** [testcases-all] Error 2

Hi Jan,

Looks like a known problem with rtnetlink include:

https://www.spinics.net/lists/netdev/msg171723.html

We should includesys/socket.hbefore rtnetlink.h.Is it fixing the build?

testcases/lib/tst_net_iface_prefix.c +1 -0

index f82e1fa..803f1e7 100644
@@ -15,6 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sys/socket.h>
 #include <linux/rtnetlink.h>
 #include <net/if.h>
 #include <stdio.h>

Thanks,
Alexey

Quoted 5 lines

Looks like a known problem with rtnetlink include:

https://www.spinics.net/lists/netdev/msg171723.html

We should includesys/socket.hbefore rtnetlink.h.Is it fixing the build?

Yes, this fixed the build for me.

tst_net_iface_prefix.c:80: warning: comparison between signed and unsigned

Tools (tst_net_ip_prefix, tst_net_iface_prefix, tst_net_vars) simplify setup as it only needs to have passed 4 IP addresses (IPv4 lhost + rhost and IPv6 lhost + rhost).

It's possible to define different network part for local and remote hosts.

Signed-off-by Petr Vorel <[email protected]>

---
 testcases/lib/test_net.sh                          | 95 ++++++++++++++--------
 testcases/network/stress/interface/if4-addr-change | 17 ++--
 2 files changed, 74 insertions(+), 38 deletions(-)

testcases/lib/test_net.sh +47 -31

index f72e4755f..654200c61 100644
@@ -218,19 +218,10 @@ tst_read_opts $*
 tst_ipaddr()
 {
 	local type="${1:-lhost}"
-	local ipv="${TST_IPV6:-4}"
-	local tst_host
-
-	if [ "$type" = "lhost" ]; then
-		eval "tst_host=\$LHOST_IPV${ipv}_HOST"
-	else
-		eval "tst_host=\$RHOST_IPV${ipv}_HOST"
-	fi
-
 	if [ "$TST_IPV6" ]; then
-		echo "${IPV6_NETWORK}:${tst_host}"
+		[ "$type" = "lhost" ] && echo "$IPV6_LHOST" || echo "$IPV6_RHOST"
 	else
-		echo "${IPV4_NETWORK}.${tst_host}"
+		[ "$type" = "lhost" ] && echo "$IPV4_LHOST" || echo "$IPV4_RHOST"
 	fi
 }
 

@@ -333,9 +324,13 @@ tst_add_ipaddr()
 {
 	local type="${1:-lhost}"
 	local link_num="${2:-0}"
+	local mask
 
-	local mask=24
-	[ "$TST_IPV6" ] && mask=64
+	if [ "$TST_IPV6" ]; then
+		[ "$type" = "lhost" ] && mask=$IPV6_LPREFIX || mask=$IPV6_RPREFIX
+	else
+		[ "$type" = "lhost" ] && mask=$IPV4_LPREFIX || mask=$IPV4_RPREFIX
+	fi
 
 	local iface=$(tst_iface $type $link_num)
 

@@ -589,24 +584,57 @@ export PASSWD="${PASSWD:-}"
 export LTP_RSH="${LTP_RSH:-rsh -n}"
 
 # Test Links
-# Set first three octets of the network address, default is '10.0.0'
-export IPV4_NETWORK="${IPV4_NETWORK:-10.0.0}"
-# Set local host last octet, default is '2'
-export LHOST_IPV4_HOST="${LHOST_IPV4_HOST:-2}"
-# Set remote host last octet, default is '1'
-export RHOST_IPV4_HOST="${RHOST_IPV4_HOST:-1}"
-# Set the reverse of IPV4_NETWORK
-export IPV4_NET_REV="${IPV4_NET_REV:-0.0.10}"
-# Set first three octets of the network address, default is 'fd00:1:1:1'
-export IPV6_NETWORK="${IPV6_NETWORK:-fd00:1:1:1}"
-# Set local host last octet, default is '2'
-export LHOST_IPV6_HOST="${LHOST_IPV6_HOST:-:2}"
-# Set remote host last octet, default is '1'
-export RHOST_IPV6_HOST="${RHOST_IPV6_HOST:-:1}"
-
-# Networks that aren't reachable through the test links
-export IPV4_NET16_UNUSED="${IPV4_NET16_UNUSED:-10.23}"
-export IPV6_NET32_UNUSED="${IPV6_NET32_UNUSED:-fd00:23}"
+# IPV{4,6}_{L,R}HOST can be set with or without prefix (e.g. IP or IP/prefix),
+# but if you use IP/prefix form, /prefix will be removed by tst_net_vars.
+IPV4_LHOST="${IPV4_LHOST:-10.0.0.2/24}"
+IPV4_RHOST="${IPV4_RHOST:-10.0.0.1/24}"
+IPV6_LHOST="${IPV6_LHOST:-fd00:1:1:1::2/64}"
+IPV6_RHOST="${IPV6_RHOST:-fd00:1:1:1::1/64}"
+
+# tst_net_ip_prefix
+# Strip prefix from IP address and save both If no prefix found sets
+# default prefix.
+#
+# tst_net_iface_prefix reads prefix and interface from rtnetlink.
+# If nothing found sets default prefix value.
+#
+# tst_net_vars exports environment variables related to test links and
+# networks that aren't reachable through the test links.
+#
+# For full list of exported environment variables see:
+# tst_net_ip_prefix -h
+# tst_net_iface_prefix -h
+# tst_net_vars -h
+if [ -z "$TST_PARSE_VARIABLES" ]; then
+	tst_resm TINFO "Parsing IP and prefixes from IPv4 lhost: '$IPV4_LHOST'," \
+		"rhost: '$IPV4_RHOST', IPv6 lhost: '$IPV6_LHOST', rhost: '$IPV6_RHOST'"
+	eval $(tst_net_ip_prefix $IPV4_LHOST || echo "exit $?")
+	eval $(tst_net_ip_prefix -r $IPV4_RHOST || echo "exit $?")
+	eval $(tst_net_ip_prefix $IPV6_LHOST || echo "exit $?")
+	eval $(tst_net_ip_prefix -r $IPV6_RHOST || echo "exit $?")
+fi
+
+[ -n "$TST_USE_NETNS" -a "$TST_INIT_NETNS" != "no" ] && init_ltp_netspace
+
+if [ -z "$TST_PARSE_VARIABLES" ]; then
+	tst_resm TINFO "Parsing prefixes and ifaces from rtnetlink"
+	eval $(tst_net_iface_prefix $IPV4_LHOST || echo "exit $?")
+	eval $(tst_rhost_run -c 'tst_net_iface_prefix -r '$IPV4_RHOST \
+		|| echo "exit $?")
+	eval $(tst_net_iface_prefix $IPV6_LHOST || echo "exit $?")
+	eval $(tst_rhost_run -c 'tst_net_iface_prefix -r '$IPV6_RHOST \