From e20dd82002739d32d5bd4a2dea1fd271dc9c9132 Mon Sep 17 00:00:00 2001
From: Jessica Tallon <tsyesika@igalia.com>
Date: Thu, 19 Jan 2017 17:18:45 +0100
Subject: [PATCH] #683 - Migrate snabbvmx configs and some more tests

This migrates the configs in snabbvmx and fixes the test (again) in
for binding_table.lua
---
 src/apps/lwaftr/binding_table.lua             |  36 +---
 .../tests/conf/snabbvmx-lwaftr-xe0.conf       | 190 +++++++++++++++++-
 .../snabbvmx/tests/conf/snabbvmx-lwaftr.conf  | 190 +++++++++++++++++-
 .../end-to-end/data/snabbvmx-lwaftr-xe1.conf  |   5 +-
 .../data/vlan/snabbvmx-lwaftr-xe1.conf        |   5 +-
 5 files changed, 395 insertions(+), 31 deletions(-)

diff --git a/src/apps/lwaftr/binding_table.lua b/src/apps/lwaftr/binding_table.lua
index 129e541429..d8dc29ca9a 100644
--- a/src/apps/lwaftr/binding_table.lua
+++ b/src/apps/lwaftr/binding_table.lua
@@ -285,9 +285,6 @@ function selftest()
       psid-map { addr 178.79.150.15; psid-length 4; shift 12; }
       psid-map { addr 178.79.150.2; psid-length 16; }
       psid-map { addr 178.79.150.3; psid-length 6; }
-      br-address 8:9:a:b:c:d:e:f;
-      br-address 1E:1:1:1:1:1:1:af;
-      br-address 1E:2:2:2:2:2:2:af;
       softwire { ipv4 178.79.150.233; psid 80; b4-ipv6 127:2:3:4:5:6:7:128; br-address 8:9:a:b:c:d:e:f; }
       softwire { ipv4 178.79.150.233; psid 2300; b4-ipv6 127:11:12:13:14:15:16:128; br-address 8:9:a:b:c:d:e:f; }
       softwire { ipv4 178.79.150.233; psid 2700; b4-ipv6 127:11:12:13:14:15:16:128; br-address 8:9:a:b:c:d:e:f; }
@@ -309,20 +306,20 @@ function selftest()
    local function assert_lookup(ipv4, port, ipv6, br)
       local val = assert(lookup(ipv4, port))
       assert(ffi.C.memcmp(ipv6_protocol:pton(ipv6), val.b4_ipv6, 16) == 0)
-      assert(val.br == br)
+      assert(ffi.C.memcmp(ipv6_protocol:pton(br), val.br_address, 16) == 0)
    end
-   assert_lookup('178.79.150.233', 80, '127:2:3:4:5:6:7:128', 1)
+   assert_lookup('178.79.150.233', 80, '127:2:3:4:5:6:7:128', '8:9:a:b:c:d:e:f')
    assert(lookup('178.79.150.233', 79) == nil)
    assert(lookup('178.79.150.233', 81) == nil)
-   assert_lookup('178.79.150.15', 80, '127:22:33:44:55:66:77:128', 1)
-   assert_lookup('178.79.150.15', 4095, '127:22:33:44:55:66:77:128', 1)
-   assert_lookup('178.79.150.15', 4096, '127:22:33:44:55:66:77:128', 1)
-   assert_lookup('178.79.150.15', 8191, '127:22:33:44:55:66:77:128', 1)
+   assert_lookup('178.79.150.15', 80, '127:22:33:44:55:66:77:128', '8:9:a:b:c:d:e:f')
+   assert_lookup('178.79.150.15', 4095, '127:22:33:44:55:66:77:128', '8:9:a:b:c:d:e:f')
+   assert_lookup('178.79.150.15', 4096, '127:22:33:44:55:66:77:128', '8:9:a:b:c:d:e:f')
+   assert_lookup('178.79.150.15', 8191, '127:22:33:44:55:66:77:128', '8:9:a:b:c:d:e:f')
    assert(lookup('178.79.150.15', 8192) == nil)
-   assert_lookup('178.79.150.2', 7850, '127:24:35:46:57:68:79:128', 2)
+   assert_lookup('178.79.150.2', 7850, '127:24:35:46:57:68:79:128', '1E:1:1:1:1:1:1:af')
    assert(lookup('178.79.150.3', 4095) == nil)
-   assert_lookup('178.79.150.3', 4096, '127:14:25:36:47:58:69:128', 3)
-   assert_lookup('178.79.150.3', 5119, '127:14:25:36:47:58:69:128', 3)
+   assert_lookup('178.79.150.3', 4096, '127:14:25:36:47:58:69:128', '1E:2:2:2:2:2:2:af')
+   assert_lookup('178.79.150.3', 5119, '127:14:25:36:47:58:69:128', '1E:2:2:2:2:2:2:af')
    assert(lookup('178.79.150.3', 5120) == nil)
    assert(lookup('178.79.150.4', 7850) == nil)
 
