/* define message IDs */
#include <http_static/http_static_msg_enum.h>
+#include <vpp/api/types.h>
+
/* define message structures */
#define vl_typedefs
#include <http_static/http_static_all_api_h.h>
vl_api_http_static_enable_reply_t *rmp;
http_static_main_t *hmp = &http_static_main;
int rv;
+ u8 *www_root = 0;
+ u8 *uri = 0;
- mp->uri[ARRAY_LEN (mp->uri) - 1] = 0;
- mp->www_root[ARRAY_LEN (mp->www_root) - 1] = 0;
+ char *p = (char *) &mp->www_root;
+ www_root = vl_api_from_api_to_vec ((vl_api_string_t *) p);
+ p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+ uri = vl_api_from_api_to_vec ((vl_api_string_t *) p);
rv = http_static_server_enable_api
- (ntohl (mp->fifo_size), ntohl (mp->cache_size_limit),
+ (ntohl (mp->fifo_size),
+ ntohl (mp->cache_size_limit),
ntohl (mp->prealloc_fifos),
- ntohl (mp->private_segment_size), mp->www_root, mp->uri);
+ ntohl (mp->private_segment_size), www_root, uri);
+ vec_free (www_root);
+ vec_free (uri);
REPLY_MACRO (VL_API_HTTP_STATIC_ENABLE_REPLY);
}
static void
setup_message_id_table (http_static_main_t * hmp, api_main_t * am)
{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n #crc, id + hmp->msg_id_base);
+#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + hmp->msg_id_base);
foreach_vl_msg_name_crc_http_static;
#undef _
}