From ace41995f641ede25b883f6f8ae56448e60381d7 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Fri, 25 Jun 2021 11:16:39 +0300
Subject: [PATCH] ...
---
CMakeLists.txt | 2 +-
dap-sdk/core/libdap.pri | 1 -
dap-sdk/net/core/dap_server.c | 21 ++++++++++++---------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 664f32f20c..52c3dfc80c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(cellframe-sdk C)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "2.9-7")
+set(CELLFRAME_SDK_NATIVE_VERSION "3.0-0")
add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
set(DAPSDK_MODULES "")
message("Cellframe modules: ${CELLFRAME_MODULES}")
diff --git a/dap-sdk/core/libdap.pri b/dap-sdk/core/libdap.pri
index 2d55484b6a..e4288f2574 100755
--- a/dap-sdk/core/libdap.pri
+++ b/dap-sdk/core/libdap.pri
@@ -53,7 +53,6 @@ win32 {
HEADERS += $$PWD/../../3rdparty/uthash/src/utlist.h \
$$PWD/../../3rdparty/uthash/src/uthash.h
-
# Sources itself
HEADERS += $$PWD/include/dap_common.h \
$$PWD/include/dap_binary_tree.h \
diff --git a/dap-sdk/net/core/dap_server.c b/dap-sdk/net/core/dap_server.c
index a588978839..34d807be41 100644
--- a/dap-sdk/net/core/dap_server.c
+++ b/dap-sdk/net/core/dap_server.c
@@ -239,16 +239,19 @@ static int s_server_run(dap_server_t * a_server, dap_events_socket_callbacks_t *
{
assert(a_server);
-#ifdef DAP_OS_WINDOWS
- struct sockaddr * l_listener_addr = (struct sockaddr *) &(a_server->listener_addr);
-#else
- struct sockaddr * l_listener_addr = a_server->type == SERVER_LOCAL ?
- (struct sockaddr *) &(a_server->listener_path) :
- (struct sockaddr *) &(a_server->listener_addr);
+ struct sockaddr * l_listener_addr =
+#ifndef DAP_OS_WINDOWS
+ a_server->type == SERVER_LOCAL ?
+ (struct sockaddr *) &(a_server->listener_path) :
+#endif
+ (struct sockaddr *) &(a_server->listener_addr);
+
+ socklen_t l_listener_addr_len =
+#ifndef DAP_OS_WINDOWS
+ a_server->type == SERVER_LOCAL ?
+ sizeof(a_server->listener_path) :
#endif
- socklen_t l_listener_addr_len = a_server->type == SERVER_LOCAL ?
- sizeof(a_server->listener_path) :
- sizeof(a_server->listener_addr);
+ sizeof(a_server->listener_addr);
if(bind (a_server->socket_listener, l_listener_addr, l_listener_addr_len) < 0) {
#ifdef DAP_OS_WINDOWS
--
GitLab