vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-06 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Added up/down stats

Browse source
This commit is contained in:
Luca Deri 2020-12-11 17:31:13 +01:00
parent 770eaca81e
commit cf197e0aa6
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/ntop_typedefs.h
View file

@ -738,6 +738,9 @@ typedef struct {
typedef struct {
lua_State* vm;
time_t last_conn_check;
struct {
u_int32_t download, upload;
} bytes;
} ProgressState;
struct pcap_disk_timeval {

7
src/Utils.cpp
View file

@ -1929,6 +1929,8 @@ bool Utils::progressCanContinue(ProgressState *progressState) {
static int progress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) {
ProgressState *progressState = (ProgressState*) clientp;
progressState->bytes.download = (u_int32_t)dlnow, progressState->bytes.upload = (u_int32_t)ulnow;
return Utils::progressCanContinue(progressState) ? 0 /* continue */ : 1 /* stop transfer */;
}
@ -2127,6 +2129,11 @@ bool Utils::httpGetPost(lua_State* vm, char *url,
if(curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &redirection) == CURLE_OK)
lua_push_str_table_entry(vm, "EFFECTIVE_URL", redirection);
if(!form_data) {
lua_push_uint64_table_entry(vm, "BYTES_DOWNLOAD", progressState.bytes.download);
lua_push_uint64_table_entry(vm, "BYTES_UPLOAD", progressState.bytes.upload);
}
if(!ret)
lua_push_bool_table_entry(vm, "IS_PARTIAL", true);
}