From 72abd80d13b991cfdfba6c650c586bf3fd4ac436 Mon Sep 17 00:00:00 2001 From: Katerina Barone-Adesi Date: Fri, 5 Feb 2016 16:44:29 +0000 Subject: [PATCH] Renamed b4_mac to next_hop6_mac This reflects that it is not actually the MAC of a b4. It is the MAC of the next hop on the internal IPv6 network, so all B4s are reached via it. --- src/apps/lwaftr/conf.lua | 10 +++++----- src/apps/lwaftr/dump.lua | 2 +- src/apps/lwaftr/lwaftr.lua | 10 +++++----- src/program/lwaftr/doc/README.breaking_changes.md | 4 ++++ src/program/lwaftr/doc/README.configuration.md | 4 ++-- src/program/lwaftr/tests/data/icmp_on_fail.conf | 2 +- src/program/lwaftr/tests/data/icmp_on_fail_vlan.conf | 2 +- src/program/lwaftr/tests/data/no_hairpin.conf | 2 +- src/program/lwaftr/tests/data/no_hairpin_vlan.conf | 2 +- src/program/lwaftr/tests/data/no_icmp.conf | 2 +- src/program/lwaftr/tests/data/no_icmp_vlan.conf | 2 +- .../lwaftr/tests/data/no_icmp_with_filters_accept.conf | 2 +- .../data/no_icmp_with_filters_and_vlan_accept.conf | 2 +- .../tests/data/no_icmp_with_filters_and_vlan_drop.conf | 2 +- .../lwaftr/tests/data/no_icmp_with_filters_drop.conf | 2 +- src/program/lwaftr/tests/data/small_ipv4_mtu_icmp.conf | 2 +- .../lwaftr/tests/data/small_ipv4_mtu_icmp_vlan.conf | 2 +- .../lwaftr/tests/data/small_ipv6_mtu_no_icmp.conf | 2 +- .../lwaftr/tests/data/small_ipv6_mtu_no_icmp_vlan.conf | 2 +- src/program/lwaftr/tests/data/tunnel_icmp.conf | 2 +- src/program/lwaftr/tests/data/tunnel_icmp_vlan.conf | 2 +- src/program/lwaftr/tests/data/vlan.conf | 2 +- 22 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 src/program/lwaftr/doc/README.breaking_changes.md diff --git a/src/apps/lwaftr/conf.lua b/src/apps/lwaftr/conf.lua index ee7e9eee84..cf8e482b4c 100644 --- a/src/apps/lwaftr/conf.lua +++ b/src/apps/lwaftr/conf.lua @@ -42,7 +42,7 @@ local lwaftr_conf_spec = { aftr_ipv6_ip=Parser.parse_ipv6, aftr_mac_b4_side=Parser.parse_mac, aftr_mac_inet_side=Parser.parse_mac, - b4_mac=Parser.parse_mac, + next_hop6_mac=Parser.parse_mac, binding_table=Parser.parse_file_name, hairpinning=Parser.parse_boolean, icmpv6_rate_limiter_n_packets=Parser.parse_non_negative_number, @@ -68,7 +68,7 @@ local lwaftr_conf_spec = { aftr_ipv6_ip=required('aftr_ipv6_ip'), aftr_mac_b4_side=required('aftr_mac_b4_side'), aftr_mac_inet_side=required('aftr_mac_inet_side'), - b4_mac=required_at_least_one_of('b4_mac', 'next_hop_ipv6_addr'), + next_hop6_mac=required_at_least_one_of('next_hop6_mac', 'next_hop_ipv6_addr'), binding_table=required('binding_table'), hairpinning=default(true), icmpv6_rate_limiter_n_packets=default(6e5), @@ -76,7 +76,7 @@ local lwaftr_conf_spec = { inet_mac=required('inet_mac'), ipv4_mtu=default(1460), ipv6_mtu=default(1500), - next_hop_ipv6_addr = required_at_least_one_of('next_hop_ipv6_addr', 'b4_mac'), + next_hop_ipv6_addr = required_at_least_one_of('next_hop_ipv6_addr', 'next_hop6_mac'), policy_icmpv4_incoming=default(policies.ALLOW), policy_icmpv4_outgoing=default(policies.ALLOW), policy_icmpv6_incoming=default(policies.ALLOW), @@ -120,7 +120,7 @@ function selftest() aftr_ipv6_ip = 8:9:a:b:c:d:e:f aftr_mac_b4_side = 22:22:22:22:22:22 aftr_mac_inet_side = 12:12:12:12:12:12 - b4_mac = 44:44:44:44:44:44 + next_hop6_mac = 44:44:44:44:44:44 binding_table = "foo-table.txt" hairpinning = false icmpv6_rate_limiter_n_packets=6e3 @@ -141,7 +141,7 @@ function selftest() aftr_ipv6_ip = ipv6:pton('8:9:a:b:c:d:e:f'), aftr_mac_b4_side = ethernet:pton("22:22:22:22:22:22"), aftr_mac_inet_side = ethernet:pton("12:12:12:12:12:12"), - b4_mac = ethernet:pton("44:44:44:44:44:44"), + next_hop6_mac = ethernet:pton("44:44:44:44:44:44"), binding_table = "foo-table.txt", hairpinning = false, icmpv6_rate_limiter_n_packets=6e3, diff --git a/src/apps/lwaftr/dump.lua b/src/apps/lwaftr/dump.lua index 6241be3293..69f952db88 100644 --- a/src/apps/lwaftr/dump.lua +++ b/src/apps/lwaftr/dump.lua @@ -33,7 +33,7 @@ end function dump_configuration(lwstate) print("Dump configuration") local result = {} - local etharr = set('aftr_mac_b4_side', 'aftr_mac_inet_side', 'b4_mac', 'inet_mac') + local etharr = set('aftr_mac_b4_side', 'aftr_mac_inet_side', 'next_hop6_mac', 'inet_mac') local ipv4arr = set('aftr_ipv4_ip') local ipv6arr = set('aftr_ipv6_ip') local val diff --git a/src/apps/lwaftr/lwaftr.lua b/src/apps/lwaftr/lwaftr.lua index 55ba8ea4ca..e3d7084e91 100644 --- a/src/apps/lwaftr/lwaftr.lua +++ b/src/apps/lwaftr/lwaftr.lua @@ -206,7 +206,7 @@ function LwAftr:new(conf) o.aftr_ipv6_ip = conf.aftr_ipv6_ip o.aftr_mac_b4_side = conf.aftr_mac_b4_side o.aftr_mac_inet_side = conf.aftr_mac_inet_side - o.b4_mac = conf.b4_mac or ethernet:pton("00:00:00:00:00:00") + o.next_hop6_mac = conf.next_hop6_mac or ethernet:pton("00:00:00:00:00:00") o.hairpinning = conf.hairpinning o.icmpv6_rate_limiter_n_packets = conf.icmpv6_rate_limiter_n_packets o.icmpv6_rate_limiter_n_seconds = conf.icmpv6_rate_limiter_n_seconds @@ -296,7 +296,7 @@ local function icmp_b4_lookup_failed(lwstate, pkt, to_ip) local icmp_config = {type = constants.icmpv6_dst_unreachable, code = constants.icmpv6_failed_ingress_egress_policy, } - local b4fail_icmp = icmp.new_icmpv6_packet(lwstate.aftr_mac_b4_side, lwstate.b4_mac, + local b4fail_icmp = icmp.new_icmpv6_packet(lwstate.aftr_mac_b4_side, lwstate.next_hop6_mac, lwstate.aftr_ipv6_ip, to_ip, pkt, ethernet_header_size, icmp_config) transmit_icmpv6_with_rate_limit(lwstate.o6, b4fail_icmp) @@ -401,7 +401,7 @@ local function icmpv4_incoming(lwstate, pkt) -- Otherwise, the packet MUST be forwarded local next_hdr = proto_ipv4 return ipv6_encapsulate(lwstate, pkt, next_hdr, ipv6_src, ipv6_dst, - lwstate.aftr_mac_b4_side, lwstate.b4_mac) + lwstate.aftr_mac_b4_side, lwstate.next_hop6_mac) end -- The incoming packet is a complete one with ethernet headers. @@ -439,7 +439,7 @@ local function from_inet(lwstate, pkt) end local ether_src = lwstate.aftr_mac_b4_side - local ether_dst = lwstate.b4_mac -- FIXME: this should probaby use NDP + local ether_dst = lwstate.next_hop6_mac -- Do not encapsulate packets that now have a ttl of zero or wrapped around local ttl = decrement_ttl(pkt) @@ -569,7 +569,7 @@ local function from_b4(lwstate, pkt) if lwstate.hairpinning and ipv4_in_binding_table(lwstate, ipv4_dst_ip) then -- Remove IPv6 header. packet.shiftleft(pkt, ipv6_fixed_header_size) - write_eth_header(pkt.data, lwstate.b4_mac, lwstate.aftr_mac_b4_side, + write_eth_header(pkt.data, lwstate.next_hop6_mac, lwstate.aftr_mac_b4_side, n_ethertype_ipv4) -- TODO: refactor so this doesn't actually seem to be from the internet? return from_inet(lwstate, pkt) diff --git a/src/program/lwaftr/doc/README.breaking_changes.md b/src/program/lwaftr/doc/README.breaking_changes.md new file mode 100644 index 0000000000..a321220f3c --- /dev/null +++ b/src/program/lwaftr/doc/README.breaking_changes.md @@ -0,0 +1,4 @@ +# Breaking changes since the October 2015 alpha release + +- b4_mac has been renamed next_hop6_mac, as the next hop on the internal IPv6 + network is not actually a B4, just on the route to them. diff --git a/src/program/lwaftr/doc/README.configuration.md b/src/program/lwaftr/doc/README.configuration.md index 7f17093834..3e1cbefd43 100644 --- a/src/program/lwaftr/doc/README.configuration.md +++ b/src/program/lwaftr/doc/README.configuration.md @@ -8,7 +8,7 @@ aftr_ipv4_ip = 10.10.10.10 aftr_ipv6_ip = 8:9:a:b:c:d:e:f aftr_mac_b4_side = 22:22:22:22:22:22 aftr_mac_inet_side = 12:12:12:12:12:12 -b4_mac = 44:44:44:44:44:44 +next_hop6_mac = 44:44:44:44:44:44 binding_table = path/to/binding.table hairpinning = true icmpv6_rate_limiter_n_packets=3e5 @@ -51,7 +51,7 @@ it will talk directly to only one host on each side, and specifies their MAC addresses for the outgoing packets. ```lua -b4_mac = 44:44:44:44:44:44 +next_hop6_mac = 44:44:44:44:44:44 inet_mac = 68:68:68:68:68:68 ``` diff --git a/src/program/lwaftr/tests/data/icmp_on_fail.conf b/src/program/lwaftr/tests/data/icmp_on_fail.conf index 2d449a1f1d..3ced37d2ae 100644 --- a/src/program/lwaftr/tests/data/icmp_on_fail.conf +++ b/src/program/lwaftr/tests/data/icmp_on_fail.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = ALLOW, diff --git a/src/program/lwaftr/tests/data/icmp_on_fail_vlan.conf b/src/program/lwaftr/tests/data/icmp_on_fail_vlan.conf index 315b5427a3..59f96f6b6f 100644 --- a/src/program/lwaftr/tests/data/icmp_on_fail_vlan.conf +++ b/src/program/lwaftr/tests/data/icmp_on_fail_vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = ALLOW, diff --git a/src/program/lwaftr/tests/data/no_hairpin.conf b/src/program/lwaftr/tests/data/no_hairpin.conf index 91e56dd2a5..747803702a 100644 --- a/src/program/lwaftr/tests/data/no_hairpin.conf +++ b/src/program/lwaftr/tests/data/no_hairpin.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = false, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_hairpin_vlan.conf b/src/program/lwaftr/tests/data/no_hairpin_vlan.conf index 57fcec16bf..250c98caa7 100644 --- a/src/program/lwaftr/tests/data/no_hairpin_vlan.conf +++ b/src/program/lwaftr/tests/data/no_hairpin_vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = false, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_icmp.conf b/src/program/lwaftr/tests/data/no_icmp.conf index 01eb940262..ea8273d1a6 100644 --- a/src/program/lwaftr/tests/data/no_icmp.conf +++ b/src/program/lwaftr/tests/data/no_icmp.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_icmp_vlan.conf b/src/program/lwaftr/tests/data/no_icmp_vlan.conf index 8806dc686a..0e20f05f34 100644 --- a/src/program/lwaftr/tests/data/no_icmp_vlan.conf +++ b/src/program/lwaftr/tests/data/no_icmp_vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_icmp_with_filters_accept.conf b/src/program/lwaftr/tests/data/no_icmp_with_filters_accept.conf index 09092af526..dc5991d5d0 100644 --- a/src/program/lwaftr/tests/data/no_icmp_with_filters_accept.conf +++ b/src/program/lwaftr/tests/data/no_icmp_with_filters_accept.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_accept.conf b/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_accept.conf index 1e5c4154a0..8329d52073 100644 --- a/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_accept.conf +++ b/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_accept.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_drop.conf b/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_drop.conf index 688ff256ed..dcd4c74f04 100644 --- a/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_drop.conf +++ b/src/program/lwaftr/tests/data/no_icmp_with_filters_and_vlan_drop.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/no_icmp_with_filters_drop.conf b/src/program/lwaftr/tests/data/no_icmp_with_filters_drop.conf index b4952e1137..2b35520f6d 100644 --- a/src/program/lwaftr/tests/data/no_icmp_with_filters_drop.conf +++ b/src/program/lwaftr/tests/data/no_icmp_with_filters_drop.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp.conf b/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp.conf index aeed0968ac..ec2a1c1a9b 100644 --- a/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp.conf +++ b/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 576, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = ALLOW, policy_icmpv6_incoming = ALLOW, policy_icmpv4_outgoing = ALLOW, diff --git a/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp_vlan.conf b/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp_vlan.conf index c2f10a951a..84d41969b0 100644 --- a/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp_vlan.conf +++ b/src/program/lwaftr/tests/data/small_ipv4_mtu_icmp_vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 576, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = ALLOW, policy_icmpv6_incoming = ALLOW, policy_icmpv4_outgoing = ALLOW, diff --git a/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp.conf b/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp.conf index 7a0ae8df3a..a34548e592 100644 --- a/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp.conf +++ b/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1500, ipv6_mtu = 1280, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp_vlan.conf b/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp_vlan.conf index f6b7aff073..cdc2d5dba7 100644 --- a/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp_vlan.conf +++ b/src/program/lwaftr/tests/data/small_ipv6_mtu_no_icmp_vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1500, ipv6_mtu = 1280, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = DROP, policy_icmpv6_incoming = DROP, policy_icmpv4_outgoing = DROP, diff --git a/src/program/lwaftr/tests/data/tunnel_icmp.conf b/src/program/lwaftr/tests/data/tunnel_icmp.conf index 92c08ff487..2b191643a6 100644 --- a/src/program/lwaftr/tests/data/tunnel_icmp.conf +++ b/src/program/lwaftr/tests/data/tunnel_icmp.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = ALLOW, policy_icmpv6_incoming = ALLOW, policy_icmpv4_outgoing = ALLOW, diff --git a/src/program/lwaftr/tests/data/tunnel_icmp_vlan.conf b/src/program/lwaftr/tests/data/tunnel_icmp_vlan.conf index 384c54ad94..cbf0e11b85 100644 --- a/src/program/lwaftr/tests/data/tunnel_icmp_vlan.conf +++ b/src/program/lwaftr/tests/data/tunnel_icmp_vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e5, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = ALLOW, policy_icmpv6_incoming = ALLOW, policy_icmpv4_outgoing = ALLOW, diff --git a/src/program/lwaftr/tests/data/vlan.conf b/src/program/lwaftr/tests/data/vlan.conf index d7174066c4..022f574f3b 100644 --- a/src/program/lwaftr/tests/data/vlan.conf +++ b/src/program/lwaftr/tests/data/vlan.conf @@ -2,7 +2,6 @@ aftr_ipv4_ip = 10.10.10.10, aftr_ipv6_ip = 8:9:a:b:c:d:e:f, aftr_mac_b4_side = 22:22:22:22:22:22, aftr_mac_inet_side = 12:12:12:12:12:12, -b4_mac = 44:44:44:44:44:44, binding_table = binding-table.txt, hairpinning = true, icmpv6_rate_limiter_n_packets=6e3, @@ -10,6 +9,7 @@ icmpv6_rate_limiter_n_seconds=2, inet_mac = 68:68:68:68:68:68, ipv4_mtu = 1460, ipv6_mtu = 1500, +next_hop6_mac = 44:44:44:44:44:44, policy_icmpv4_incoming = ALLOW, policy_icmpv6_incoming = ALLOW, policy_icmpv4_outgoing = ALLOW,