diff options
| author |   Ole Troan <ot@cisco.com> | 2018-09-27 13:53:30 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-09-27 20:00:26 +0000 |
| commit | 0fb2cc65134d268d367678be32c50252ad4cd311 (patch) | |
| tree | 4396afc309314a0aea8fcf6ed422af790035b037 /src/plugins/map/map.c | |
| parent | ec11b13a21b2becc1d1bd746a04624d17b26583f (diff) | |
MAP: 64-bit DMR
Change-Id: I261e11f1006039e4a4019fec2fd3271763ae476a
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/map/map.c')
| -rw-r--r-- | src/plugins/map/map.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/map/map.c b/src/plugins/map/map.c index 63d6e1a3965..6206a153383 100644 --- a/src/plugins/map/map.c +++ b/src/plugins/map/map.c @@ -55,7 +55,7 @@ map_main_t map_main; /* * This code supports MAP-T: * - * With DMR prefix length equal to 96. + * With a DMR prefix length of 64 or 96 (RFC6052). * */ @@ -81,15 +81,9 @@ map_create_domain (ip4_address_t * ip4_prefix, /* Sanity check on the src prefix length */ if (flags & MAP_DOMAIN_TRANSLATION) { - if (ip6_src_len != 96) + if (ip6_src_len != 96 && ip6_src_len != 64) { - clib_warning ("MAP-T only supports ip6_src_len = 96 for now."); - return -1; - } - if ((flags & MAP_DOMAIN_RFC6052) && ip6_prefix_len != 96) - { - clib_warning ("RFC6052 translation only supports ip6_prefix_len = " - "96 for now"); + clib_warning ("MAP-T only supports prefix lengths of 64 and 96."); return -1; } } @@ -2314,8 +2308,8 @@ map_init (vlib_main_t * vm) mm->frag_ignore_df = false; vec_validate (mm->domain_counters, MAP_N_DOMAIN_COUNTER - 1); - mm->domain_counters[MAP_DOMAIN_COUNTER_RX].name = "rx"; - mm->domain_counters[MAP_DOMAIN_COUNTER_TX].name = "tx"; + mm->domain_counters[MAP_DOMAIN_COUNTER_RX].name = "/map/rx"; + mm->domain_counters[MAP_DOMAIN_COUNTER_TX].name = "/map/tx"; vlib_validate_simple_counter (&mm->icmp_relayed, 0); vlib_zero_simple_counter (&mm->icmp_relayed, 0); |