Fix dissection of IPv4 header (#1561)

See: https://github.com/ntop/nDPI/runs/6643914510?check_suite_focus=true

Convert al the `MIN(a,b)` calls to `ndpi_min(a,b)`
This commit is contained in:
Ivan Nardi
2022-05-29 22:39:48 +02:00
committed by GitHub
parent 9c1a53f39f
commit a9d7cc4841
4 changed files with 4 additions and 8 deletions
-4
View File
@@ -49,10 +49,6 @@
#define IPVERSION 4 /* on *nix it is defined in netinet/ip.h */
#ifndef MIN
#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#undef gettimeofday
#define gettimeofday mingw_gettimeofday
+1 -1
View File
@@ -4664,7 +4664,7 @@ static u_int8_t ndpi_detection_get_l4_internal(struct ndpi_detection_module_stru
/* 0: fragmented; 1: not fragmented */
if(iph != NULL && ndpi_iph_is_valid_and_not_fragmented(iph, l3_len)) {
u_int16_t len = ntohs(iph->tot_len);
u_int16_t len = ndpi_min(ntohs(iph->tot_len), l3_len);
u_int16_t hlen = (iph->ihl * 4);
l4ptr = (((const u_int8_t *) iph) + iph->ihl * 4);
+1 -1
View File
@@ -375,7 +375,7 @@ static gcry_error_t hkdf_expand(int hashalgo, const uint8_t *prk, uint32_t prk_l
gcry_md_write(h, &c, sizeof(c)); /* constant 0x01..N */
memcpy(lastoutput, gcry_md_read(h, hashalgo), hash_len);
memcpy(out + offset, lastoutput, MIN(hash_len, out_len - offset));
memcpy(out + offset, lastoutput, ndpi_min(hash_len, out_len - offset));
}
gcry_md_close(h);
+2 -2
View File
@@ -2200,10 +2200,10 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct,
} else {
u_int16_t seq_len = ntohs(*((u_int16_t*)&packet->payload[s_offset]));
s_offset += 2;
final_offset = MIN(total_len, s_offset + seq_len);
final_offset = ndpi_min(total_len, s_offset + seq_len);
}
} else {
final_offset = MIN(total_len, s_offset + extension_len);
final_offset = ndpi_min(total_len, s_offset + extension_len);
}
while(s_offset < final_offset) {