Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: fib api updates
[vpp.git]
/
src
/
vpp
/
api
/
api.c
diff --git
a/src/vpp/api/api.c
b/src/vpp/api/api.c
index
3fce77a
..
9c23811
100644
(file)
--- a/
src/vpp/api/api.c
+++ b/
src/vpp/api/api.c
@@
-59,6
+59,8
@@
#include <vnet/ip/format.h>
#include <vpp/api/vpe_msg_enum.h>
#include <vnet/ip/format.h>
#include <vpp/api/vpe_msg_enum.h>
+#include <vpp/api/types.h>
+#include <vlibapi/api_types_inlines.h>
#define vl_typedefs /* define message structures */
#include <vpp/api/vpe_all_api_h.h>
#define vl_typedefs /* define message structures */
#include <vpp/api/vpe_all_api_h.h>
@@
-102,9
+104,6
@@
memclnt_delete_callback (u32 client_index)
vpe_api_main_t *vam = &vpe_api_main;
vpe_client_registration_t *rp;
uword *p;
vpe_api_main_t *vam = &vpe_api_main;
vpe_client_registration_t *rp;
uword *p;
- int stats_memclnt_delete_callback (u32 client_index);
-
- stats_memclnt_delete_callback (client_index);
#define _(a) \
p = hash_get (vam->a##_registration_hash, client_index); \
#define _(a) \
p = hash_get (vam->a##_registration_hash, client_index); \
@@
-228,7
+227,7
@@
vl_api_cli_inband_t_handler (vl_api_cli_inband_t * mp)
unformat_init_string (&input, (char *) vl_api_from_api_string (&mp->cmd),
vl_api_string_len (&mp->cmd));
unformat_init_string (&input, (char *) vl_api_from_api_string (&mp->cmd),
vl_api_string_len (&mp->cmd));
- vlib_cli_input (vm, &input, inband_cli_output, (uword) & out_vec);
+
rv =
vlib_cli_input (vm, &input, inband_cli_output, (uword) & out_vec);
len = vec_len (out_vec);
len = vec_len (out_vec);
@@
-289,8
+288,7
@@
get_thread_data (vl_api_thread_data_t * td, int index)
static void
vl_api_show_threads_t_handler (vl_api_show_threads_t * mp)
{
static void
vl_api_show_threads_t_handler (vl_api_show_threads_t * mp)
{
- vlib_main_t *vm = vlib_get_main ();
- int rv = 0, count = 0;
+ int count = 0;
#if !defined(__powerpc64__)
vl_api_registration_t *reg;
#if !defined(__powerpc64__)
vl_api_registration_t *reg;
@@
-540,7
+538,9
@@
vpe_api_hookup (vlib_main_t * vm)
/*
* Thread-safe API messages
*/
/*
* Thread-safe API messages
*/
- am->is_mp_safe[VL_API_IP_ADD_DEL_ROUTE] = 1;
+ am->is_mp_safe[VL_API_CONTROL_PING] = 1;
+ am->is_mp_safe[VL_API_CONTROL_PING_REPLY] = 1;
+ am->is_mp_safe[VL_API_IP_ROUTE_ADD_DEL] = 1;
am->is_mp_safe[VL_API_GET_NODE_GRAPH] = 1;
/*
am->is_mp_safe[VL_API_GET_NODE_GRAPH] = 1;
/*
@@
-701,7
+701,7
@@
format_arp_event (u8 * s, va_list * args)
vl_api_ip4_arp_event_t *event = va_arg (*args, vl_api_ip4_arp_event_t *);
s = format (s, "pid %d: ", ntohl (event->pid));
vl_api_ip4_arp_event_t *event = va_arg (*args, vl_api_ip4_arp_event_t *);
s = format (s, "pid %d: ", ntohl (event->pid));
- s = format (s, "resolution for %U", format_
ip4_address, &event->address
);
+ s = format (s, "resolution for %U", format_
vl_api_ip4_address, event->ip
);
return s;
}
return s;
}
@@
-711,7
+711,7
@@
format_nd_event (u8 * s, va_list * args)
vl_api_ip6_nd_event_t *event = va_arg (*args, vl_api_ip6_nd_event_t *);
s = format (s, "pid %d: ", ntohl (event->pid));
vl_api_ip6_nd_event_t *event = va_arg (*args, vl_api_ip6_nd_event_t *);
s = format (s, "pid %d: ", ntohl (event->pid));
- s = format (s, "resolution for %U", format_
ip6_address, event->address
);
+ s = format (s, "resolution for %U", format_
vl_api_ip6_address, event->ip
);
return s;
}
return s;
}