wanderer/ fastnetmon-ng
1
1
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Activity

Code unification for LuaJIT

This commit is contained in:
Pavel Odintsov 2015-07-03 18:14:43 +03:00
parent 7e3e894367
commit ace71c64b0
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/fast_library.cpp
View File

@ -896,6 +896,31 @@ lua_State* init_lua_jit(std::string lua_hooks_path) {
return lua_state;
}
bool call_lua_function(std::string function_name, lua_State* lua_state_param, std::string client_addres_in_string_format, void* ptr) {
/* Function name */
lua_getfield(lua_state_param, LUA_GLOBALSINDEX, function_name.c_str());
/* Function params */
lua_pushstring(lua_state_param, client_addres_in_string_format.c_str());
lua_pushlightuserdata(lua_state_param, (void*)flow);
// Call with 1 argumnents and 1 result
lua_call(lua_state_param, 2, 1);
if (lua_gettop(lua_state_param) == 1) {
bool result = lua_toboolean(lua_state_param, -1) == 1 ? true : false;
// pop returned value
lua_pop(lua_state_param, 1);
return result;
} else {
logger << log4cpp::Priority::ERROR << "We got " << lua_gettop(lua_state_param) << " return values from the LUA, it's error, please check your LUA code";
return false;
}
return false;
}
#endif
#endif

1
src/fast_library.h
View File

@ -102,6 +102,7 @@ bool manage_interface_promisc_mode(std::string interface_name, bool switch_on);
#ifdef ENABLE_LUA_HOOKS
lua_State* init_lua_jit(std::string lua_hooks_path);
bool call_lua_function(std::string function_name, lua_State* lua_state_param, std::string client_addres_in_string_format, void* ptr);
#endif
#endif

30
src/netflow_plugin/netflow_collector.cpp
View File

@ -994,7 +994,7 @@ void process_netflow_packet_v5(u_int8_t* packet, u_int len, std::string client_a
// init_lua_jit();
//}
if (call_netflow_process_lua_hook(netflow_lua_state, client_addres_in_string_format, nf5_flow)) {
if (call_lua_function("process_netflow", netflow_lua_state, client_addres_in_string_format, (void*)nf5_flow)) {
// We will process this packet
} else {
logger << log4cpp::Priority::INFO << "We will drop this packets because LUA script decided to do it";
@ -1028,34 +1028,6 @@ void process_netflow_packet(u_int8_t* packet, u_int len, std::string client_addr
}
}
#ifdef ENABLE_LUA_HOOKS
bool call_netflow_process_lua_hook(lua_State* lua_state_param, std::string client_addres_in_string_format, struct NF5_FLOW* flow) {
/* Function name */
lua_getfield(lua_state_param, LUA_GLOBALSINDEX, "process_netflow");
/* Function params */
lua_pushstring(lua_state_param, client_addres_in_string_format.c_str());
lua_pushlightuserdata(lua_state_param, (void*)flow);
// Call with 1 argumnents and 1 result
lua_call(lua_state_param, 2, 1);
if (lua_gettop(lua_state_param) == 1) {
bool result = lua_toboolean(lua_state_param, -1) == 1 ? true : false;
// pop returned value
lua_pop(lua_state_param, 1);
return result;
} else {
logger << log4cpp::Priority::ERROR << "We got " << lua_gettop(lua_state_param) << " return values from the LUA, it's error, please check your LUA code";
return false;
}
return false;
}
#endif
void start_netflow_collector(std::string netflow_host, unsigned int netflow_port);
// #include <sys/prctl.h>