selftests: forwarding: Move IGMP- and MLD-related functions to lib

These functions will be helpful for other testsuites as well. Extract them
to a common place.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/bridge_mdb.sh b/tools/testing/selftests/net/forwarding/bridge_mdb.sh
index 2fa5973..51f2b0d 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/bridge_mdb.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_mdb.sh
@@ -1018,26 +1018,6 @@ fwd_test()
        ip -6 address del fe80::1/64 dev br0
 }
 
-igmpv3_is_in_get()
-{
-       local igmpv3
-
-       igmpv3=$(:
-               )"22:"$(                        : Type - Membership Report
-               )"00:"$(                        : Reserved
-               )"2a:f8:"$(                     : Checksum
-               )"00:00:"$(                     : Reserved
-               )"00:01:"$(                     : Number of Group Records
-               )"01:"$(                        : Record Type - IS_IN
-               )"00:"$(                        : Aux Data Len
-               )"00:01:"$(                     : Number of Sources
-               )"ef:01:01:01:"$(               : Multicast Address - 239.1.1.1
-               )"c0:00:02:02"$(                : Source Address - 192.0.2.2
-               )
-
-       echo $igmpv3
-}
-
 ctrl_igmpv3_is_in_test()
 {
        RET=0
@@ -1077,35 +1057,6 @@ ctrl_igmpv3_is_in_test()
        log_test "IGMPv3 MODE_IS_INCLUE tests"
 }
 
-mldv2_is_in_get()
-{
-       local hbh
-       local icmpv6
-
-       hbh=$(:
-               )"3a:"$(                        : Next Header - ICMPv6
-               )"00:"$(                        : Hdr Ext Len
-               )"00:00:00:00:00:00:"$(         : Options and Padding
-               )
-
-       icmpv6=$(:
-               )"8f:"$(                        : Type - MLDv2 Report
-               )"00:"$(                        : Code
-               )"45:39:"$(                     : Checksum
-               )"00:00:"$(                     : Reserved
-               )"00:01:"$(                     : Number of Group Records
-               )"01:"$(                        : Record Type - IS_IN
-               )"00:"$(                        : Aux Data Len
-               )"00:01:"$(                     : Number of Sources
-               )"ff:0e:00:00:00:00:00:00:"$(   : Multicast address - ff0e::1
-               )"00:00:00:00:00:00:00:01:"$(   :
-               )"20:01:0d:b8:00:01:00:00:"$(   : Source Address - 2001:db8:1::2
-               )"00:00:00:00:00:00:00:02:"$(   :
-               )
-
-       echo ${hbh}${icmpv6}
-}
-
 ctrl_mldv2_is_in_test()
 {
        RET=0

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 29cd470..736f560 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -1671,3 +1671,52 @@ hw_stats_monitor_test()
 
        log_test "${type}_stats notifications"
 }
+
+igmpv3_is_in_get()
+{
+       local igmpv3
+
+       igmpv3=$(:
+               )"22:"$(                        : Type - Membership Report
+               )"00:"$(                        : Reserved
+               )"2a:f8:"$(                     : Checksum
+               )"00:00:"$(                     : Reserved
+               )"00:01:"$(                     : Number of Group Records
+               )"01:"$(                        : Record Type - IS_IN
+               )"00:"$(                        : Aux Data Len
+               )"00:01:"$(                     : Number of Sources
+               )"ef:01:01:01:"$(               : Multicast Address - 239.1.1.1
+               )"c0:00:02:02"$(                : Source Address - 192.0.2.2
+               )
+
+       echo $igmpv3
+}
+
+mldv2_is_in_get()
+{
+       local hbh
+       local icmpv6
+
+       hbh=$(:
+               )"3a:"$(                        : Next Header - ICMPv6
+               )"00:"$(                        : Hdr Ext Len
+               )"00:00:00:00:00:00:"$(         : Options and Padding
+               )
+
+       icmpv6=$(:
+               )"8f:"$(                        : Type - MLDv2 Report
+               )"00:"$(                        : Code
+               )"45:39:"$(                     : Checksum
+               )"00:00:"$(                     : Reserved
+               )"00:01:"$(                     : Number of Group Records
+               )"01:"$(                        : Record Type - IS_IN
+               )"00:"$(                        : Aux Data Len
+               )"00:01:"$(                     : Number of Sources
+               )"ff:0e:00:00:00:00:00:00:"$(   : Multicast address - ff0e::1
+               )"00:00:00:00:00:00:00:01:"$(   :
+               )"20:01:0d:b8:00:01:00:00:"$(   : Source Address - 2001:db8:1::2
+               )"00:00:00:00:00:00:00:02:"$(   :
+               )
+
+       echo ${hbh}${icmpv6}
+}