vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-06 20:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Prevents possible MySQL errors caused by long queries

Browse source 
Maximum query size has been raised from 2048 to the hardcoded
constant CONST_MAX_SQL_QUERY_LEN that is currently equal
to 8192.

A warning message is generated when attempting to execute
queries longer than the maximum allowed values that would
be truncated.

Fixes #511
This commit is contained in:
Simone Mainardi 2016-04-20 14:45:57 +02:00
parent 283737cddd
commit 9eb7b7ab65
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/MySQLDB.cpp
View file

@ -32,16 +32,21 @@ static void* queryLoop(void* ptr) {
void* MySQLDB::queryLoop() {
Redis *r = ntop->getRedis();
MYSQL mysql_alt;
char sql[CONST_MAX_SQL_QUERY_LEN];
if(!connectToDB(&mysql_alt, true))
return(NULL);
while(!ntop->getGlobals()->isShutdown()) {
char sql[2048];
int rc = r->lpop(CONST_SQL_QUEUE, sql, sizeof(sql));
if(rc == 0) {
if(exec_sql_query(&mysql_alt, sql, true, true, false) < 0) {
if (strlen(sql) >= CONST_MAX_SQL_QUERY_LEN - 1){
ntop->getTrace()->traceEvent(TRACE_WARNING,
"Tried to execute a query longer than %u. Skipping.",
CONST_MAX_SQL_QUERY_LEN - 2);
continue; // prevents overflown queries to generate mysql errors
} else if(exec_sql_query(&mysql_alt, sql, true, true, false) < 0) {
ntop->getTrace()->traceEvent(TRACE_ERROR, "MySQL error: %s", get_last_db_error(&mysql_alt));
ntop->getTrace()->traceEvent(TRACE_ERROR, "%s", sql);
mysql_close(&mysql_alt);