ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IP route local and connected

Browse Source 
allow routes that are local and connected to be added via the API.
this emulates the addition of a second address in the same subnet
added to an interface.

Change-Id: Ib18a08c26956be9a07b3360664210c8cf6734c84
Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
Neale Ranns
2019-01-23 00:36:16 -08:00
committed by Damjan Marion
parent 72f7782dc5
commit 7425f9289b
4 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vnet/ethernet/arp.c
View File

@ -894,6 +894,7 @@ typedef enum
_ (gratuitous_arp, "ARP probe or announcement dropped") \
_ (interface_no_table, "Interface is not mapped to an IP table") \
_ (interface_not_ip_enabled, "Interface is not IP enabled") \
_ (unnumbered_mismatch, "RX interface is unnumbered to different subnet") \
typedef enum
{
@ -1258,7 +1259,10 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
if (is_unnum0)
{
if (!arp_unnumbered (p0, sw_if_index0, conn_sw_if_index0))
goto drop2;
{
error0 = ETHERNET_ARP_ERROR_unnumbered_mismatch;
goto drop2;
}
}
}

11
src/vnet/ip/ip_api.c
View File

@ -813,7 +813,13 @@ add_del_route_t_handler (u8 is_multipath,
path.frp_eos = MPLS_NON_EOS;
}
if (is_local)
path_flags |= FIB_ROUTE_PATH_LOCAL;
{
path_flags |= FIB_ROUTE_PATH_LOCAL;
if (~0 != next_hop_sw_if_index)
{
entry_flags |= (FIB_ENTRY_FLAG_CONNECTED | FIB_ENTRY_FLAG_LOCAL);
}
}
if (is_dvr)
path_flags |= FIB_ROUTE_PATH_DVR;
if (is_resolve_host)
@ -843,7 +849,8 @@ add_del_route_t_handler (u8 is_multipath,
stats_dslock_with_hint (1 /* release hint */ , 2 /* tag */ );
if (is_drop || is_local || is_classify || is_unreach || is_prohibit)
if (is_drop || (is_local && (~0 == next_hop_sw_if_index)) ||
is_classify || is_unreach || is_prohibit)
{
/*
* special route types that link directly to the adj

34
test/test_neighbor.py
View File

@ -1380,6 +1380,40 @@ class ARPTestCase(VppTestCase):
#
self.assertLess(len(rx), 64)
def test_arp_forus(self):
""" ARP for for-us """
#
# Test that VPP responds with ARP requests to addresses that
# are connected and local routes.
# Use one of the 'remote' addresses in the subnet as a local address
# The intention of this route is that it then acts like a secondardy
# address added to an interface
#
self.pg0.generate_remote_hosts(2)
forus = VppIpRoute(self, self.pg0.remote_hosts[1].ip4, 32,
[VppRoutePath(self.pg0.remote_hosts[1].ip4,
self.pg0.sw_if_index)],
is_local=1)
forus.add_vpp_config()
p = (Ether(dst="ff:ff:ff:ff:ff:ff",
src=self.pg0.remote_mac) /
ARP(op="who-has",
hwdst=self.pg0.local_mac,
hwsrc=self.pg0.remote_mac,
pdst=self.pg0.remote_hosts[1].ip4,
psrc=self.pg0.remote_ip4))
rx = self.send_and_expect(self.pg0, [p], self.pg0)
self.verify_arp_resp(rx[0],
self.pg0.local_mac,
self.pg0.remote_mac,
self.pg0.remote_hosts[1].ip4,
self.pg0.remote_ip4)
class NeighborStatsTestCase(VppTestCase):
""" ARP Test Case """

7
test/vpp_ip_route.py
View File

@ -391,8 +391,7 @@ class VppIpRoute(VppObject):
self.is_prohibit = is_prohibit
def add_vpp_config(self):
if self.is_local or self.is_unreach or \
self.is_prohibit or self.is_drop:
if self.is_unreach or self.is_prohibit or self.is_drop:
r = self._test.vapi.ip_add_del_route(
self.dest_addr,
self.dest_addr_len,
@ -421,6 +420,7 @@ class VppIpRoute(VppObject):
next_hop_id=path.next_hop_id,
is_ipv6=self.is_ip6,
is_dvr=path.is_dvr,
is_local=self.is_local,
is_resolve_host=path.is_resolve_host,
is_resolve_attached=path.is_resolve_attached,
is_source_lookup=path.is_source_lookup,
@ -430,8 +430,7 @@ class VppIpRoute(VppObject):
self._test.registry.register(self, self._test.logger)
def remove_vpp_config(self):
if self.is_local or self.is_unreach or \
self.is_prohibit or self.is_drop:
if self.is_unreach or self.is_prohibit or self.is_drop:
self._test.vapi.ip_add_del_route(
self.dest_addr,
self.dest_addr_len,