aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Deri <deri@ntop.org>2023-08-01 15:35:33 +0200
committerLuca Deri <deri@ntop.org>2023-08-01 15:35:33 +0200
commit196395398ebdeb47e0da102f7bb489b355f63ae2 (patch)
treec9ce68bbf6d090b6379c5c184d7a1177ac974ac9
parente4d3d619bc9fa2e38521b7ced17f4e7aa633d812 (diff)
Compilation fixes for older C compilers
-rw-r--r--example/reader_util.c7
-rw-r--r--src/lib/protocols/slp.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/example/reader_util.c b/example/reader_util.c
index a70390d9c..268f87ed1 100644
--- a/example/reader_util.c
+++ b/example/reader_util.c
@@ -1200,15 +1200,20 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
}
/* SERVICE_LOCATION */
else if(is_ndpi_proto(flow, NDPI_PROTOCOL_SERVICE_LOCATION)) {
+ size_t i;
+
flow->info_type = INFO_GENERIC;
flow->info[0] = 0;
if (flow->ndpi_flow->protos.slp.url_count > 0)
strncat(flow->info, "URL(s): ", sizeof(flow->info));
- for (size_t i = 0; i < flow->ndpi_flow->protos.slp.url_count; ++i) {
+
+ for (i = 0; i < flow->ndpi_flow->protos.slp.url_count; ++i) {
size_t length = strlen(flow->info);
+
strncat(flow->info + length, flow->ndpi_flow->protos.slp.url[i],
sizeof(flow->info) - length);
length = strlen(flow->info);
+
if (i < (size_t)flow->ndpi_flow->protos.slp.url_count - 1)
strncat(flow->info + length, ", ", sizeof(flow->info) - length);
}
diff --git a/src/lib/protocols/slp.c b/src/lib/protocols/slp.c
index bf8f31d6b..02ee71f16 100644
--- a/src/lib/protocols/slp.c
+++ b/src/lib/protocols/slp.c
@@ -144,6 +144,7 @@ static int slp_dissect_url_entries(struct ndpi_detection_module_struct *ndpi_str
struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
struct slp_url_entry const *url_entry;
uint16_t url_entries_count;
+ size_t i;
if (packet->payload_packet_len <= url_entries_offset + sizeof(uint16_t)) {
return 1;
@@ -151,7 +152,7 @@ static int slp_dissect_url_entries(struct ndpi_detection_module_struct *ndpi_str
url_entries_count = ntohs(*(uint16_t *)&packet->payload[url_entries_offset]);
url_entries_offset += sizeof(uint16_t);
- for (size_t i = 0; i < ndpi_min(url_entries_count, NDPI_ARRAY_LENGTH(flow->protos.slp.url)); ++i) {
+ for (i = 0; i < ndpi_min(url_entries_count, NDPI_ARRAY_LENGTH(flow->protos.slp.url)); ++i) {
if (packet->payload_packet_len < url_entries_offset + sizeof(*url_entry)) {
return 1;
}
@@ -171,7 +172,8 @@ static int slp_dissect_url_entries(struct ndpi_detection_module_struct *ndpi_str
// handle Authentication Blocks
uint8_t num_auths = packet->payload[url_entries_offset++];
- for (size_t j = 0; j < num_auths; ++j) {
+ size_t j;
+ for (j = 0; j < num_auths; ++j) {
size_t auth_block_offset = url_entries_offset + 2;
if (packet->payload_packet_len <= auth_block_offset + 2) {
return 1;