diff options
Diffstat (limited to 'src/plugins/srv6-mobile/gtp4_e.c')
-rw-r--r-- | src/plugins/srv6-mobile/gtp4_e.c | 68 |
1 files changed, 53 insertions, 15 deletions
diff --git a/src/plugins/srv6-mobile/gtp4_e.c b/src/plugins/srv6-mobile/gtp4_e.c index 211e95d11de..52f1615aa85 100644 --- a/src/plugins/srv6-mobile/gtp4_e.c +++ b/src/plugins/srv6-mobile/gtp4_e.c @@ -66,30 +66,70 @@ static u8 param_str[] = ""; static u8 * clb_format_srv6_end_m_gtp4_e (u8 * s, va_list * args) { - srv6_end_gtp4_param_t *ls_mem = va_arg (*args, void *); + srv6_end_gtp4_e_param_t *ls_mem = va_arg (*args, void *); - s = format (s, "SRv6 End gtp4.e\n\t"); + s = format (s, "SRv6 End gtp4.e\n"); - s = format (s, "IPv4 address position: %d\n", ls_mem->v4src_position); + s = format (s, "\tIPv4 address position: %d\n", ls_mem->v4src_position); + + s = format (s, "\tIPv4 source address: %U\n", format_ip4_address, + &ls_mem->v4src_addr); + + s = format (s, "\tFib Table %d\n", ls_mem->fib_table); return s; } +void +alloc_param_srv6_end_m_gtp4_e (void **plugin_mem_p, const void *v4src_addr, + const u32 v4src_position, const u32 fib_table) +{ + srv6_end_gtp4_e_param_t *ls_mem; + ls_mem = clib_mem_alloc (sizeof *ls_mem); + clib_memset (ls_mem, 0, sizeof *ls_mem); + *plugin_mem_p = ls_mem; + ls_mem->v4src_position = v4src_position; + memcpy (&ls_mem->v4src_addr, v4src_addr, sizeof (ip4_address_t)); + + ls_mem->fib_table = fib_table; + ls_mem->fib4_index = ip4_fib_index_from_table_id (fib_table); + ls_mem->fib6_index = ip6_fib_index_from_table_id (fib_table); +} + static uword clb_unformat_srv6_end_m_gtp4_e (unformat_input_t * input, va_list * args) { void **plugin_mem_p = va_arg (*args, void **); - srv6_end_gtp4_param_t *ls_mem; - u32 v4src_position; - - if (!unformat (input, "end.m.gtp4.e v4src_position %d", &v4src_position)) + ip4_address_t v4src_addr; + u32 v4src_position = 0; + u32 fib_table; + bool config = false; + + memset (&v4src_addr, 0, sizeof (ip4_address_t)); + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "end.m.gtp4.e v4src_position %d fib-table %d", + &v4src_position, &fib_table)) + { + config = true; + } + else if (unformat (input, "end.m.gtp4.e v4src_addr %U fib-table %d", + unformat_ip4_address, &v4src_addr, &fib_table)) + { + config = true; + } + else + { + return 0; + } + } + + if (!config) return 0; - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); - clib_memset (ls_mem, 0, sizeof *ls_mem); - *plugin_mem_p = ls_mem; - - ls_mem->v4src_position = v4src_position; + alloc_param_srv6_end_m_gtp4_e (plugin_mem_p, &v4src_addr, v4src_position, + fib_table); return 1; } @@ -103,7 +143,7 @@ clb_creation_srv6_end_m_gtp4_e (ip6_sr_localsid_t * localsid) static int clb_removal_srv6_end_m_gtp4_e (ip6_sr_localsid_t * localsid) { - srv6_end_gtp4_param_t *ls_mem; + srv6_end_gtp4_e_param_t *ls_mem; ls_mem = localsid->plugin_mem; @@ -163,7 +203,6 @@ srv6_end_m_gtp4_e_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VNET_FEATURE_INIT (srv6_end_m_gtp4_e, static) = { .arc_name = "ip6-unicast", @@ -177,7 +216,6 @@ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "SRv6 GTP Endpoint Functions", }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |