scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-10-29 09:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues detected by SonarCloud.

Browse Source 
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2023-10-05 12:33:13 +02:00
parent 07f2c2d9cc
commit dfd0449306
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dependencies/nDPIsrvd.h vendored
View File

@@ -672,7 +672,7 @@ static inline int nDPIsrvd_setup_address(struct nDPIsrvd_address * const address
}
if (destination[0] == '[')
{
if (*(last_colon - 1) != ']')
if (last_colon > destination && *(last_colon - 1) != ']')
{
return 1;
}
@@ -1645,11 +1645,21 @@ static inline void nDPIsrvd_flow_info(struct nDPIsrvd_socket const * const sock,
static inline int nDPIsrvd_json_buffer_length(struct nDPIsrvd_socket const * const sock)
{
if (sock == NULL)
{
return 0;
}
return (int)sock->buffer.json_string_length - NETWORK_BUFFER_LENGTH_DIGITS;
}
static inline char const *nDPIsrvd_json_buffer_string(struct nDPIsrvd_socket const * const sock)
{
if (sock == NULL)
{
return NULL;
}
return sock->buffer.json_string;
}

1
dependencies/uthash/doc/styles.css vendored
View File

@@ -29,7 +29,6 @@ h1,p { margin: 0; } /* non-0 margin on firefox */
background-repeat: repeat-y;
/* background-color: #ffddaa; */
padding-top: 20px;
padding-top: 20px;
margin-bottom: 10px;
}

5
examples/c-captured/c-captured.c
View File

@@ -1354,7 +1354,10 @@ int main(int argc, char ** argv)
}
return 1;
}
chmod(datadir, S_IRWXU);
if (datadir != NULL)
{
chmod(datadir, S_IRWXU);
}
if (nDPIsrvd_set_read_timeout(sock, 180, 0) != 0)
{

5
examples/c-collectd/c-collectd.c
View File

@@ -726,7 +726,7 @@ static enum nDPIsrvd_callback_return collectd_json_callback(struct nDPIsrvd_sock
struct nDPIsrvd_json_token const * current = NULL;
int next_child_index = -1;
if (flow_risk != NULL)
if (flow_risk != NULL && flow_user_data != NULL)
{
if (flow_user_data->detected_risks == 0)
{
@@ -744,13 +744,12 @@ static enum nDPIsrvd_callback_return collectd_json_callback(struct nDPIsrvd_sock
if (numeric_risk_value < NDPI_MAX_RISK && numeric_risk_value > 0)
{
collectd_statistics.flow_risk_count[numeric_risk_value - 1]++;
flow_user_data->detected_risks |= (1ull << (numeric_risk_value - 1));
}
else
{
collectd_statistics.flow_risk_unknown_count++;
}
flow_user_data->detected_risks |= (1ull << (numeric_risk_value - 1));
}
}
}

2
examples/c-json-stdout/c-json-stdout.c
View File

@@ -104,7 +104,7 @@ int main(void)
json_bytes - json_start,
tokens,
sizeof(tokens) / sizeof(tokens[0]));
if (r < 0 || tokens[0].type != JSMN_OBJECT)
if (r < 1 || tokens[0].type != JSMN_OBJECT)
{
fprintf(stderr, "JSON parsing failed with return value %d at position %u\n", r, parser.pos);
fprintf(stderr, "JSON string: '%.*s'\n", (int)(json_bytes - json_start), (char *)(buf + json_start));

2
nDPId-test.c
View File

@@ -1454,7 +1454,7 @@ static int base64_selftest()
"0hr4QS1hduMHTwKBXqjb4CGVJbxoc+S/7hjTHGDqWhHCpq9+4SQxcR6MVp65BVNMdGJRLMiHAkUWvivJW4DOanO//"
"36RFuMQEAQEAUMabZOvBbAa1KSTcWbL5ZGc/YPxLofmSTDMxf+KmqSukiR3yVasPbv5J6Hx2zCATM9pR9VRArg==";
size_t encoded_len = strlen(encoded_buf);
size_t encoded_len = strnlen(encoded_buf, sizeof(encoded_buf));
unsigned char decoded_buf[nDPId_PACKETS_PLEN_MAX];
size_t decoded_len = sizeof(decoded_buf);
if (nDPIsrvd_base64decode(encoded_buf, encoded_len, decoded_buf, &decoded_len) != 0)

2
nDPId.c
View File

@@ -4252,7 +4252,7 @@ static void ndpi_process_packet(uint8_t * const args,
free_detection_data(flow_to_process);
flow_to_process->flow_extended.flow_basic.state = FS_FINISHED;
struct nDPId_flow * const flow = (struct nDPId_flow *)flow_to_process;
struct nDPId_flow * const flow = flow_to_process;
flow->flow_extended.detected_l7_protocol = detected_l7_protocol;
flow->finished.risk = risk;
flow->finished.confidence = confidence;