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

Enlarged buffer for JSON deseriealization

Browse source
This commit is contained in:
Luca Deri 2015-10-09 09:55:41 +02:00
parent 54ceed49e8
commit 4d009978eb
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Host.h
View file

@ -130,7 +130,7 @@ class Host : public GenericHost {
void incHitter(Host *peer, u_int64_t sent_bytes, u_int64_t rcvd_bytes);
void updateHostTrafficPolicy(char *key);
char* serialize();
bool deserialize(char *json_str);
bool deserialize(char *json_str, char *key);
bool addIfMatching(lua_State* vm, patricia_tree_t * ptree, char *key);
void updateSynFlags(time_t when, u_int8_t flags, Flow *f, bool syn_sent);

8
src/Host.cpp
View file

@ -168,7 +168,7 @@ void Host::initialize(u_int8_t mac[6], u_int16_t _vlanId, bool init_all) {
if(init_all) {
if(ip) {
char buf[64], host[96], json[4096];
char buf[64], host[96], json[8192];
snprintf(host, sizeof(host), "%s@%u", ip->print(buf, sizeof(buf)), vlan_id);
@ -189,7 +189,7 @@ void Host::initialize(u_int8_t mac[6], u_int16_t _vlanId, bool init_all) {
/* Found saved copy of the host so let's start from the previous state */
// ntop->getTrace()->traceEvent(TRACE_NORMAL, "%s => %s", redis_key, json);
ntop->getTrace()->traceEvent(TRACE_INFO, "Deserializing %s", redis_key);
deserialize(json);
deserialize(json, redis_key);
}
if(localHost || systemHost
@ -876,11 +876,11 @@ bool Host::addIfMatching(lua_State* vm, patricia_tree_t *ptree, char *key) {
/* *************************************** */
bool Host::deserialize(char *json_str) {
bool Host::deserialize(char *json_str, char *key) {
json_object *o, *obj;
if((o = json_tokener_parse(json_str)) == NULL) {
ntop->getTrace()->traceEvent(TRACE_WARNING, "JSON Parse error: %s", json_str);
ntop->getTrace()->traceEvent(TRACE_WARNING, "JSON Parse error [key: %s]: %s", key, json_str);
return(false);
}