From 77e3c63736be09809acfd9ebcc1e77ae85c14637 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Mon, 14 Sep 2020 16:48:40 +0700
Subject: [PATCH] [-] Removed argument from dap_stream_ctl_init()
---
dap-sdk/net/core/include/dap_events_socket.h | 1 +
dap-sdk/net/stream/stream/dap_stream_ctl.c | 4 ++--
dap-sdk/net/stream/stream/include/dap_stream_ctl.h | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dap-sdk/net/core/include/dap_events_socket.h b/dap-sdk/net/core/include/dap_events_socket.h
index 81bf6a0098..68020f1a33 100644
--- a/dap-sdk/net/core/include/dap_events_socket.h
+++ b/dap-sdk/net/core/include/dap_events_socket.h
@@ -95,6 +95,7 @@ typedef struct dap_events_socket_callbacks {
dap_events_socket_callback_queue_t queue_callback; // Queue callback for listening socket
dap_events_socket_callback_queue_ptr_t queue_ptr_callback; // queue_ptr callback for listening socket
};
+
dap_events_socket_callback_t new_callback; // Create new client callback
dap_events_socket_callback_t delete_callback; // Delete client callback
dap_events_socket_callback_t read_callback; // Read function
diff --git a/dap-sdk/net/stream/stream/dap_stream_ctl.c b/dap-sdk/net/stream/stream/dap_stream_ctl.c
index a19f14e97b..dc82ed592c 100644
--- a/dap-sdk/net/stream/stream/dap_stream_ctl.c
+++ b/dap-sdk/net/stream/stream/dap_stream_ctl.c
@@ -73,9 +73,9 @@ static struct {
* @brief stream_ctl_init Initialize stream control module
* @return Zero if ok others if not
*/
-int dap_stream_ctl_init(size_t socket_forward_key_size)
+int dap_stream_ctl_init()
{
- s_socket_forward_key.size = socket_forward_key_size;
+ s_socket_forward_key.size = 32; // Why do we set it, not autodeceting?
s_socket_forward_key.type = dap_stream_get_preferred_encryption_type();
return 0;
diff --git a/dap-sdk/net/stream/stream/include/dap_stream_ctl.h b/dap-sdk/net/stream/stream/include/dap_stream_ctl.h
index a040b2eb00..372ea96907 100644
--- a/dap-sdk/net/stream/stream/include/dap_stream_ctl.h
+++ b/dap-sdk/net/stream/stream/include/dap_stream_ctl.h
@@ -26,6 +26,6 @@ typedef struct dap_http dap_http_t;
#define KEX_KEY_STR_SIZE 128
-int dap_stream_ctl_init(size_t socket_forward_key_size);
+int dap_stream_ctl_init();
void dap_stream_ctl_deinit();
void dap_stream_ctl_add_proc(struct dap_http * sh, const char * url);
--
GitLab