From 92282bffa7576947c093e8fc1761894b5a0a7e42 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Mon, 2 Jul 2018 18:53:54 -0700 Subject: [PATCH] [ip6] fix forwarding of off-mesh traffic on FED (#2847) This commit addresses an issue with forwarding of off-mesh traffic on FED. It also adds a `toranj` test-case to test adding of off-mesh routes (on routers and FEDs) and traffic flow to off-mesh addresses. --- src/core/net/ip6.cpp | 6 +- tests/toranj/start.sh | 1 + .../toranj/test-013-off-mesh-route-traffic.py | 170 ++++++++++++++++++ tests/toranj/wpan.py | 24 ++- 4 files changed, 195 insertions(+), 6 deletions(-) create mode 100644 tests/toranj/test-013-off-mesh-route-traffic.py diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp index 1c2b10a0a..ef8c7c54b 100644 --- a/src/core/net/ip6.cpp +++ b/src/core/net/ip6.cpp @@ -798,11 +798,6 @@ otError Ip6::HandleDatagram(Message & aMessage, nextHeader = static_cast(header.GetNextHeader()); SuccessOrExit(error = HandleExtensionHeaders(aMessage, header, nextHeader, forward, receive)); - if (!mForwardingEnabled && aNetif != NULL) - { - forward = false; - } - // process IPv6 Payload if (receive) { @@ -841,6 +836,7 @@ otError Ip6::HandleDatagram(Message & aMessage, if (aNetif != NULL) { + VerifyOrExit(mForwardingEnabled, forward = false); header.SetHopLimit(header.GetHopLimit() - 1); } diff --git a/tests/toranj/start.sh b/tests/toranj/start.sh index 8da91f7d2..83fed50b7 100755 --- a/tests/toranj/start.sh +++ b/tests/toranj/start.sh @@ -125,6 +125,7 @@ run test-009-insecure-traffic-join.py run test-010-on-mesh-prefix-config-gateway.py run test-011-child-table.py run test-012-multi-hop-traffic.py +run test-013-off-mesh-route-traffic.py run test-100-mcu-power-state.py run test-600-channel-manager-properties.py run test-601-channel-manager-channel-change.py diff --git a/tests/toranj/test-013-off-mesh-route-traffic.py b/tests/toranj/test-013-off-mesh-route-traffic.py new file mode 100644 index 000000000..59959a4a0 --- /dev/null +++ b/tests/toranj/test-013-off-mesh-route-traffic.py @@ -0,0 +1,170 @@ +#!/usr/bin/env python +# +# Copyright (c) 2018, The OpenThread Authors. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the copyright holder nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +import time +import subprocess +import wpan +from wpan import verify + +#----------------------------------------------------------------------------------------------------------------------- +# Test description: Adding off-mesh routes (on routers and FEDs) and traffic flow to off-mesh addresses. +# +# Test topology: +# +# r1 ---- r2 +# | | +# | | +# fed1 sed2 +# +# The off-mesh-routes are added as follows: +# - `r1` adds `OFF_MESH_ROUTE_1`, +# - `r2` adds `OFF_MESH_ROUTE_2`, +# - `fed1` adds `OFF_MESH_ROUTE_3`. +# +# Traffic flow: +# - From `sed2` to an address matching `OFF_MESH_ROUTE_1` (verify it is received on `r1`), +# - From `r1` to an address matching `OFF_MESH_ROUTE_2` (verify it is received on `r2`), +# - From `r2` to an address matching `OFF_MESH_ROUTE_3` (verify it is received on `fed1`) +# + +test_name = __file__[:-3] if __file__.endswith('.py') else __file__ +print '-' * 120 +print 'Starting \'{}\''.format(test_name) + +#----------------------------------------------------------------------------------------------------------------------- +# Creating `wpan.Nodes` instances + +speedup = 4 +wpan.Node.set_time_speedup_factor(speedup) + +r1 = wpan.Node() +fed1 = wpan.Node() +r2 = wpan.Node() +sed2 = wpan.Node() + +all_nodes = [r1, fed1, r2, sed2] + +#----------------------------------------------------------------------------------------------------------------------- +# Init all nodes + +wpan.Node.init_all_nodes() +for node in all_nodes: + # Disable `AutoUpdateInterfaceAddrsOnNCP` feature on wpantund + # for all nodes. This ensures that added IPv6 address (on linux + # interface) are not pushed to NCP (and therefore are not + # on-mesh). + node.set("Daemon:IPv6:AutoUpdateInterfaceAddrsOnNCP", '0') + node.set(wpan.WPAN_OT_LOG_LEVEL, '0') + +#----------------------------------------------------------------------------------------------------------------------- +# Build network topology +# +# r1 ---- r2 +# | | +# | | +# fed1 sed2 + + +r1.whitelist_node(r2) +r2.whitelist_node(r1) + +r1.whitelist_node(fed1) +fed1.whitelist_node(r1) + +r2.whitelist_node(sed2) +sed2.whitelist_node(r2) + +r1.form("off-mesh") +r2.join_node(r1, wpan.JOIN_TYPE_ROUTER) + +fed1.join_node(r1, wpan.JOIN_TYPE_END_DEVICE) +sed2.join_node(r2, wpan.JOIN_TYPE_SLEEPY_END_DEVICE) + +sed2.set(wpan.WPAN_POLL_INTERVAL, '1500') + +#----------------------------------------------------------------------------------------------------------------------- +# Test implementation + +ON_MESH_PREFIX = "fd00:1234::" +OFF_MESH_ROUTE_1 = "fd00:abba::" +OFF_MESH_ROUTE_2 = "fd00:cafe::" +OFF_MESH_ROUTE_3 = "fd00:baba::" +OFF_MESH_ADDR_1 = OFF_MESH_ROUTE_1 + "1" +OFF_MESH_ADDR_2 = OFF_MESH_ROUTE_2 + "2" +OFF_MESH_ADDR_3 = OFF_MESH_ROUTE_3 + "3" + +# Add on-mesh prefix +r1.config_gateway(ON_MESH_PREFIX); + +# The off-mesh-routes are added as follows: +# - `r1` adds OFF_MESH_ROUTE_1, +# - `r2` adds OFF_MESH_ROUTE_2, +# - `fed1` adds OFF_MESH_ROUTE_3. + +r1.add_route(OFF_MESH_ROUTE_1) +r1.add_ip6_address_on_interface(OFF_MESH_ADDR_1) + +r2.add_route(OFF_MESH_ROUTE_2) +r2.add_ip6_address_on_interface(OFF_MESH_ADDR_2) + +fed1.add_route(OFF_MESH_ROUTE_3) +fed1.add_ip6_address_on_interface(OFF_MESH_ADDR_3) + +time.sleep(0.5) + +# Traffic from `sed2` to `OFF_MESH_ADDR_1` (verify that it is received on `r1`). + +src = sed2.find_ip6_address_with_prefix(ON_MESH_PREFIX) +sender = sed2.prepare_tx(src, OFF_MESH_ADDR_1, "Hello Route1") +recver = r1.prepare_rx(sender) +wpan.Node.perform_async_tx_rx() +verify(sender.was_successful) +verify(recver.was_successful) + +# Traffic from `r1` to `OFF_MESH_ADDR_2` (verify that it is received on `r2`), + +src = r1.find_ip6_address_with_prefix(ON_MESH_PREFIX) +sender = r1.prepare_tx(src, OFF_MESH_ADDR_2, "Hello Route2") +recver = r2.prepare_rx(sender) +wpan.Node.perform_async_tx_rx() +verify(sender.was_successful) +verify(recver.was_successful) + +# Traffic from `r2` to `OFF_MESH_ADDR_3` (verify that it is received on `fed1`) + +src = r2.find_ip6_address_with_prefix(ON_MESH_PREFIX) +sender = r2.prepare_tx(src, OFF_MESH_ADDR_3, "Hello Route3") +recver = fed1.prepare_rx(sender) +wpan.Node.perform_async_tx_rx() +verify(sender.was_successful) +verify(recver.was_successful) + +#----------------------------------------------------------------------------------------------------------------------- +# Test finished + +print '\'{}\' passed.'.format(test_name) diff --git a/tests/toranj/wpan.py b/tests/toranj/wpan.py index 60bda2a72..c15e4b612 100644 --- a/tests/toranj/wpan.py +++ b/tests/toranj/wpan.py @@ -424,6 +424,28 @@ class Node(object): return False + def find_ip6_address_with_prefix(self, prefix): + """Find an IPv6 address on node matching a given prefix. + `prefix` should be an string containing the prefix. + Returns a string containing the IPv6 address matching the prefix or empty string if no address found. + """ + if len(prefix) > 2 and prefix[-1] == ':' and prefix[-2] == ':': + prefix = prefix[:-1] + all_addrs = parse_list(self.get(WPAN_IP6_ALL_ADDRESSES)) + matched_addr = [addr for addr in all_addrs if addr.startswith(prefix)] + return matched_addr[0] if len(matched_addr) >= 1 else '' + + def add_ip6_address_on_interface(self, address): + """Adds an IPv6 interface on the network interface. + `address` should be string containing the IPv6 address + NOTE: this method uses linux `ip` command. + """ + cmd = 'ip -6 addr add '+ address + ' dev ' + self.interface_name + if self._verbose: + _log('$ Node{} \'{}\')'.format(self._index, cmd)) + + result = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) + #------------------------------------------------------------------------------------------------------------------ # class methods @@ -511,7 +533,7 @@ class Node(object): return receiver def _remove_recver(self, recvr): - # Removes a receiver from weak dictionary - called when the receiver is done and its scoket is closed + # Removes a receiver from weak dictionary - called when the receiver is done and its socket is closed local_port = recvr.local_port if local_port in self._recvers: del self._recvers[local_port]