#include "ipip.h"
#include <vppinfra/error.h>
#include <vnet/vnet.h>
+#include <vnet/fib/fib_table.h>
static clib_error_t *create_ipip_tunnel_command_fn(vlib_main_t *vm,
unformat_input_t *input,
ip46_address_t src = ip46_address_initializer, dst = ip46_address_initializer;
u32 instance = ~0;
u32 fib_index = 0;
+ u32 table_id = 0;
int rv;
u32 num_m_args = 0;
u32 sw_if_index;
} else if (unformat(line_input, "dst %U", unformat_ip6_address, &dst.ip6)) {
num_m_args++;
ip6_set = true;
- } else if (unformat(line_input, "outer-fib-id %d", &fib_index))
+ } else if (unformat(line_input, "outer-table-id %d", &table_id))
;
else {
error = clib_error_return(0, "unknown input `%U'", format_unformat_error,
goto done;
}
- rv = ipip_add_tunnel(ip6_set ? IPIP_TRANSPORT_IP6 : IPIP_TRANSPORT_IP4,
- instance,
- &src,
- &dst,
- fib_index,
- &sw_if_index);
+ fib_index = fib_table_find(fib_ip_proto(ip6_set), table_id);
- switch (rv) {
+ if (~0 == fib_index)
+ {
+ rv = VNET_API_ERROR_NO_SUCH_FIB;
+ }
+ else
+ {
+ rv = ipip_add_tunnel(ip6_set ? IPIP_TRANSPORT_IP6 : IPIP_TRANSPORT_IP4,
+ instance,
+ &src,
+ &dst,
+ fib_index,
+ TUNNEL_ENCAP_DECAP_FLAG_NONE,
+ IP_DSCP_CS0,
+ &sw_if_index);
+ }
+
+ switch (rv) {
case 0:
vlib_cli_output(vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main(),
sw_if_index);
VLIB_CLI_COMMAND(create_ipip_tunnel_command, static) = {
.path = "create ipip tunnel",
.short_help = "create ipip tunnel src <addr> dst <addr> [instance <n>] "
- "[outer-fib-id <fib>]",
+ "[outer-table-id <ID>]",
.function = create_ipip_tunnel_command_fn,
};
VLIB_CLI_COMMAND(delete_ipip_tunnel_command, static) = {
.path = "delete ipip tunnel",
- .short_help = "delete ipip tunnel sw_if_index <sw_if_index ",
+ .short_help = "delete ipip tunnel sw_if_index <sw_if_index>",
.function = delete_ipip_tunnel_command_fn,
};
/* *INDENT-ON* */
ipip_tunnel_t *t = va_arg(*args, ipip_tunnel_t *);
ip46_type_t type = (t->transport == IPIP_TRANSPORT_IP4) ? IP46_TYPE_IP4 : IP46_TYPE_IP6;
+ u32 table_id;
+
+ table_id = fib_table_get_table_id(t->fib_index,
+ fib_proto_from_ip46(type));
switch (t->mode) {
case IPIP_MODE_6RD:
- s = format(s, "[%d] 6rd src %U ip6-pfx %U/%d fib-idx %d sw-if-idx %d ",
+ s = format(s, "[%d] 6rd src %U ip6-pfx %U/%d ",
t->dev_instance,
format_ip46_address, &t->tunnel_src, type,
- format_ip6_address, &t->sixrd.ip6_prefix, t->sixrd.ip6_prefix_len,
- t->fib_index, t->sw_if_index);
+ format_ip6_address, &t->sixrd.ip6_prefix, t->sixrd.ip6_prefix_len);
break;
case IPIP_MODE_P2P:
default:
- s = format(s, "[%d] instance %d src %U dst %U fib-idx %d sw-if-idx %d ",
+ s = format(s, "[%d] instance %d src %U dst %U ",
t->dev_instance, t->user_instance,
format_ip46_address, &t->tunnel_src, type,
- format_ip46_address, &t->tunnel_dst, type,
- t->fib_index, t->sw_if_index);
+ format_ip46_address, &t->tunnel_dst, type);
break;
}
+ s = format(s, "table-ID %d sw-if-idx %d flags [%U] dscp %U",
+ table_id, t->sw_if_index,
+ format_tunnel_encap_decap_flags, t->flags,
+ format_ip_dscp, t->dscp);
+
return s;
}
u32 ip6_prefix_len = 0, ip4_prefix_len = 0, sixrd_tunnel_index;
u32 num_m_args = 0;
/* Optional arguments */
- u32 fib_index = 0;
+ u32 ip4_table_id = 0, ip4_fib_index;
+ u32 ip6_table_id = 0, ip6_fib_index;
clib_error_t *error = 0;
bool security_check = false;
+ int rv;
/* Get a line of input. */
if (!unformat_user(input, unformat_line_input, line_input))
num_m_args++;
else if (unformat(line_input, "ip4-src %U", unformat_ip4_address, &ip4_src))
num_m_args++;
- else if (unformat(line_input, "fib-id %d", &fib_index))
+ else if (unformat(line_input, "ip4-table-id %d", &ip4_table_id))
+ ;
+ else if (unformat(line_input, "ip6-table-id %d", &ip6_table_id))
;
else {
error = clib_error_return(0, "unknown input `%U'", format_unformat_error,
error = clib_error_return(0, "mandatory argument(s) missing");
goto done;
}
- int rv = sixrd_add_tunnel(&ip6_prefix, ip6_prefix_len, &ip4_prefix,
+ ip4_fib_index = fib_table_find(FIB_PROTOCOL_IP4, ip4_table_id);
+ ip6_fib_index = fib_table_find(FIB_PROTOCOL_IP6, ip6_table_id);
+
+ if (~0 == ip4_fib_index)
+ {
+ error = clib_error_return(0, "No such IP4 table %d", ip4_table_id);
+ rv = VNET_API_ERROR_NO_SUCH_FIB;
+ }
+ else if (~0 == ip6_fib_index)
+ {
+ error = clib_error_return(0, "No such IP6 table %d", ip6_table_id);
+ rv = VNET_API_ERROR_NO_SUCH_FIB;
+ }
+ else
+ {
+ rv = sixrd_add_tunnel(&ip6_prefix, ip6_prefix_len, &ip4_prefix,
ip4_prefix_len, &ip4_src, security_check,
- fib_index, &sixrd_tunnel_index);
- if (rv)
- error = clib_error_return(0, "adding tunnel failed %d", rv);
+ ip4_fib_index, ip6_fib_index,
+ &sixrd_tunnel_index);
- done:
+ if (rv)
+ error = clib_error_return(0, "adding tunnel failed %d", rv);
+ }
+
+done:
unformat_free(line_input);
return error;
VLIB_CLI_COMMAND(create_sixrd_tunnel_command, static) = {
.path = "create 6rd tunnel",
.short_help = "create 6rd tunnel ip6-pfx <ip6-pfx> ip4-pfx <ip4-pfx> "
- "ip4-src <ip4-addr> [del]",
+ "ip4-src <ip4-addr> ip4-table-id <ID> ip6-table-id <ID> "
+ "[security-check]",
.function = create_sixrd_tunnel_command_fn,
};
VLIB_CLI_COMMAND(delete_sixrd_tunnel_command, static) = {
.path = "delete 6rd tunnel",
- .short_help = "delete 6rd tunnel sw_if_index <sw_if_index",
+ .short_help = "delete 6rd tunnel sw_if_index <sw_if_index>",
.function = delete_sixrd_tunnel_command_fn,
};
/* *INDENT-ON* */