ip: Fixes for IPv6 and MPLS fragmentation

Type: fix

- IPv6 fragmentation did not work if the packet spaneed multiple buffers, because the 'len' calculation to did max out at the size of a buffer
- IPv6 fragmentation did not work when the l2unfragmentable size was non-zero, it was not used in the correct places
- IPv6oMPLS fragmentation would fragment all IPv6, it should do so only for link local
- IPv6oMPLS should send back TooBig ICMP6 for non locally generated

Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: Ie8f02cdfdd7b7e8474e62b6d0acda8f20c371184
This commit is contained in:
Neale Ranns
2022-03-04 11:45:41 +00:00
parent 7e721954d4
commit ec5371e3e3
5 changed files with 189 additions and 51 deletions

View File

@ -1150,6 +1150,59 @@ class TestIPIP6(VppTestCase):
p6_reply.id = 256
self.validate(reass_pkt, p6_reply)
def test_ip6_mpls_frag(self):
""" Test fragmenting IPv6 over MPLS """
# IPv6 packets must be locally generated to be fragmented
# the use of tunnel encaps
tun_dst = VppIpRoute(
self, "1000::1", 128,
[VppRoutePath(self.pg1.remote_ip6,
self.pg1.sw_if_index,
labels=[VppMplsLabel(32)])]).add_vpp_config()
tun = VppIpIpTunInterface(
self,
self.pg0,
self.pg0.local_ip6,
"1000::1").add_vpp_config()
tun.admin_up()
tun.config_ip6()
tun.config_ip4()
self.vapi.sw_interface_set_mtu(self.pg1.sw_if_index,
[2000, 0, 0, 0])
p_6k = (Ether(dst=self.pg0.local_mac,
src=self.pg0.remote_mac) /
IPv6(src=self.pg0.remote_ip6,
dst=tun.remote_ip6) /
UDP(sport=1234, dport=5678) /
Raw(b'0xa' * 2000))
p_2k = (Ether(dst=self.pg0.local_mac,
src=self.pg0.remote_mac) /
IPv6(src=self.pg0.remote_ip6,
dst=tun.remote_ip6) /
UDP(sport=1234, dport=5678) /
Raw(b'0xa' * 1000))
p_1k = (Ether(dst=self.pg0.local_mac,
src=self.pg0.remote_mac) /
IPv6(src=self.pg0.remote_ip6,
dst=tun.remote_ip6) /
UDP(sport=1234, dport=5678) /
Raw(b'0xa' * 600))
# this is now the interface MTU frags
rxs = self.send_and_expect(self.pg0, [p_6k], self.pg1, n_rx=4)
self.assertEqual(rxs[0][UDP].dport, 5678)
for rx in rxs:
self.assertEqual(rx[MPLS].label, 32)
self.assertEqual(rx[IPv6].dst, "1000::1")
self.assertEqual(rx[IPv6].dst, "1000::1")
self.send_and_expect(self.pg0, [p_2k], self.pg1, n_rx=2)
self.send_and_expect(self.pg0, [p_1k], self.pg1)
def test_ipip_create(self):
""" ipip create / delete interface test """
rv = ipip_add_tunnel(self, '1.2.3.4', '2.3.4.5')