From 7540b6a8d7bd4327f8ddcae7e10ab43361595300 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Fri, 12 Mar 2021 10:58:23 +0100
Subject: [PATCH] - Fixed problem with installed headers - application code
 does not compile only with installed headers

---
 Makefile                                      |  1 +
 .../Makefile.standalone                       | 35 +++++++++++++++++++
 .../Makefile.standalone                       | 33 +++++++++++++++++
 src/iec61850/inc/iec61850_server.h            |  1 +
 .../drivers/sqlite/log_storage_sqlite.c       |  2 +-
 5 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 examples/server_example_basic_io/Makefile.standalone
 create mode 100644 examples/server_example_logging/Makefile.standalone

diff --git a/Makefile b/Makefile
index 60a798f6..792aafa6 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,7 @@ LIB_API_HEADER_FILES += src/mms/inc/mms_common.h
 LIB_API_HEADER_FILES += src/mms/inc/mms_types.h
 LIB_API_HEADER_FILES += src/mms/inc/mms_type_spec.h
 LIB_API_HEADER_FILES += src/mms/inc/mms_client_connection.h
+LIB_API_HEADER_FILES += src/mms/inc/mms_server.h
 LIB_API_HEADER_FILES += src/mms/inc/iso_connection_parameters.h
 LIB_API_HEADER_FILES += src/goose/goose_subscriber.h
 LIB_API_HEADER_FILES += src/goose/goose_receiver.h
diff --git a/examples/server_example_basic_io/Makefile.standalone b/examples/server_example_basic_io/Makefile.standalone
new file mode 100644
index 00000000..87e4c9af
--- /dev/null
+++ b/examples/server_example_basic_io/Makefile.standalone
@@ -0,0 +1,35 @@
+LIBIEC_HOME=../..
+
+PROJECT_BINARY_NAME = server_example_basic_io
+PROJECT_SOURCES = server_example_basic_io.c
+PROJECT_SOURCES += static_model.c
+
+PROJECT_ICD_FILE = simpleIO_direct_control.cid
+
+all:	$(PROJECT_BINARY_NAME)
+
+LDLIBS += -lm -lpthread
+
+CP = cp
+
+LIBIEC61850_INSTALL_DIR = ../../.install
+
+LIBIEC61850_LIB_DIR = $(LIBIEC61850_INSTALL_DIR)/lib
+LIBIEC61850_INC_DIR = $(LIBIEC61850_INSTALL_DIR)/include
+LIBIEC61850_INCLUDES = -I$(LIBIEC61850_INC_DIR)
+
+INCLUDES += $(LIBIEC61850_INCLUDES)
+
+model:	$(PROJECT_ICD_FILE)
+	java -jar $(LIBIEC_HOME)/tools/model_generator/genmodel.jar $(PROJECT_ICD_FILE)
+
+$(PROJECT_BINARY_NAME):	$(PROJECT_SOURCES) $(LIB_NAME)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROJECT_BINARY_NAME) $(PROJECT_SOURCES) $(INCLUDES) -L$(LIBIEC61850_LIB_DIR) -liec61850  $(LDLIBS)
+	mkdir -p vmd-filestore
+	$(CP) $(PROJECT_BINARY_NAME) vmd-filestore/IEDSERVER.BIN
+
+clean:
+	rm -f $(PROJECT_BINARY_NAME)
+	rm -f vmd-filestore/IEDSERVER.BIN
+
+
diff --git a/examples/server_example_logging/Makefile.standalone b/examples/server_example_logging/Makefile.standalone
new file mode 100644
index 00000000..cf61501b
--- /dev/null
+++ b/examples/server_example_logging/Makefile.standalone
@@ -0,0 +1,33 @@
+LIBIEC_HOME=../..
+
+PROJECT_BINARY_NAME = server_example_logging
+PROJECT_SOURCES = server_example_logging.c
+PROJECT_SOURCES += static_model.c
+PROJECT_SOURCES += $(LIBIEC_HOME)/src/logging/drivers/sqlite/log_storage_sqlite.c
+
+PROJECT_ICD_FILE = simpleIO_direct_control.cid
+
+all:	$(PROJECT_BINARY_NAME)
+
+LDLIBS += -lm -lpthread -lsqlite3
+
+CP = cp
+
+LIBIEC61850_INSTALL_DIR = ../../.install
+
+LIBIEC61850_LIB_DIR = $(LIBIEC61850_INSTALL_DIR)/lib
+LIBIEC61850_INC_DIR = $(LIBIEC61850_INSTALL_DIR)/include
+LIBIEC61850_INCLUDES = -I$(LIBIEC61850_INC_DIR)
+
+INCLUDES += $(LIBIEC61850_INCLUDES)
+
+model:	$(PROJECT_ICD_FILE)
+	java -jar $(LIBIEC_HOME)/tools/model_generator/genmodel.jar $(PROJECT_ICD_FILE)
+
+$(PROJECT_BINARY_NAME):	$(PROJECT_SOURCES) $(LIB_NAME)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROJECT_BINARY_NAME) $(PROJECT_SOURCES) $(INCLUDES) -L$(LIBIEC61850_LIB_DIR) -liec61850 $(LDLIBS)
+
+clean:
+	rm -f $(PROJECT_BINARY_NAME)
+
+
diff --git a/src/iec61850/inc/iec61850_server.h b/src/iec61850/inc/iec61850_server.h
index 098bc1f2..3f503cba 100644
--- a/src/iec61850/inc/iec61850_server.h
+++ b/src/iec61850/inc/iec61850_server.h
@@ -39,6 +39,7 @@ extern "C" {
 #include "iec61850_dynamic_model.h"
 #include "iec61850_model.h"
 #include "hal_filesystem.h"
+#include "iso_connection_parameters.h"
 #include "iec61850_config_file_parser.h"
 
 /**
diff --git a/src/logging/drivers/sqlite/log_storage_sqlite.c b/src/logging/drivers/sqlite/log_storage_sqlite.c
index fcb02ec9..49094441 100644
--- a/src/logging/drivers/sqlite/log_storage_sqlite.c
+++ b/src/logging/drivers/sqlite/log_storage_sqlite.c
@@ -23,9 +23,9 @@
 
 
 #include "logging_api.h"
-#include "libiec61850_platform_includes.h"
 
 #include "sqlite3.h"
+#include <stdio.h>
 
 #ifndef DEBUG_LOG_STORAGE_DRIVER
 #define DEBUG_LOG_STORAGE_DRIVER 0