diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index e5c9e01edc..dafa8f30a5 100644 --- a/cmake/modules/driver.cmake +++ b/cmake/modules/driver.cmake @@ -31,8 +31,8 @@ else() # In case you want to test against another driver version (or branch, or commit) just pass the variable - # ie., `cmake -DDRIVER_VERSION=dev ..` if(NOT DRIVER_VERSION) - set(DRIVER_VERSION "8.1.0+driver") - set(DRIVER_CHECKSUM "SHA256=182e6787bf86249a846a3baeb4dcd31578b76d4a13efa16ce3f44d66b18a77a6") + set(DRIVER_VERSION "9.0.0+driver") + set(DRIVER_CHECKSUM "SHA256=ef563fe19f9cdbdfcf17cee3e83c79e8387b78a87e0593eb3e2787c9b8540113") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index 67eb84b182..0bee2d09b1 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -47,8 +47,8 @@ else() # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` if(NOT FALCOSECURITY_LIBS_VERSION) - set(FALCOSECURITY_LIBS_VERSION "0.21.0") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=9e977001dd42586df42a5dc7e7a948c297124865a233402e44bdec68839d322a") + set(FALCOSECURITY_LIBS_VERSION "0.22.2") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=53cfb7062cac80623dec7496394739aabdfee8a774942f94be0990d81e3b2fbc") endif() # cd /path/to/build && cmake /path/to/source diff --git a/userspace/chisel/chisel.cpp b/userspace/chisel/chisel.cpp index 8b25fe203b..2971237259 100644 --- a/userspace/chisel/chisel.cpp +++ b/userspace/chisel/chisel.cpp @@ -1647,6 +1647,12 @@ void sinsp_chisel::do_timeout(sinsp_evt* evt) } } + // + // Make the event available to the API + // + lua_pushlightuserdata(m_ls, evt); + lua_setglobal(m_ls, "sievt"); + lua_getglobal(m_ls, "on_interval"); lua_pushnumber(m_ls, (double)(ts / 1000000000)); @@ -1679,6 +1685,12 @@ void sinsp_chisel::do_timeout(sinsp_evt* evt) { uint64_t t; + // + // Make the event available to the API + // + lua_pushlightuserdata(m_ls, evt); + lua_setglobal(m_ls, "sievt"); + for(t = m_lua_last_interval_sample_time; t <= ts - interval; t += interval) { lua_getglobal(m_ls, "on_interval"); diff --git a/userspace/sinspui/cursescomponents.cpp b/userspace/sinspui/cursescomponents.cpp index a3631be74f..9c0d41088e 100644 --- a/userspace/sinspui/cursescomponents.cpp +++ b/userspace/sinspui/cursescomponents.cpp @@ -136,7 +136,7 @@ const char* spy_text_renderer::process_event_spy(sinsp_evt* evt, int64_t* len) return NULL; } ASSERT(parinfo->m_len == sizeof(int64_t)); - *len = *(int64_t*)parinfo->m_val; + *len = *(int64_t*)parinfo->data(); if(*len <= 0) { return NULL; diff --git a/userspace/sysdig/sysdig.cpp b/userspace/sysdig/sysdig.cpp index 1ba3d31ec6..1cfc8dd484 100644 --- a/userspace/sysdig/sysdig.cpp +++ b/userspace/sysdig/sysdig.cpp @@ -847,13 +847,13 @@ captureinfo do_inspect(sinsp *inspector, sinsp_cycledumper *dumper, if(etype == PPME_GENERIC_E) { const sinsp_evt_param *parinfo = ev->get_param(0); - uint16_t id = *(int16_t *)parinfo->m_val; + uint16_t id = *(int16_t *)parinfo->data(); summary_table[PPM_EVENT_MAX + id * 2].m_ncalls++; } else if(etype == PPME_GENERIC_X) { const sinsp_evt_param *parinfo = ev->get_param(0); - uint16_t id = *(int16_t *)parinfo->m_val; + uint16_t id = *(int16_t *)parinfo->data(); summary_table[PPM_EVENT_MAX + id * 2 + 1].m_ncalls++; } else diff --git a/userspace/sysdig/utils/sinsp_syslog.cpp b/userspace/sysdig/utils/sinsp_syslog.cpp index 7d36a2ee36..74684f1b09 100644 --- a/userspace/sysdig/utils/sinsp_syslog.cpp +++ b/userspace/sysdig/utils/sinsp_syslog.cpp @@ -102,8 +102,8 @@ void sinsp_syslog_decoder::parse(sinsp_evt* evt) { } if(parinfo) { - const char* data = parinfo->m_val; - uint32_t datalen = parinfo->m_len; + const char* data = parinfo->data(); + uint32_t datalen = parinfo->len(); parse_data(data, datalen); } }