From 5a83af9206ffc33d7213d2149885bf2128f87d5a Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 30 Mar 2019 16:54:08 +0100 Subject: [PATCH] - moved mms_server.h back to public API (see github #117) --- CMakeLists.txt | 2 +- examples/server_example_files/server_example_files.c | 5 +++-- src/mms/{inc_private => inc}/mms_server.h | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename src/mms/{inc_private => inc}/mms_server.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 034fc89c..625d52ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,6 +101,7 @@ set(API_HEADERS src/mms/inc/mms_types.h src/mms/inc/mms_type_spec.h src/mms/inc/mms_client_connection.h + src/mms/inc/mms_server.h src/mms/inc/iso_connection_parameters.h src/goose/goose_subscriber.h src/goose/goose_receiver.h @@ -108,7 +109,6 @@ set(API_HEADERS src/sampled_values/sv_subscriber.h src/sampled_values/sv_publisher.h src/logging/logging_api.h - ${CMAKE_CURRENT_BINARY_DIR}/config/stack_config.h ) if(MSVC AND MSVC_VERSION LESS 1800) diff --git a/examples/server_example_files/server_example_files.c b/examples/server_example_files/server_example_files.c index b2a1b07c..596c4ce3 100644 --- a/examples/server_example_files/server_example_files.c +++ b/examples/server_example_files/server_example_files.c @@ -45,7 +45,7 @@ fileAccessHandler (void* parameter, MmsServerConnection connection, MmsFileServi if (service == MMS_FILE_ACCESS_TYPE_RENAME) return MMS_ERROR_FILE_FILE_ACCESS_DENIED; - /* Don't allow client to delete fike "IEDSERVER.BIN" */ + /* Don't allow client to delete file "IEDSERVER.BIN" */ if (service == MMS_FILE_ACCESS_TYPE_DELETE) { if (strcmp(localFilename, "IEDSERVER.BIN") == 0) return MMS_ERROR_FILE_FILE_ACCESS_DENIED; @@ -64,7 +64,8 @@ main(int argc, char** argv) /* Set the base path for the MMS file services */ MmsServer mmsServer = IedServer_getMmsServer(iedServer); - MmsServer_setFilestoreBasepath(mmsServer, "./vmd-filestore/"); + + IedServer_setFilestoreBasepath(iedServer, "./vmd-filestore/"); /* Set a callback handler to control file accesses */ MmsServer_installFileAccessHandler(mmsServer, fileAccessHandler, NULL); diff --git a/src/mms/inc_private/mms_server.h b/src/mms/inc/mms_server.h similarity index 100% rename from src/mms/inc_private/mms_server.h rename to src/mms/inc/mms_server.h