From 9778aec6a179e5f161e0df41d70d2f1962cfbb1d Mon Sep 17 00:00:00 2001
From: hwinkel <winkelh@hsu-hh.de>
Date: Sun, 29 Oct 2023 16:54:57 +0100
Subject: [PATCH] ADD: updated simcontrol and dockerfile

---
 .vscode/c_cpp_properties.json | 18 ++++++++++++++++++
 Dockerfile                    |  2 +-
 buildDocker.sh                |  2 ++
 libs/KubeControl              |  2 +-
 libs/OrderLibrary             |  2 +-
 libs/SimCore                  |  2 +-
 src/SimControl/SimControl.cpp |  2 +-
 7 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 .vscode/c_cpp_properties.json

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..59e54f9
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,18 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/libs/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/clang-13",
+            "cStandard": "c17",
+            "cppStandard": "c++14",
+            "intelliSenseMode": "linux-clang-x64",
+            "configurationProvider": "ms-vscode.cmake-tools"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index d2eb0ac..ede9d1e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@ COPY build/libs/SimCore/libs/geographiclib/src/libGeographicLib.so.23 /usr/lib/
 COPY build/libs/KubeControl/libs/yaml-cpp/libyaml-cpp.so.0.8 /usr/lib/
 COPY build/libs/KubeControl/libs/curlpp/libcurlpp.so.1  /usr/lib/
 # COPY build/libs/EntityLibrary/libs/SimCore/libs/crossguid/libcrossguid.so.0 /usr/lib/
-COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0  /usr/lib/
+# COPY build/libs/SimCore/libs/crossguid/libcrossguid.so.0  /usr/lib/
 COPY build/libs/ixwebsocket/libixwebsocket.so.0.1.0  /usr/lib/
 
 
diff --git a/buildDocker.sh b/buildDocker.sh
index fb7ab92..6b983b2 100755
--- a/buildDocker.sh
+++ b/buildDocker.sh
@@ -2,5 +2,7 @@ cd build/
 make -j8
 cd ..   
 TAG="kmaster.ti.unibw-hamburg.de:30808/simcontrol:latest"
+# sudo buildah bud --pull -f "Dockerfile" -t ${TAG}
+# buildah push ${TAG}
 docker build --pull --rm -f "Dockerfile" -t ${TAG} "."
 docker image push ${TAG}
diff --git a/libs/KubeControl b/libs/KubeControl
index d40cc7a..f59652a 160000
--- a/libs/KubeControl
+++ b/libs/KubeControl
@@ -1 +1 @@
-Subproject commit d40cc7a8c08ed159c9c10bf0a9257c724a92e317
+Subproject commit f59652ada171d389dff669b1472e89672f59829c
diff --git a/libs/OrderLibrary b/libs/OrderLibrary
index 88aa0d0..836cee9 160000
--- a/libs/OrderLibrary
+++ b/libs/OrderLibrary
@@ -1 +1 @@
-Subproject commit 88aa0d0eff299aca8919945b25610e4e956b0a40
+Subproject commit 836cee9d6ca80582fad2e376d0c8632e58c85397
diff --git a/libs/SimCore b/libs/SimCore
index edbea7e..e879a12 160000
--- a/libs/SimCore
+++ b/libs/SimCore
@@ -1 +1 @@
-Subproject commit edbea7e374bc0772c0666bd0f5d231bf1642710f
+Subproject commit e879a12f2667f7a82c8a8ea2aad2d0ced957cb69
diff --git a/src/SimControl/SimControl.cpp b/src/SimControl/SimControl.cpp
index cf2f08d..1f6e95d 100644
--- a/src/SimControl/SimControl.cpp
+++ b/src/SimControl/SimControl.cpp
@@ -37,7 +37,7 @@ namespace SimControl {
   online_(online),CommandPort_(CommandPort),GroundTruthAddr_(GroundTruthAddr),GroundTruthPort_(GroundTruthPort),Namespace_(Namespace),ID_(SimCore::Identifier(xg::newGuid()))
   {
     // BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>("239.0.0.1",10000);
-    BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>(GroundTruthPort_,GroundTruthAddr_);
+    BroadcastListener_ = std::make_shared<WHISPER::InternalUDPListener>(GroundTruthAddr_,GroundTruthPort_);
 
     BroadcastListener_->registerMessageCallback(std::bind(&SimControl::HandleBroadcastMessage,this,std::placeholders::_1));
     BroadcastListener_->connect();