diff options
author | Neale Ranns <nranns@cisco.com> | 2016-11-22 17:07:28 +0000 |
---|---|---|
committer | Damjan Marion <dmarion.lists@gmail.com> | 2017-01-27 19:53:46 +0000 |
commit | 32e1c010b0c34fd0984f7fc45fae648a182025c5 (patch) | |
tree | 06a440bdc9dc039ad0dcf866acc9e10a6ea5e2e7 /src/vppinfra | |
parent | 6f692d6e5a8ffc920a728372ef773199bc5466c0 (diff) |
IP Multicast FIB (mfib)
- IPv[46] mfib tables with support for (*,G/m), (*,G) and (S,G) exact and longest prefix match
- Replication represented via a new replicate DPO.
- RPF configuration and data-plane checking
- data-plane signals sent to listening control planes.
The functions of multicast forwarding entries differ from their unicast conterparts, so we introduce a new mfib_table_t and mfib_entry_t objects. However, we re-use the fib_path_list to resolve and build the entry's output list. the fib_path_list provides the service to construct a replicate DPO for multicast.
'make tests' is added to with two new suites; TEST=mfib, this is invocation of the CLI command 'test mfib' which deals with many path add/remove, flag set/unset scenarios, TEST=ip-mcast, data-plane forwarding tests.
Updated applications to use the new MIFB functions;
- IPv6 NS/RA.
- DHCPv6
unit tests for these are undated accordingly.
Change-Id: I49ec37b01f1b170335a5697541c8fd30e6d3a961
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vppinfra')
-rw-r--r-- | src/vppinfra/dlist.h | 2 | ||||
-rw-r--r-- | src/vppinfra/format.c | 8 | ||||
-rw-r--r-- | src/vppinfra/format.h | 4 | ||||
-rw-r--r-- | src/vppinfra/unformat.c | 16 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/vppinfra/dlist.h b/src/vppinfra/dlist.h index 7d09b2bbc7e..e445b39f336 100644 --- a/src/vppinfra/dlist.h +++ b/src/vppinfra/dlist.h @@ -121,7 +121,7 @@ clib_dlist_remove_head (dlist_elt_t * pool, u32 head_index) ASSERT (head->value == ~0); - if (head->next == ~0) + if (head->next == ~0 || (head->next == head_index)) return ~0; rv = head->next; diff --git a/src/vppinfra/format.c b/src/vppinfra/format.c index 78e52e9a2ad..999b093c174 100644 --- a/src/vppinfra/format.c +++ b/src/vppinfra/format.c @@ -150,13 +150,13 @@ justify (u8 * s, format_info_t * fi, uword s_len_orig) return s; } -static u8 * -do_percent (u8 ** _s, u8 * fmt, va_list * va) +static const u8 * +do_percent (u8 ** _s, const u8 * fmt, va_list * va) { u8 *s = *_s; uword c; - u8 *f = fmt; + const u8 *f = fmt; format_info_t fi = { .justify = '+', @@ -385,7 +385,7 @@ done: u8 * va_format (u8 * s, const char *fmt, va_list * va) { - u8 *f = (u8 *) fmt, *g; + const u8 *f = (u8 *) fmt, *g; u8 c; g = f; diff --git a/src/vppinfra/format.h b/src/vppinfra/format.h index bc0d6d15fd5..bec1b6b410d 100644 --- a/src/vppinfra/format.h +++ b/src/vppinfra/format.h @@ -234,7 +234,7 @@ typedef uword (unformat_function_t) (unformat_input_t * input, /* External functions. */ /* General unformatting function with programmable input stream. */ -uword unformat (unformat_input_t * i, char *fmt, ...); +uword unformat (unformat_input_t * i, const char *fmt, ...); /* Call user defined parse function. unformat_user (i, f, ...) is equivalent to unformat (i, "%U", f, ...) */ @@ -242,7 +242,7 @@ uword unformat_user (unformat_input_t * input, unformat_function_t * func, ...); /* Alternate version which allows for extensions. */ -uword va_unformat (unformat_input_t * i, char *fmt, va_list * args); +uword va_unformat (unformat_input_t * i, const char *fmt, va_list * args); /* Setup for unformat of Unix style command line. */ void unformat_init_command_line (unformat_input_t * input, char *argv[]); diff --git a/src/vppinfra/unformat.c b/src/vppinfra/unformat.c index ac8b7ddc712..7c636ccce89 100644 --- a/src/vppinfra/unformat.c +++ b/src/vppinfra/unformat.c @@ -681,8 +681,8 @@ error: return 0; } -static char * -match_input_with_format (unformat_input_t * input, char *f) +static const char * +match_input_with_format (unformat_input_t * input, const char *f) { uword cf, ci; @@ -703,8 +703,8 @@ match_input_with_format (unformat_input_t * input, char *f) return f; } -static char * -do_percent (unformat_input_t * input, va_list * va, char *f) +static const char * +do_percent (unformat_input_t * input, va_list * va, const char *f) { uword cf, n, data_bytes = ~0; @@ -824,9 +824,9 @@ unformat_skip_white_space (unformat_input_t * input) } uword -va_unformat (unformat_input_t * input, char *fmt, va_list * va) +va_unformat (unformat_input_t * input, const char *fmt, va_list * va) { - char *f; + const char *f; uword input_matches_format; uword default_skip_input_white_space; uword n_input_white_space_skipped; @@ -937,7 +937,7 @@ va_unformat (unformat_input_t * input, char *fmt, va_list * va) else { - char *g = match_input_with_format (input, f); + const char *g = match_input_with_format (input, f); if (!g) goto parse_fail; last_non_white_space_match_format = g > f; @@ -963,7 +963,7 @@ parse_fail: } uword -unformat (unformat_input_t * input, char *fmt, ...) +unformat (unformat_input_t * input, const char *fmt, ...) { va_list va; uword result; |