@@ -345,20 +342,5 @@ function selftest()
       assert(i == #psid_map_iter + 1)
    end
 
-   do
-      local br_address_iter = {
-         '8:9:a:b:c:d:e:f',
-         '1E:1:1:1:1:1:1:af',
-         '1E:2:2:2:2:2:2:af'
-      }
-      local i = 1
-      for ipv6 in map:iterate_br_addresses() do
-         local expected = ipv6_protocol:pton(br_address_iter[i])
-         assert(ffi.C.memcmp(expected, ipv6, 16) == 0)
-         i = i + 1
-      end
-      assert(i == #br_address_iter + 1)
-   end
-
    print('ok')
 end
diff --git a/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr-xe0.conf b/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr-xe0.conf
index 84674e15b3..e825743acd 100644
--- a/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr-xe0.conf
+++ b/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr-xe0.conf
@@ -1,6 +1,5 @@
 softwire-config {
   binding-table {
-    br-address fc00::100;
     psid-map {
       addr 193.5.1.100;
       psid-length 6;
@@ -10,946 +9,1135 @@ softwire-config {
       ipv4 193.5.1.100;
       psid 43;
       b4-ipv6 fc00:1:2:3:4:5:0:a8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 45;
       b4-ipv6 fc00:1:2:3:4:5:0:aa;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 60;
       b4-ipv6 fc00:1:2:3:4:5:0:f8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 18;
       b4-ipv6 fc00:1:2:3:4:5:0:ce;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 47;
       b4-ipv6 fc00:1:2:3:4:5:0:eb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 33;
       b4-ipv6 fc00:1:2:3:4:5:0:9e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 63;
       b4-ipv6 fc00:1:2:3:4:5:0:fb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 30;
       b4-ipv6 fc00:1:2:3:4:5:0:119;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 49;
       b4-ipv6 fc00:1:2:3:4:5:0:ed;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 9;
       b4-ipv6 fc00:1:2:3:4:5:0:c5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 3;
       b4-ipv6 fc00:1:2:3:4:5:0:fe;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 56;
       b4-ipv6 fc00:1:2:3:4:5:0:b5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 51;
       b4-ipv6 fc00:1:2:3:4:5:0:b0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 26;
       b4-ipv6 fc00:1:2:3:4:5:0:d6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 37;
       b4-ipv6 fc00:1:2:3:4:5:0:a2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 44;
       b4-ipv6 fc00:1:2:3:4:5:0:e8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 17;
       b4-ipv6 fc00:1:2:3:4:5:0:8e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 48;
       b4-ipv6 fc00:1:2:3:4:5:0:ec;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 39;
       b4-ipv6 fc00:1:2:3:4:5:0:122;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 5;
       b4-ipv6 fc00:1:2:3:4:5:0:c1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 38;
       b4-ipv6 fc00:1:2:3:4:5:0:121;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 21;
       b4-ipv6 fc00:1:2:3:4:5:0:d1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 50;
       b4-ipv6 fc00:1:2:3:4:5:0:ee;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 35;
       b4-ipv6 fc00:1:2:3:4:5:0:df;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 55;
       b4-ipv6 fc00:1:2:3:4:5:0:b4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 46;
       b4-ipv6 fc00:1:2:3:4:5:0:ab;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 53;
       b4-ipv6 fc00:1:2:3:4:5:0:b2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 58;
       b4-ipv6 fc00:1:2:3:4:5:0:b7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 55;
       b4-ipv6 fc00:1:2:3:4:5:0:f3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 1;
       b4-ipv6 fc00:1:2:3:4:5:0:bd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 61;
       b4-ipv6 fc00:1:2:3:4:5:0:ba;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 31;
       b4-ipv6 fc00:1:2:3:4:5:0:9c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 27;
       b4-ipv6 fc00:1:2:3:4:5:0:116;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 54;
       b4-ipv6 fc00:1:2:3:4:5:0:f2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 24;
       b4-ipv6 fc00:1:2:3:4:5:0:113;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 11;
       b4-ipv6 fc00:1:2:3:4:5:0:88;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 34;
       b4-ipv6 fc00:1:2:3:4:5:0:9f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 46;
       b4-ipv6 fc00:1:2:3:4:5:0:129;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 16;
       b4-ipv6 fc00:1:2:3:4:5:0:cc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 19;
       b4-ipv6 fc00:1:2:3:4:5:0:10e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 63;
       b4-ipv6 fc00:1:2:3:4:5:0:13a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 15;
       b4-ipv6 fc00:1:2:3:4:5:0:8c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 13;
       b4-ipv6 fc00:1:2:3:4:5:0:8a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 40;
       b4-ipv6 fc00:1:2:3:4:5:0:123;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 2;
       b4-ipv6 fc00:1:2:3:4:5:0:fd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 21;
       b4-ipv6 fc00:1:2:3:4:5:0:110;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 19;
       b4-ipv6 fc00:1:2:3:4:5:0:cf;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 61;
       b4-ipv6 fc00:1:2:3:4:5:0:138;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 32;
       b4-ipv6 fc00:1:2:3:4:5:0:9d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 14;
       b4-ipv6 fc00:1:2:3:4:5:0:109;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 25;
       b4-ipv6 fc00:1:2:3:4:5:0:96;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 20;
       b4-ipv6 fc00:1:2:3:4:5:0:91;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 59;
       b4-ipv6 fc00:1:2:3:4:5:0:b8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 9;
       b4-ipv6 fc00:1:2:3:4:5:0:104;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 23;
       b4-ipv6 fc00:1:2:3:4:5:0:d3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 60;
       b4-ipv6 fc00:1:2:3:4:5:0:137;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 43;
       b4-ipv6 fc00:1:2:3:4:5:0:e7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 13;
       b4-ipv6 fc00:1:2:3:4:5:0:108;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 33;
       b4-ipv6 fc00:1:2:3:4:5:0:dd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 47;
       b4-ipv6 fc00:1:2:3:4:5:0:12a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 37;
       b4-ipv6 fc00:1:2:3:4:5:0:120;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 6;
       b4-ipv6 fc00:1:2:3:4:5:0:83;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 48;
       b4-ipv6 fc00:1:2:3:4:5:0:ad;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 30;
       b4-ipv6 fc00:1:2:3:4:5:0:9b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 62;
       b4-ipv6 fc00:1:2:3:4:5:0:bb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 16;
       b4-ipv6 fc00:1:2:3:4:5:0:10b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 50;
       b4-ipv6 fc00:1:2:3:4:5:0:af;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 42;
       b4-ipv6 fc00:1:2:3:4:5:0:e6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 29;
       b4-ipv6 fc00:1:2:3:4:5:0:118;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 52;
       b4-ipv6 fc00:1:2:3:4:5:0:b1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 56;
       b4-ipv6 fc00:1:2:3:4:5:0:133;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 49;
       b4-ipv6 fc00:1:2:3:4:5:0:ae;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 53;
       b4-ipv6 fc00:1:2:3:4:5:0:f1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 57;
       b4-ipv6 fc00:1:2:3:4:5:0:134;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 36;
       b4-ipv6 fc00:1:2:3:4:5:0:a1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 5;
       b4-ipv6 fc00:1:2:3:4:5:0:100;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 31;
       b4-ipv6 fc00:1:2:3:4:5:0:db;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 58;
       b4-ipv6 fc00:1:2:3:4:5:0:135;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 35;
       b4-ipv6 fc00:1:2:3:4:5:0:11e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 42;
       b4-ipv6 fc00:1:2:3:4:5:0:a7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 4;
       b4-ipv6 fc00:1:2:3:4:5:0:ff;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 12;
       b4-ipv6 fc00:1:2:3:4:5:0:89;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 3;
       b4-ipv6 fc00:1:2:3:4:5:0:80;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 7;
       b4-ipv6 fc00:1:2:3:4:5:0:84;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 43;
       b4-ipv6 fc00:1:2:3:4:5:0:126;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 10;
       b4-ipv6 fc00:1:2:3:4:5:0:c6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 60;
       b4-ipv6 fc00:1:2:3:4:5:0:b9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 22;
       b4-ipv6 fc00:1:2:3:4:5:0:d2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 32;
       b4-ipv6 fc00:1:2:3:4:5:0:dc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 23;
       b4-ipv6 fc00:1:2:3:4:5:0:112;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 41;
       b4-ipv6 fc00:1:2:3:4:5:0:124;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 19;
       b4-ipv6 fc00:1:2:3:4:5:0:90;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 37;
       b4-ipv6 fc00:1:2:3:4:5:0:e1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 25;
       b4-ipv6 fc00:1:2:3:4:5:0:d5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 38;
       b4-ipv6 fc00:1:2:3:4:5:0:a3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 23;
       b4-ipv6 fc00:1:2:3:4:5:0:94;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 40;
       b4-ipv6 fc00:1:2:3:4:5:0:a5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 1;
       b4-ipv6 fc00:1:2:3:4:5:0:7e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 55;
       b4-ipv6 fc00:1:2:3:4:5:0:132;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 40;
       b4-ipv6 fc00:1:2:3:4:5:0:e4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 15;
       b4-ipv6 fc00:1:2:3:4:5:0:10a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 6;
       b4-ipv6 fc00:1:2:3:4:5:0:c2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 28;
       b4-ipv6 fc00:1:2:3:4:5:0:99;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 41;
       b4-ipv6 fc00:1:2:3:4:5:0:e5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 7;
       b4-ipv6 fc00:1:2:3:4:5:0:c3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 62;
       b4-ipv6 fc00:1:2:3:4:5:0:fa;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 45;
       b4-ipv6 fc00:1:2:3:4:5:0:128;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 31;
       b4-ipv6 fc00:1:2:3:4:5:0:11a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 13;
       b4-ipv6 fc00:1:2:3:4:5:0:c9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 59;
       b4-ipv6 fc00:1:2:3:4:5:0:f7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 57;
       b4-ipv6 fc00:1:2:3:4:5:0:f5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 11;
       b4-ipv6 fc00:1:2:3:4:5:0:106;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 46;
       b4-ipv6 fc00:1:2:3:4:5:0:ea;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 34;
       b4-ipv6 fc00:1:2:3:4:5:0:11d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 2;
       b4-ipv6 fc00:1:2:3:4:5:0:7f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 30;
       b4-ipv6 fc00:1:2:3:4:5:0:da;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 45;
       b4-ipv6 fc00:1:2:3:4:5:0:e9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 61;
       b4-ipv6 fc00:1:2:3:4:5:0:f9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 17;
       b4-ipv6 fc00:1:2:3:4:5:0:10c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 29;
       b4-ipv6 fc00:1:2:3:4:5:0:d9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 33;
       b4-ipv6 fc00:1:2:3:4:5:0:11c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 12;
       b4-ipv6 fc00:1:2:3:4:5:0:c8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 4;
       b4-ipv6 fc00:1:2:3:4:5:0:c0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 52;
       b4-ipv6 fc00:1:2:3:4:5:0:f0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 18;
       b4-ipv6 fc00:1:2:3:4:5:0:10d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 3;
       b4-ipv6 fc00:1:2:3:4:5:0:bf;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 10;
       b4-ipv6 fc00:1:2:3:4:5:0:105;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 8;
       b4-ipv6 fc00:1:2:3:4:5:0:85;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 2;
       b4-ipv6 fc00:1:2:3:4:5:0:be;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 39;
       b4-ipv6 fc00:1:2:3:4:5:0:a4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 36;
       b4-ipv6 fc00:1:2:3:4:5:0:e0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 32;
       b4-ipv6 fc00:1:2:3:4:5:0:11b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 44;
       b4-ipv6 fc00:1:2:3:4:5:0:127;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 48;
       b4-ipv6 fc00:1:2:3:4:5:0:12b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 20;
       b4-ipv6 fc00:1:2:3:4:5:0:10f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 14;
       b4-ipv6 fc00:1:2:3:4:5:0:8b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 24;
       b4-ipv6 fc00:1:2:3:4:5:0:95;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 51;
       b4-ipv6 fc00:1:2:3:4:5:0:12e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 25;
       b4-ipv6 fc00:1:2:3:4:5:0:114;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 10;
       b4-ipv6 fc00:1:2:3:4:5:0:87;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 22;
       b4-ipv6 fc00:1:2:3:4:5:0:93;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 8;
       b4-ipv6 fc00:1:2:3:4:5:0:103;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 22;
       b4-ipv6 fc00:1:2:3:4:5:0:111;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 56;
       b4-ipv6 fc00:1:2:3:4:5:0:f4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 27;
       b4-ipv6 fc00:1:2:3:4:5:0:98;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 63;
       b4-ipv6 fc00:1:2:3:4:5:0:bc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 26;
       b4-ipv6 fc00:1:2:3:4:5:0:115;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 54;
       b4-ipv6 fc00:1:2:3:4:5:0:b3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 44;
       b4-ipv6 fc00:1:2:3:4:5:0:a9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 50;
       b4-ipv6 fc00:1:2:3:4:5:0:12d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 9;
       b4-ipv6 fc00:1:2:3:4:5:0:86;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 58;
       b4-ipv6 fc00:1:2:3:4:5:0:f6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 18;
       b4-ipv6 fc00:1:2:3:4:5:0:8f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 28;
       b4-ipv6 fc00:1:2:3:4:5:0:d8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 27;
       b4-ipv6 fc00:1:2:3:4:5:0:d7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 54;
       b4-ipv6 fc00:1:2:3:4:5:0:131;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 59;
       b4-ipv6 fc00:1:2:3:4:5:0:136;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 41;
       b4-ipv6 fc00:1:2:3:4:5:0:a6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 12;
       b4-ipv6 fc00:1:2:3:4:5:0:107;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 35;
       b4-ipv6 fc00:1:2:3:4:5:0:a0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 11;
       b4-ipv6 fc00:1:2:3:4:5:0:c7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 47;
       b4-ipv6 fc00:1:2:3:4:5:0:ac;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 24;
       b4-ipv6 fc00:1:2:3:4:5:0:d4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 1;
       b4-ipv6 fc00:1:2:3:4:5:0:fc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 8;
       b4-ipv6 fc00:1:2:3:4:5:0:c4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 14;
       b4-ipv6 fc00:1:2:3:4:5:0:ca;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 17;
       b4-ipv6 fc00:1:2:3:4:5:0:cd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 7;
       b4-ipv6 fc00:1:2:3:4:5:0:102;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 51;
       b4-ipv6 fc00:1:2:3:4:5:0:ef;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 6;
       b4-ipv6 fc00:1:2:3:4:5:0:101;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 62;
       b4-ipv6 fc00:1:2:3:4:5:0:139;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 28;
       b4-ipv6 fc00:1:2:3:4:5:0:117;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 16;
       b4-ipv6 fc00:1:2:3:4:5:0:8d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 29;
       b4-ipv6 fc00:1:2:3:4:5:0:9a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 42;
       b4-ipv6 fc00:1:2:3:4:5:0:125;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 21;
       b4-ipv6 fc00:1:2:3:4:5:0:92;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 49;
       b4-ipv6 fc00:1:2:3:4:5:0:12c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 57;
       b4-ipv6 fc00:1:2:3:4:5:0:b6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 20;
       b4-ipv6 fc00:1:2:3:4:5:0:d0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 52;
       b4-ipv6 fc00:1:2:3:4:5:0:12f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 26;
       b4-ipv6 fc00:1:2:3:4:5:0:97;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 36;
       b4-ipv6 fc00:1:2:3:4:5:0:11f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 4;
       b4-ipv6 fc00:1:2:3:4:5:0:81;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 34;
       b4-ipv6 fc00:1:2:3:4:5:0:de;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 5;
       b4-ipv6 fc00:1:2:3:4:5:0:82;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 38;
       b4-ipv6 fc00:1:2:3:4:5:0:e2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 15;
       b4-ipv6 fc00:1:2:3:4:5:0:cb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 39;
       b4-ipv6 fc00:1:2:3:4:5:0:e3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 53;
       b4-ipv6 fc00:1:2:3:4:5:0:130;
+      br-address fc00::100;
     }
   }
   external-interface {
diff --git a/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr.conf b/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr.conf
index 84674e15b3..e825743acd 100644
--- a/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr.conf
+++ b/src/program/snabbvmx/tests/conf/snabbvmx-lwaftr.conf
@@ -1,6 +1,5 @@
 softwire-config {
   binding-table {
-    br-address fc00::100;
     psid-map {
       addr 193.5.1.100;
       psid-length 6;
@@ -10,946 +9,1135 @@ softwire-config {
       ipv4 193.5.1.100;
       psid 43;
       b4-ipv6 fc00:1:2:3:4:5:0:a8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 45;
       b4-ipv6 fc00:1:2:3:4:5:0:aa;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 60;
       b4-ipv6 fc00:1:2:3:4:5:0:f8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 18;
       b4-ipv6 fc00:1:2:3:4:5:0:ce;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 47;
       b4-ipv6 fc00:1:2:3:4:5:0:eb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 33;
       b4-ipv6 fc00:1:2:3:4:5:0:9e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 63;
       b4-ipv6 fc00:1:2:3:4:5:0:fb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 30;
       b4-ipv6 fc00:1:2:3:4:5:0:119;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 49;
       b4-ipv6 fc00:1:2:3:4:5:0:ed;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 9;
       b4-ipv6 fc00:1:2:3:4:5:0:c5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 3;
       b4-ipv6 fc00:1:2:3:4:5:0:fe;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 56;
       b4-ipv6 fc00:1:2:3:4:5:0:b5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 51;
       b4-ipv6 fc00:1:2:3:4:5:0:b0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 26;
       b4-ipv6 fc00:1:2:3:4:5:0:d6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 37;
       b4-ipv6 fc00:1:2:3:4:5:0:a2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 44;
       b4-ipv6 fc00:1:2:3:4:5:0:e8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 17;
       b4-ipv6 fc00:1:2:3:4:5:0:8e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 48;
       b4-ipv6 fc00:1:2:3:4:5:0:ec;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 39;
       b4-ipv6 fc00:1:2:3:4:5:0:122;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 5;
       b4-ipv6 fc00:1:2:3:4:5:0:c1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 38;
       b4-ipv6 fc00:1:2:3:4:5:0:121;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 21;
       b4-ipv6 fc00:1:2:3:4:5:0:d1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 50;
       b4-ipv6 fc00:1:2:3:4:5:0:ee;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 35;
       b4-ipv6 fc00:1:2:3:4:5:0:df;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 55;
       b4-ipv6 fc00:1:2:3:4:5:0:b4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 46;
       b4-ipv6 fc00:1:2:3:4:5:0:ab;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 53;
       b4-ipv6 fc00:1:2:3:4:5:0:b2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 58;
       b4-ipv6 fc00:1:2:3:4:5:0:b7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 55;
       b4-ipv6 fc00:1:2:3:4:5:0:f3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 1;
       b4-ipv6 fc00:1:2:3:4:5:0:bd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 61;
       b4-ipv6 fc00:1:2:3:4:5:0:ba;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 31;
       b4-ipv6 fc00:1:2:3:4:5:0:9c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 27;
       b4-ipv6 fc00:1:2:3:4:5:0:116;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 54;
       b4-ipv6 fc00:1:2:3:4:5:0:f2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 24;
       b4-ipv6 fc00:1:2:3:4:5:0:113;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 11;
       b4-ipv6 fc00:1:2:3:4:5:0:88;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 34;
       b4-ipv6 fc00:1:2:3:4:5:0:9f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 46;
       b4-ipv6 fc00:1:2:3:4:5:0:129;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 16;
       b4-ipv6 fc00:1:2:3:4:5:0:cc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 19;
       b4-ipv6 fc00:1:2:3:4:5:0:10e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 63;
       b4-ipv6 fc00:1:2:3:4:5:0:13a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 15;
       b4-ipv6 fc00:1:2:3:4:5:0:8c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 13;
       b4-ipv6 fc00:1:2:3:4:5:0:8a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 40;
       b4-ipv6 fc00:1:2:3:4:5:0:123;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 2;
       b4-ipv6 fc00:1:2:3:4:5:0:fd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 21;
       b4-ipv6 fc00:1:2:3:4:5:0:110;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 19;
       b4-ipv6 fc00:1:2:3:4:5:0:cf;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 61;
       b4-ipv6 fc00:1:2:3:4:5:0:138;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 32;
       b4-ipv6 fc00:1:2:3:4:5:0:9d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 14;
       b4-ipv6 fc00:1:2:3:4:5:0:109;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 25;
       b4-ipv6 fc00:1:2:3:4:5:0:96;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 20;
       b4-ipv6 fc00:1:2:3:4:5:0:91;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 59;
       b4-ipv6 fc00:1:2:3:4:5:0:b8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 9;
       b4-ipv6 fc00:1:2:3:4:5:0:104;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 23;
       b4-ipv6 fc00:1:2:3:4:5:0:d3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 60;
       b4-ipv6 fc00:1:2:3:4:5:0:137;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 43;
       b4-ipv6 fc00:1:2:3:4:5:0:e7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 13;
       b4-ipv6 fc00:1:2:3:4:5:0:108;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 33;
       b4-ipv6 fc00:1:2:3:4:5:0:dd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 47;
       b4-ipv6 fc00:1:2:3:4:5:0:12a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 37;
       b4-ipv6 fc00:1:2:3:4:5:0:120;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 6;
       b4-ipv6 fc00:1:2:3:4:5:0:83;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 48;
       b4-ipv6 fc00:1:2:3:4:5:0:ad;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 30;
       b4-ipv6 fc00:1:2:3:4:5:0:9b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 62;
       b4-ipv6 fc00:1:2:3:4:5:0:bb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 16;
       b4-ipv6 fc00:1:2:3:4:5:0:10b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 50;
       b4-ipv6 fc00:1:2:3:4:5:0:af;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 42;
       b4-ipv6 fc00:1:2:3:4:5:0:e6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 29;
       b4-ipv6 fc00:1:2:3:4:5:0:118;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 52;
       b4-ipv6 fc00:1:2:3:4:5:0:b1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 56;
       b4-ipv6 fc00:1:2:3:4:5:0:133;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 49;
       b4-ipv6 fc00:1:2:3:4:5:0:ae;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 53;
       b4-ipv6 fc00:1:2:3:4:5:0:f1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 57;
       b4-ipv6 fc00:1:2:3:4:5:0:134;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 36;
       b4-ipv6 fc00:1:2:3:4:5:0:a1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 5;
       b4-ipv6 fc00:1:2:3:4:5:0:100;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 31;
       b4-ipv6 fc00:1:2:3:4:5:0:db;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 58;
       b4-ipv6 fc00:1:2:3:4:5:0:135;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 35;
       b4-ipv6 fc00:1:2:3:4:5:0:11e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 42;
       b4-ipv6 fc00:1:2:3:4:5:0:a7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 4;
       b4-ipv6 fc00:1:2:3:4:5:0:ff;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 12;
       b4-ipv6 fc00:1:2:3:4:5:0:89;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 3;
       b4-ipv6 fc00:1:2:3:4:5:0:80;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 7;
       b4-ipv6 fc00:1:2:3:4:5:0:84;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 43;
       b4-ipv6 fc00:1:2:3:4:5:0:126;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 10;
       b4-ipv6 fc00:1:2:3:4:5:0:c6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 60;
       b4-ipv6 fc00:1:2:3:4:5:0:b9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 22;
       b4-ipv6 fc00:1:2:3:4:5:0:d2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 32;
       b4-ipv6 fc00:1:2:3:4:5:0:dc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 23;
       b4-ipv6 fc00:1:2:3:4:5:0:112;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 41;
       b4-ipv6 fc00:1:2:3:4:5:0:124;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 19;
       b4-ipv6 fc00:1:2:3:4:5:0:90;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 37;
       b4-ipv6 fc00:1:2:3:4:5:0:e1;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 25;
       b4-ipv6 fc00:1:2:3:4:5:0:d5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 38;
       b4-ipv6 fc00:1:2:3:4:5:0:a3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 23;
       b4-ipv6 fc00:1:2:3:4:5:0:94;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 40;
       b4-ipv6 fc00:1:2:3:4:5:0:a5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 1;
       b4-ipv6 fc00:1:2:3:4:5:0:7e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 55;
       b4-ipv6 fc00:1:2:3:4:5:0:132;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 40;
       b4-ipv6 fc00:1:2:3:4:5:0:e4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 15;
       b4-ipv6 fc00:1:2:3:4:5:0:10a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 6;
       b4-ipv6 fc00:1:2:3:4:5:0:c2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 28;
       b4-ipv6 fc00:1:2:3:4:5:0:99;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 41;
       b4-ipv6 fc00:1:2:3:4:5:0:e5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 7;
       b4-ipv6 fc00:1:2:3:4:5:0:c3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 62;
       b4-ipv6 fc00:1:2:3:4:5:0:fa;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 45;
       b4-ipv6 fc00:1:2:3:4:5:0:128;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 31;
       b4-ipv6 fc00:1:2:3:4:5:0:11a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 13;
       b4-ipv6 fc00:1:2:3:4:5:0:c9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 59;
       b4-ipv6 fc00:1:2:3:4:5:0:f7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 57;
       b4-ipv6 fc00:1:2:3:4:5:0:f5;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 11;
       b4-ipv6 fc00:1:2:3:4:5:0:106;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 46;
       b4-ipv6 fc00:1:2:3:4:5:0:ea;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 34;
       b4-ipv6 fc00:1:2:3:4:5:0:11d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 2;
       b4-ipv6 fc00:1:2:3:4:5:0:7f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 30;
       b4-ipv6 fc00:1:2:3:4:5:0:da;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 45;
       b4-ipv6 fc00:1:2:3:4:5:0:e9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 61;
       b4-ipv6 fc00:1:2:3:4:5:0:f9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 17;
       b4-ipv6 fc00:1:2:3:4:5:0:10c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 29;
       b4-ipv6 fc00:1:2:3:4:5:0:d9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 33;
       b4-ipv6 fc00:1:2:3:4:5:0:11c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 12;
       b4-ipv6 fc00:1:2:3:4:5:0:c8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 4;
       b4-ipv6 fc00:1:2:3:4:5:0:c0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 52;
       b4-ipv6 fc00:1:2:3:4:5:0:f0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 18;
       b4-ipv6 fc00:1:2:3:4:5:0:10d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 3;
       b4-ipv6 fc00:1:2:3:4:5:0:bf;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 10;
       b4-ipv6 fc00:1:2:3:4:5:0:105;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 8;
       b4-ipv6 fc00:1:2:3:4:5:0:85;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 2;
       b4-ipv6 fc00:1:2:3:4:5:0:be;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 39;
       b4-ipv6 fc00:1:2:3:4:5:0:a4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 36;
       b4-ipv6 fc00:1:2:3:4:5:0:e0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 32;
       b4-ipv6 fc00:1:2:3:4:5:0:11b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 44;
       b4-ipv6 fc00:1:2:3:4:5:0:127;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 48;
       b4-ipv6 fc00:1:2:3:4:5:0:12b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 20;
       b4-ipv6 fc00:1:2:3:4:5:0:10f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 14;
       b4-ipv6 fc00:1:2:3:4:5:0:8b;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 24;
       b4-ipv6 fc00:1:2:3:4:5:0:95;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 51;
       b4-ipv6 fc00:1:2:3:4:5:0:12e;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 25;
       b4-ipv6 fc00:1:2:3:4:5:0:114;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 10;
       b4-ipv6 fc00:1:2:3:4:5:0:87;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 22;
       b4-ipv6 fc00:1:2:3:4:5:0:93;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 8;
       b4-ipv6 fc00:1:2:3:4:5:0:103;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 22;
       b4-ipv6 fc00:1:2:3:4:5:0:111;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 56;
       b4-ipv6 fc00:1:2:3:4:5:0:f4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 27;
       b4-ipv6 fc00:1:2:3:4:5:0:98;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 63;
       b4-ipv6 fc00:1:2:3:4:5:0:bc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 26;
       b4-ipv6 fc00:1:2:3:4:5:0:115;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 54;
       b4-ipv6 fc00:1:2:3:4:5:0:b3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 44;
       b4-ipv6 fc00:1:2:3:4:5:0:a9;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 50;
       b4-ipv6 fc00:1:2:3:4:5:0:12d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 9;
       b4-ipv6 fc00:1:2:3:4:5:0:86;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 58;
       b4-ipv6 fc00:1:2:3:4:5:0:f6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 18;
       b4-ipv6 fc00:1:2:3:4:5:0:8f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 28;
       b4-ipv6 fc00:1:2:3:4:5:0:d8;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 27;
       b4-ipv6 fc00:1:2:3:4:5:0:d7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 54;
       b4-ipv6 fc00:1:2:3:4:5:0:131;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 59;
       b4-ipv6 fc00:1:2:3:4:5:0:136;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 41;
       b4-ipv6 fc00:1:2:3:4:5:0:a6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 12;
       b4-ipv6 fc00:1:2:3:4:5:0:107;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 35;
       b4-ipv6 fc00:1:2:3:4:5:0:a0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 11;
       b4-ipv6 fc00:1:2:3:4:5:0:c7;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 47;
       b4-ipv6 fc00:1:2:3:4:5:0:ac;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 24;
       b4-ipv6 fc00:1:2:3:4:5:0:d4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 1;
       b4-ipv6 fc00:1:2:3:4:5:0:fc;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 8;
       b4-ipv6 fc00:1:2:3:4:5:0:c4;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 14;
       b4-ipv6 fc00:1:2:3:4:5:0:ca;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 17;
       b4-ipv6 fc00:1:2:3:4:5:0:cd;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 7;
       b4-ipv6 fc00:1:2:3:4:5:0:102;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 51;
       b4-ipv6 fc00:1:2:3:4:5:0:ef;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 6;
       b4-ipv6 fc00:1:2:3:4:5:0:101;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 62;
       b4-ipv6 fc00:1:2:3:4:5:0:139;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 28;
       b4-ipv6 fc00:1:2:3:4:5:0:117;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 16;
       b4-ipv6 fc00:1:2:3:4:5:0:8d;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 29;
       b4-ipv6 fc00:1:2:3:4:5:0:9a;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 42;
       b4-ipv6 fc00:1:2:3:4:5:0:125;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 21;
       b4-ipv6 fc00:1:2:3:4:5:0:92;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 49;
       b4-ipv6 fc00:1:2:3:4:5:0:12c;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 57;
       b4-ipv6 fc00:1:2:3:4:5:0:b6;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 20;
       b4-ipv6 fc00:1:2:3:4:5:0:d0;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 52;
       b4-ipv6 fc00:1:2:3:4:5:0:12f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 26;
       b4-ipv6 fc00:1:2:3:4:5:0:97;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 36;
       b4-ipv6 fc00:1:2:3:4:5:0:11f;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 4;
       b4-ipv6 fc00:1:2:3:4:5:0:81;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 34;
       b4-ipv6 fc00:1:2:3:4:5:0:de;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.100;
       psid 5;
       b4-ipv6 fc00:1:2:3:4:5:0:82;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 38;
       b4-ipv6 fc00:1:2:3:4:5:0:e2;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 15;
       b4-ipv6 fc00:1:2:3:4:5:0:cb;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.101;
       psid 39;
       b4-ipv6 fc00:1:2:3:4:5:0:e3;
+      br-address fc00::100;
     }
     softwire {
       ipv4 193.5.1.102;
       psid 53;
       b4-ipv6 fc00:1:2:3:4:5:0:130;
+      br-address fc00::100;
     }
   }
   external-interface {
diff --git a/src/program/snabbvmx/tests/end-to-end/data/snabbvmx-lwaftr-xe1.conf b/src/program/snabbvmx/tests/end-to-end/data/snabbvmx-lwaftr-xe1.conf
index c928168ce2..9e73bb1832 100644
--- a/src/program/snabbvmx/tests/end-to-end/data/snabbvmx-lwaftr-xe1.conf
+++ b/src/program/snabbvmx/tests/end-to-end/data/snabbvmx-lwaftr-xe1.conf
@@ -1,6 +1,5 @@
 softwire-config {
   binding-table {
-    br-address 2a02:587:f700::100;
     psid-map {
       addr 10.10.0.10;
       psid-length 6;
@@ -15,21 +14,25 @@ softwire-config {
       ipv4 10.10.0.0;
       psid 1;
       b4-ipv6 2a02:587:f710::400;
+      br-address 2a02:587:f700::100;
     }
     softwire {
       ipv4 10.10.0.0;
       psid 4;
       b4-ipv6 2a02:587:f710::430;
+      br-address 2a02:587:f700::100;
     }
     softwire {
       ipv4 10.10.0.0;
       psid 2;
       b4-ipv6 2a02:587:f710::410;
+      br-address 2a02:587:f700::100;
     }
     softwire {
       ipv4 10.10.0.0;
       psid 3;
       b4-ipv6 2a02:587:f710::420;
+      br-address 2a02:587:f700::100;
     }
   }
   external-interface {
diff --git a/src/program/snabbvmx/tests/end-to-end/data/vlan/snabbvmx-lwaftr-xe1.conf b/src/program/snabbvmx/tests/end-to-end/data/vlan/snabbvmx-lwaftr-xe1.conf
index cd73839d46..e2aa2cec1b 100644
--- a/src/program/snabbvmx/tests/end-to-end/data/vlan/snabbvmx-lwaftr-xe1.conf
+++ b/src/program/snabbvmx/tests/end-to-end/data/vlan/snabbvmx-lwaftr-xe1.conf
@@ -1,6 +1,5 @@
 softwire-config {
   binding-table {
-    br-address 2a02:587:f700::100;
     psid-map {
       addr 10.10.0.10;
       psid-length 6;
@@ -15,21 +14,25 @@ softwire-config {
       ipv4 10.10.0.0;
       psid 1;
       b4-ipv6 2a02:587:f710::400;
+      br-address 2a02:587:f700::100;
     }
     softwire {
       ipv4 10.10.0.0;
       psid 4;
       b4-ipv6 2a02:587:f710::430;
+      br-address 2a02:587:f700::100;
     }
     softwire {
       ipv4 10.10.0.0;
       psid 2;
       b4-ipv6 2a02:587:f710::410;
+      br-address 2a02:587:f700::100;
     }
     softwire {
       ipv4 10.10.0.0;
       psid 3;
       b4-ipv6 2a02:587:f710::420;
+      br-address 2a02:587:f700::100;
     }
   }
   external-interface {