
vppapigen now generates per-message crcs. Verified that whitespace and real changes in message A don't change the crc for message B, etc. Fixed the sample and flowperpkt plugins to participate. Others need the same treatment. They don't build due to python/java language binding build issues. To use the scheme: Client connects as usual. Then call: u32 vl_api_get_msg_index(char * name_and_crc) name_and_crc is a string like: "flowperpkt_tx_interface_add_del_753301f3", aka the message name with _%08x <expected crc> appended. Try these vpp-api-test commands to play with it: vat# dump_msg_api_table <snip> [366]: punt_reply_cca27fbe [367]: ipsec_spd_dump_5e9ae88e [368]: ipsec_spd_details_6f7821b0 [369]: sample_macswap_enable_disable_0f2813e2 [370]: sample_macswap_enable_disable_reply_476738e5 [371]: flowperpkt_tx_interface_add_del_753301f3 [372]: flowperpkt_tx_interface_add_del_reply_d47e6e0b vat# get_msg_id sample_macswap_enable_disable_reply_476738e5 'sample_macswap_enable_disable_reply_476738e5' has message index 370 vat# get_msg_id sample_macswap_enable_disable_reply_476738e3 'sample_macswap_enable_disable_reply_476738e3' not found CRCs may vary, etc. vppapigen is used to build a set of JSON representations of each API file from vpp-api/Makefile.am and that is in turn used by each language binding (Java, Python, Lua). Change-Id: I3d64582e779dac5f20cddec79c562c288d8fd9c6 Signed-off-by: Dave Barach <dave@barachs.net> Signed-off-by: Ole Troan <ot@cisco.com>
251 lines
5.6 KiB
C
251 lines
5.6 KiB
C
/*
|
|
* Copyright (c) 2016 Cisco and/or its affiliates.
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stddef.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <netinet/in.h>
|
|
#include <netdb.h>
|
|
#include <signal.h>
|
|
#include <setjmp.h>
|
|
#include <stdbool.h>
|
|
|
|
#include <vnet/vnet.h>
|
|
#include <vlib/vlib.h>
|
|
#include <vlib/unix/unix.h>
|
|
#include <vlibapi/api.h>
|
|
#include <vlibmemory/api.h>
|
|
|
|
#include <vpp-api/vpe_msg_enum.h>
|
|
|
|
#include "pneum.h"
|
|
|
|
#define vl_typedefs /* define message structures */
|
|
#include <vpp-api/vpe_all_api_h.h>
|
|
#undef vl_typedefs
|
|
|
|
#define vl_endianfun /* define message structures */
|
|
#include <vpp-api/vpe_all_api_h.h>
|
|
#undef vl_endianfun
|
|
|
|
typedef struct {
|
|
u8 rx_thread_jmpbuf_valid;
|
|
u8 connected_to_vlib;
|
|
jmp_buf rx_thread_jmpbuf;
|
|
pthread_t rx_thread_handle;
|
|
} pneum_main_t;
|
|
|
|
pneum_main_t pneum_main;
|
|
|
|
pneum_callback_t pneum_callback;
|
|
|
|
/*
|
|
* Satisfy external references when -lvlib is not available.
|
|
*/
|
|
void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...)
|
|
{
|
|
clib_warning ("vlib_cli_output called...");
|
|
}
|
|
|
|
void
|
|
pneum_free (void * msg)
|
|
{
|
|
vl_msg_api_free (msg);
|
|
}
|
|
|
|
static void
|
|
pneum_api_handler (void *msg)
|
|
{
|
|
u16 id = ntohs(*((u16 *)msg));
|
|
if (id == VL_API_RX_THREAD_EXIT) {
|
|
pneum_main_t *pm = &pneum_main;
|
|
vl_msg_api_free(msg);
|
|
longjmp(pm->rx_thread_jmpbuf, 1);
|
|
}
|
|
msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
|
|
int l = ntohl(msgbuf->data_len);
|
|
if (l == 0)
|
|
clib_warning("Message ID %d has wrong length: %d\n", id, l);
|
|
|
|
/* Call Python callback */
|
|
ASSERT(pneum_callback);
|
|
(pneum_callback)(msg, l);
|
|
pneum_free(msg);
|
|
}
|
|
|
|
static void *
|
|
pneum_rx_thread_fn (void *arg)
|
|
{
|
|
unix_shared_memory_queue_t *q;
|
|
pneum_main_t *pm = &pneum_main;
|
|
api_main_t *am = &api_main;
|
|
uword msg;
|
|
|
|
q = am->vl_input_queue;
|
|
|
|
/* So we can make the rx thread terminate cleanly */
|
|
if (setjmp(pm->rx_thread_jmpbuf) == 0) {
|
|
pm->rx_thread_jmpbuf_valid = 1;
|
|
while (1)
|
|
while (!unix_shared_memory_queue_sub(q, (u8 *)&msg, 0))
|
|
pneum_api_handler((void *)msg);
|
|
}
|
|
pthread_exit(0);
|
|
}
|
|
|
|
uword *
|
|
pneum_msg_table_get_hash (void)
|
|
{
|
|
api_main_t *am = &api_main;
|
|
return (am->msg_index_by_name_and_crc);
|
|
}
|
|
|
|
int
|
|
pneum_msg_table_size(void)
|
|
{
|
|
api_main_t *am = &api_main;
|
|
return hash_elts(am->msg_index_by_name_and_crc);
|
|
}
|
|
|
|
int
|
|
pneum_connect (char * name, char * chroot_prefix, pneum_callback_t cb)
|
|
{
|
|
int rv = 0;
|
|
pneum_main_t *pm = &pneum_main;
|
|
|
|
if (chroot_prefix != NULL)
|
|
vl_set_memory_root_path (chroot_prefix);
|
|
|
|
if ((rv = vl_client_api_map("/vpe-api"))) {
|
|
clib_warning ("vl_client_api map rv %d", rv);
|
|
return rv;
|
|
}
|
|
|
|
if (vl_client_connect(name, 0, 32) < 0) {
|
|
vl_client_api_unmap();
|
|
return (-1);
|
|
}
|
|
|
|
if (cb) {
|
|
/* Start the rx queue thread */
|
|
rv = pthread_create(&pm->rx_thread_handle, NULL, pneum_rx_thread_fn, 0);
|
|
if (rv) {
|
|
clib_warning("pthread_create returned %d", rv);
|
|
vl_client_api_unmap();
|
|
return (-1);
|
|
}
|
|
pneum_callback = cb;
|
|
}
|
|
|
|
pm->connected_to_vlib = 1;
|
|
|
|
return (0);
|
|
}
|
|
|
|
int
|
|
pneum_disconnect (void)
|
|
{
|
|
api_main_t *am = &api_main;
|
|
pneum_main_t *pm = &pneum_main;
|
|
|
|
if (pm->rx_thread_jmpbuf_valid) {
|
|
vl_api_rx_thread_exit_t *ep;
|
|
uword junk;
|
|
ep = vl_msg_api_alloc (sizeof (*ep));
|
|
ep->_vl_msg_id = ntohs(VL_API_RX_THREAD_EXIT);
|
|
vl_msg_api_send_shmem(am->vl_input_queue, (u8 *)&ep);
|
|
pthread_join(pm->rx_thread_handle, (void **) &junk);
|
|
}
|
|
if (pm->connected_to_vlib) {
|
|
vl_client_disconnect();
|
|
vl_client_api_unmap();
|
|
pneum_callback = 0;
|
|
}
|
|
memset (pm, 0, sizeof (*pm));
|
|
|
|
return (0);
|
|
}
|
|
|
|
int
|
|
pneum_read (char **p, int *l)
|
|
{
|
|
unix_shared_memory_queue_t *q;
|
|
api_main_t *am = &api_main;
|
|
pneum_main_t *pm = &pneum_main;
|
|
uword msg;
|
|
|
|
if (!pm->connected_to_vlib) return -1;
|
|
|
|
*l = 0;
|
|
|
|
if (am->our_pid == 0) return (-1);
|
|
|
|
q = am->vl_input_queue;
|
|
int rv = unix_shared_memory_queue_sub(q, (u8 *)&msg, 0);
|
|
if (rv == 0) {
|
|
u16 msg_id = ntohs(*((u16 *)msg));
|
|
msgbuf_t *msgbuf = (msgbuf_t *)(((u8 *)msg) - offsetof(msgbuf_t, data));
|
|
*l = ntohl(msgbuf->data_len);
|
|
if (*l == 0) {
|
|
printf("Unregistered API message: %d\n", msg_id);
|
|
return (-1);
|
|
}
|
|
*p = (char *)msg;
|
|
} else {
|
|
printf("Read failed with %d\n", rv);
|
|
}
|
|
return (rv);
|
|
}
|
|
|
|
/*
|
|
* XXX: Makes the assumption that client_index is the first member
|
|
*/
|
|
typedef VL_API_PACKED(struct _vl_api_header {
|
|
u16 _vl_msg_id;
|
|
u32 client_index;
|
|
}) vl_api_header_t;
|
|
|
|
static unsigned int
|
|
pneum_client_index (void)
|
|
{
|
|
return (api_main.my_client_index);
|
|
}
|
|
|
|
int
|
|
pneum_write (char *p, int l)
|
|
{
|
|
int rv = -1;
|
|
api_main_t *am = &api_main;
|
|
vl_api_header_t *mp = vl_msg_api_alloc(l);
|
|
unix_shared_memory_queue_t *q;
|
|
pneum_main_t *pm = &pneum_main;
|
|
|
|
if (!pm->connected_to_vlib) return -1;
|
|
if (!mp) return (-1);
|
|
memcpy(mp, p, l);
|
|
mp->client_index = pneum_client_index();
|
|
q = am->shmem_hdr->vl_input_queue;
|
|
rv = unix_shared_memory_queue_add(q, (u8 *)&mp, 0);
|
|
if (rv != 0) {
|
|
printf("vpe_api_write fails: %d\n", rv);
|
|
/* Clear message */
|
|
pneum_free(mp);
|
|
}
|
|
return (rv);
|
|
}
|