diff options
| author |   Jakub Grajciar <jgrajcia@cisco.com> | 2020-01-31 09:35:29 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2020-03-05 15:26:51 +0000 |
| commit | b4e5e50fe898bf905aa7087e17740394b97e5cf9 (patch) | |
| tree | 26e8afd851165d38def755048fe69d6578de9fe8 /src/vpp | |
| parent | 5893747d72acd0a507f74fe61c13cae54de23630 (diff) | |
session: API cleanup
Use consistent API types.
Type: fix
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: Ib752a3425c076eb53bc5255a48039cbb74b1fcce
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'src/vpp')
| -rw-r--r-- | src/vpp/api/custom_dump.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index 854af20afe9..a4e04ebeaf2 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -3382,13 +3382,13 @@ static void *vl_api_app_namespace_add_del_t_print (vl_api_app_namespace_add_del_t * mp, void *handle) { u8 *s; - u8 len = clib_min (mp->namespace_id_len, - ARRAY_LEN (mp->namespace_id) - 1); - mp->namespace_id[len] = 0; + s = format (0, "SCRIPT: app_namespace_add_del "); s = format (s, "ns-id %s secret %lu sw_if_index %d ipv4_fib_id %d " - "ipv6_fib_id %d", (char *) mp->namespace_id, mp->secret, - (mp->sw_if_index), (mp->ip4_fib_id), (mp->ip6_fib_id)); + "ipv6_fib_id %d", + vl_api_from_api_to_new_c_string (&mp->namespace_id), + mp->secret, (mp->sw_if_index), (mp->ip4_fib_id), + (mp->ip6_fib_id)); FINISH; } @@ -3437,21 +3437,25 @@ static void *vl_api_session_rule_add_del_t_print (vl_api_session_rule_add_del_t * mp, void *handle) { u8 *s; + fib_prefix_t lcl, rmt; char *proto = mp->transport_proto == 0 ? "tcp" : "udp"; s = format (0, "SCRIPT: session_rule_add_del "); mp->tag[sizeof (mp->tag) - 1] = 0; - if (mp->is_ip4) + ip_prefix_decode (&mp->lcl, &lcl); + ip_prefix_decode (&mp->rmt, &rmt); + + if (lcl.fp_proto == FIB_PROTOCOL_IP4) s = format (s, "appns %d scope %d %s %U/%d %d %U/%d %d action %u tag %s", mp->appns_index, mp->scope, proto, format_ip4_address, - (ip4_address_t *) mp->lcl_ip, mp->lcl_plen, - format_ip4_address, (ip4_address_t *) mp->rmt_ip, - mp->rmt_plen, mp->action_index, mp->tag); + &lcl.fp_addr.ip4, lcl.fp_len, + format_ip4_address, &rmt.fp_addr.ip4, + rmt.fp_len, mp->action_index, mp->tag); else s = format (s, "appns %d scope %d %s %U/%d %d %U/%d %d action %u tag %s", mp->appns_index, mp->scope, proto, format_ip6_address, - (ip6_address_t *) mp->lcl_ip, mp->lcl_plen, - format_ip6_address, (ip6_address_t *) mp->rmt_ip, - mp->rmt_plen, mp->action_index, mp->tag); + &lcl.fp_addr.ip6, lcl.fp_len, + format_ip6_address, &rmt.fp_addr.ip6, + rmt.fp_len, mp->action_index, mp->tag); FINISH; } |