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-3")
+set(CELLFRAME_SDK_NATIVE_VERSION "2.9-4")
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 set(DAPSDK_MODULES "")
 message("Cellframe modules: ${CELLFRAME_MODULES}")

dap-sdk/core/src/dap_common.c

@@ -235,7 +235,7 @@ int dap_common_init( const char *a_console_title, const char *a_log_file_path, c
         if( s_log_file == NULL)
             s_log_file = fopen( a_log_file_path , "w" );
         if ( s_log_file == NULL ) {
-            dap_fprintf( stderr, "Can't open log file %s to append\n", a_log_file_path );
+            dap_fprintf( stderr, "Can't open log file %s \n", a_log_file_path );
             return -1;   //switch off show log in cosole if file not open
         }
         dap_stpcpy(s_log_dir_path,  a_log_dirpath);

dap-sdk/crypto/include/dap_pkey.h

@@ -27,29 +27,31 @@
 #include "dap_common.h"
 #include "dap_enc_key.h"
 
-typedef union dap_pkey_type{
-    enum {
-        PKEY_TYPE_NULL = 0x0000,
-        PKEY_TYPE_SIGN_BLISS = 0x0901,
-        PKEY_TYPE_SIGN_TESLA = 0x0902,
-        PKEY_TYPE_SIGN_DILITHIUM =  0x0903,
-        PKEY_TYPE_SIGN_PICNIC = 0x0102,
-        PKEY_TYPE_MULTI = 0xffff ///  @brief Has inside subset of different keys
 
-    } type: 16;
+enum dap_pkey_type_enum {
+    PKEY_TYPE_NULL = 0x0000,
+    PKEY_TYPE_SIGN_BLISS = 0x0901,
+    PKEY_TYPE_SIGN_TESLA = 0x0902,
+    PKEY_TYPE_SIGN_DILITHIUM =  0x0903,
+    PKEY_TYPE_SIGN_PICNIC = 0x0102,
+    PKEY_TYPE_MULTI = 0xffff ///  @brief Has inside subset of different keys
+
+};
+
+typedef union dap_pkey_type{
+    enum dap_pkey_type_enum type: 16;
     uint16_t raw;
 } dap_pkey_type_t;
 
 DAP_STATIC_INLINE const char *dap_pkey_type_to_str(dap_pkey_type_t a_type){
     switch (a_type.type) {
-    case PKEY_TYPE_NULL:  return  "PKEY_TYPE_NULL";
-    case PKEY_TYPE_MULTI: return "PKEY_TYPE_MULTI";
-    case PKEY_TYPE_SIGN_BLISS: return "PKEY_TYPE_SIGN_BLISS";
-    case PKEY_TYPE_SIGN_TESLA: return "PKEY_TYPE_SIGN_TESLA";
-    case PKEY_TYPE_SIGN_PICNIC: return "PKEY_TYPE_SIGN_PICNIC";
-    case PKEY_TYPE_SIGN_DILITHIUM: return "PKEY_TYPE_SIGN_DILITHIUM";
-    default: return "UNDEFINED";
-
+        case PKEY_TYPE_NULL:  return  "PKEY_TYPE_NULL";
+        case PKEY_TYPE_MULTI: return "PKEY_TYPE_MULTI";
+        case PKEY_TYPE_SIGN_BLISS: return "PKEY_TYPE_SIGN_BLISS";
+        case PKEY_TYPE_SIGN_TESLA: return "PKEY_TYPE_SIGN_TESLA";
+        case PKEY_TYPE_SIGN_PICNIC: return "PKEY_TYPE_SIGN_PICNIC";
+        case PKEY_TYPE_SIGN_DILITHIUM: return "PKEY_TYPE_SIGN_DILITHIUM";
+        default: return "UNDEFINED";
     }
 }
 

dap-sdk/net/core/dap_timerfd.c

@@ -243,9 +243,10 @@ static void s_es_callback_timer(struct dap_events_socket *a_event_sock)
             log_it(L_WARNING, "callback_timerfd_read() failed: timerfd_settime() errno=%d\n", errno);
         }
 #elif defined (DAP_OS_BSD)
-	struct kevent * l_event = &a_event_sock->kqueue_event;
-	EV_SET(l_event, 0, a_event_sock->kqueue_base_filter, a_event_sock->kqueue_base_flags,a_event_sock->kqueue_base_fflags,a_event_sock->kqueue_data,a_event_sock);
-	kevent(a_event_sock->worker->kqueue_fd,l_event,1,NULL,0,NULL);
+        dap_worker_add_events_socket_unsafe(a_event_sock,a_event_sock->worker);
+    //struct kevent * l_event = &a_event_sock->kqueue_event;
+    //EV_SET(l_event, 0, a_event_sock->kqueue_base_filter, a_event_sock->kqueue_base_flags,a_event_sock->kqueue_base_fflags,a_event_sock->kqueue_data,a_event_sock);
+    //kevent(a_event_sock->worker->kqueue_fd,l_event,1,NULL,0,NULL);
 #elif defined (DAP_OS_WINDOWS)
         LARGE_INTEGER l_due_time;
         l_due_time.QuadPart = (long long)l_timerfd->timeout_ms * _MSEC;

dap-sdk/net/core/dap_worker.c

@@ -1130,6 +1130,7 @@ int dap_worker_add_events_socket_unsafe( dap_events_socket_t * a_esocket, dap_wo
     a_worker->poll_count++;
     return 0;
 #elif defined (DAP_EVENTS_CAPS_KQUEUE)
+    a_esocket->worker = a_worker;
     if ( a_esocket->type == DESCRIPTOR_TYPE_QUEUE ){
         return 0;
     }