diff options
| author |   Neale Ranns <neale@graphiant.com> | 2022-03-04 13:44:47 +0000 |
|---|---|---|
| committer | Neale Ranns <neale@graphiant.com> | 2022-03-04 14:29:09 +0000 |
| commit | 0a3160b698baa8a65edefbec90a2c748381d1ae4 (patch) | |
| tree | fca74b811532440cacad98855b014b4771053b88 /src | |
| parent | c8f7fd13676697871441a6f539907e385f994c25 (diff) | |
tunnel: Fix the format of tunnel flags
Type: fix
it only display the first flag set
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: I45cddbac0d4eed8bda10bf5e0f7c9db0faf183c5
Diffstat (limited to 'src')
| -rw-r--r-- | src/vnet/tunnel/tunnel.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/vnet/tunnel/tunnel.c b/src/vnet/tunnel/tunnel.c index d45a46205d8..0d27ad82538 100644 --- a/src/vnet/tunnel/tunnel.c +++ b/src/vnet/tunnel/tunnel.c @@ -66,16 +66,19 @@ unformat_tunnel_mode (unformat_input_t * input, va_list * args) u8 * format_tunnel_encap_decap_flags (u8 * s, va_list * args) { - tunnel_encap_decap_flags_t f = va_arg (*args, int); + tunnel_encap_decap_flags_t f = va_arg (*args, u32); if (f == TUNNEL_ENCAP_DECAP_FLAG_NONE) s = format (s, "none"); - + else + { #define _(a, b, c) \ - else if (f & TUNNEL_ENCAP_DECAP_FLAG_##a) s = format (s, "%s ", b); - foreach_tunnel_encap_decap_flag + if (f & TUNNEL_ENCAP_DECAP_FLAG_##a) \ + s = format (s, "%s ", b); + foreach_tunnel_encap_decap_flag #undef _ - return (s); + } + return (s); } uword @@ -95,15 +98,19 @@ unformat_tunnel_encap_decap_flags (unformat_input_t * input, va_list * args) u8 * format_tunnel_flags (u8 *s, va_list *args) { - tunnel_flags_t f = va_arg (*args, int); + tunnel_flags_t f = va_arg (*args, u32); if (f == TUNNEL_FLAG_NONE) s = format (s, "none"); - -#define _(a, b, c) else if (f & TUNNEL_FLAG_##a) s = format (s, "%s ", c); - foreach_tunnel_flag + else + { +#define _(a, b, c) \ + if (f & TUNNEL_FLAG_##a) \ + s = format (s, "%s ", c); + foreach_tunnel_flag #undef _ - return (s); + } + return (s); } uword |