diff --git a/webserver/database/logs/blue.json b/webserver/database/logs/blue.json
index cfb1ff3..d8b5b2b 100644
--- a/webserver/database/logs/blue.json
+++ b/webserver/database/logs/blue.json
@@ -1 +1 @@
-[{"data": "IDS: Malicious Activity was detected", "timestamp": "1681456601"}, {"data": "Malicious IP: 10.10.1.89", "timestamp": "1681456601"}, {"data": "ssh", "timestamp": "1681460202"}]
\ No newline at end of file
+[{"data": "IDS: Malicious Activity was detected", "timestamp": "1681460777"}, {"data": "Malicious IP: 10.10.1.89", "timestamp": "1681460777"}]
\ No newline at end of file
diff --git a/webserver/database/logs/red.json b/webserver/database/logs/red.json
index 3a24934..ea54188 100644
--- a/webserver/database/logs/red.json
+++ b/webserver/database/logs/red.json
@@ -1 +1 @@
-[{"data": "141.89.221.182: start of attack", "timestamp": "1681456600"}, {"data": "141.89.221.182: command 0: ATTACK", "timestamp": "1681456600"}, {"data": "141.89.221.182: command 1: ATTACK", "timestamp": "1681456601"}, {"data": "141.89.221.182: Start of post-exploitation", "timestamp": "1681456601"}]
\ No newline at end of file
+[{"data": "46.114.180.29: start of attack", "timestamp": "1681460776"}, {"data": "46.114.180.29: command 0: ATTACK", "timestamp": "1681460776"}, {"data": "46.114.180.29: Start of post-exploitation", "timestamp": "1681460776"}]
\ No newline at end of file
diff --git a/webserver/database/pdfs/export.pdf b/webserver/database/pdfs/export.pdf
new file mode 100644
index 0000000..7fa107e
Binary files /dev/null and b/webserver/database/pdfs/export.pdf differ
diff --git a/webserver/database/temp/attack_start.txt b/webserver/database/temp/attack_start.txt
index a230356..8ec55bf 100644
--- a/webserver/database/temp/attack_start.txt
+++ b/webserver/database/temp/attack_start.txt
@@ -1 +1 @@
-1681456600
\ No newline at end of file
+1681460776
\ No newline at end of file
diff --git a/webserver/database/temp/sim_start.txt b/webserver/database/temp/sim_start.txt
index 7edec4f..eef5419 100644
--- a/webserver/database/temp/sim_start.txt
+++ b/webserver/database/temp/sim_start.txt
@@ -1 +1 @@
-1681456598
\ No newline at end of file
+1681460774
\ No newline at end of file
diff --git a/webserver/main.py b/webserver/main.py
index ffc0aca..66cffd0 100755
--- a/webserver/main.py
+++ b/webserver/main.py
@@ -436,5 +436,5 @@ def custom_404(error):
clear_session_full()
if __name__ == '__main__':
- # app.run(host='0.0.0.0', threaded=True, use_reloader=True, port=8088)
- app.run(host='185.78.255.231', threaded=True,use_reloader=True, port=443, ssl_context=('/etc/letsencrypt/live/network.kyudev.xyz/fullchain.pem', '/etc/letsencrypt/live/network.kyudev.xyz/privkey.pem'))
+ app.run(host='0.0.0.0', threaded=True, use_reloader=True, port=8088)
+ # app.run(host='185.78.255.231', threaded=True,use_reloader=True, port=443, ssl_context=('/etc/letsencrypt/live/network.kyudev.xyz/fullchain.pem', '/etc/letsencrypt/live/network.kyudev.xyz/privkey.pem'))
diff --git a/webserver/templates/main/dashboard_main1.html b/webserver/templates/main/dashboard_main1.html
index a35cd39..ae254b5 100644
--- a/webserver/templates/main/dashboard_main1.html
+++ b/webserver/templates/main/dashboard_main1.html
@@ -1626,7 +1626,7 @@
if (start === -1 || document.getElementById('start_stop_sim_btn').innerHTML === 'Start Simulation') {
document.getElementById("simstart").innerHTML = "0";
} else {
- document.getElementById("simstart").innerHTML = to_min_s(end - start);
+ document.getElementById("simstart").innerHTML = to_min_s(start, end);
if (document.getElementById('start_stop_sim_btn').innerHTML === 'Start Simulation')
{
document.getElementById("simstart").setAttribute("data-start", "-1");
@@ -1639,7 +1639,7 @@
if (start === -1 || document.getElementById('start_stop_sim_btn').innerHTML === 'Start Simulation') {
document.getElementById("attackstart").innerHTML = "0";
} else {
- document.getElementById("attackstart").innerHTML = to_min_s(end - start);
+ document.getElementById("attackstart").innerHTML = to_min_s(start, end);
}
fetch('/api/logs')