From 381022e127d83ffa138ad663383e39c0ffec92b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?=
<alexander.lysikov@demlabs.net>
Date: Mon, 1 Jul 2019 12:42:04 +0500
Subject: [PATCH] added `mutex` to `struct dap_client` for correct closing
connection update modules
---
include/dap_client.h | 4 +++-
libdap | 2 +-
libdap-crypto | 2 +-
libdap-server | 2 +-
libdap-server-core | 2 +-
libdap-server-udp | 2 +-
libdap-stream | 2 +-
libdap-stream-ch | 2 +-
8 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/include/dap_client.h b/include/dap_client.h
index c955559..bad823d 100755
--- a/include/dap_client.h
+++ b/include/dap_client.h
@@ -38,7 +38,8 @@ typedef enum dap_client_stage {
STAGE_STREAM_CTL=2,
STAGE_STREAM_SESSION=3,
STAGE_STREAM_CONNECTED=4,
- STAGE_STREAM_STREAMING=5
+ STAGE_STREAM_STREAMING=5,
+ STAGE_STREAM_ABORT=10
} dap_client_stage_t;
typedef enum dap_client_stage_status {
@@ -69,6 +70,7 @@ typedef enum dap_client_error {
* @brief The dap_client struct
*/
typedef struct dap_client{
+ pthread_mutex_t mutex;
void * _internal;
void * _inheritor;
} dap_client_t;
diff --git a/libdap b/libdap
index 4ab41cd..4896ad4 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 4ab41cdcaa8087323652cd5fef702876ccc25dab
+Subproject commit 4896ad4eeda5b8d4b3ba92dfe2eb6d4cf34efcc7
diff --git a/libdap-crypto b/libdap-crypto
index ff63d76..bcfcef1 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit ff63d762657f9687173db825705b8bf4b958abee
+Subproject commit bcfcef1cd87cc6cfbc7e47887894c0fa3742a218
diff --git a/libdap-server b/libdap-server
index 2cc113d..5c4bf1f 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit 2cc113d3ef8234037016ac21f33731998bba6552
+Subproject commit 5c4bf1f472a48086f71822355c14197ff416831a
diff --git a/libdap-server-core b/libdap-server-core
index 1008394..bbe4d2b 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit 1008394f0ecdbc41d995a4cc5bbc4b51ad789eaf
+Subproject commit bbe4d2b4e00012effac21cda4c2d3554dc6173e0
diff --git a/libdap-server-udp b/libdap-server-udp
index bbf1b9d..e320774 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit bbf1b9db2c3af9a3a59f6debb90ddc8db55ae2eb
+Subproject commit e320774de51a831559fbeafb2dab6e7c063dcc99
diff --git a/libdap-stream b/libdap-stream
index 7a53ab9..d970b74 160000
--- a/libdap-stream
+++ b/libdap-stream
@@ -1 +1 @@
-Subproject commit 7a53ab997e1079000d0f7477d30e4d58cf4185f7
+Subproject commit d970b74478fc582e75c3e287fa63bec207b92598
diff --git a/libdap-stream-ch b/libdap-stream-ch
index 268f422..09e7691 160000
--- a/libdap-stream-ch
+++ b/libdap-stream-ch
@@ -1 +1 @@
-Subproject commit 268f422bde88a5f4f254a31b7d52b18d2cad71fc
+Subproject commit 09e76911c2f76c6cc1c4651a99f0e545c1c1c840
--
GitLab