From b4d5191fc391be9d3140e65f771cd61b06675724 Mon Sep 17 00:00:00 2001
From: armatusmiles <akurotych@gmail.com>
Date: Thu, 13 Dec 2018 16:09:57 +0200
Subject: [PATCH] [-] dap_stream_new_es
---
stream/CMakeLists.txt | 4 ++--
stream/dap_stream.c | 18 +++++++++---------
stream/dap_stream.h | 5 +----
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/stream/CMakeLists.txt b/stream/CMakeLists.txt
index 7b4a8e4..543ba53 100644
--- a/stream/CMakeLists.txt
+++ b/stream/CMakeLists.txt
@@ -8,8 +8,8 @@ set(STREAM_SRCS
add_library(${PROJECT_NAME} STATIC ${STREAM_SRCS})
-target_link_libraries(dap_stream dap_core dap_udp_server dap_client
- dap_crypto dap_http_server dap_enc_server dap_session dap_stream_ch)
+target_link_libraries(dap_stream dap_core dap_udp_server dap_crypto
+ dap_http_server dap_enc_server dap_session dap_stream_ch)
target_include_directories(dap_stream INTERFACE .)
set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
diff --git a/stream/dap_stream.c b/stream/dap_stream.c
index bded0d5..f32457a 100644
--- a/stream/dap_stream.c
+++ b/stream/dap_stream.c
@@ -281,17 +281,17 @@ dap_stream_t * stream_new(dap_http_client_t * sh)
* @param a_es
* @return
*/
-dap_stream_t* dap_stream_new_es(dap_events_socket_t * a_es)
-{
- dap_stream_t * ret= DAP_NEW_Z(dap_stream_t);
+//dap_stream_t* dap_stream_new_es(dap_events_socket_t * a_es)
+//{
+// dap_stream_t * ret= DAP_NEW_Z(dap_stream_t);
- ret->events_socket = a_es;
- ret->buf_defrag_size=0;
- ret->is_client_to_uplink = true;
+// ret->events_socket = a_es;
+// ret->buf_defrag_size=0;
+// ret->is_client_to_uplink = true;
- log_it(L_NOTICE,"New stream with events socket instance for %s",a_es->hostaddr);
- return ret;
-}
+// log_it(L_NOTICE,"New stream with events socket instance for %s",a_es->hostaddr);
+// return ret;
+//}
/**
* @brief s_headers_write Prepare headers for output. Creates stream structure
diff --git a/stream/dap_stream.h b/stream/dap_stream.h
index b9b7d55..3d0c874 100644
--- a/stream/dap_stream.h
+++ b/stream/dap_stream.h
@@ -31,7 +31,6 @@
#include "dap_stream_ch.h"
#include "dap_udp_server.h"
#include "dap_udp_client.h"
-#include "dap_events_socket.h"
#define CHUNK_SIZE_MAX 3*1024
@@ -59,8 +58,6 @@ typedef struct dap_stream {
struct dap_udp_client * conn_udp; // UDP-client
- dap_events_socket_t * events_socket;
-
bool is_live;
bool is_client_to_uplink ;
@@ -97,7 +94,7 @@ void dap_stream_add_proc_http(dap_http_t * sh, const char * url);
void dap_stream_add_proc_udp(dap_udp_server_t * sh);
-dap_stream_t* dap_stream_new_es(dap_events_socket_t * a_es);
+// dap_stream_t* dap_stream_new_es(dap_events_socket_t * a_es);
size_t dap_stream_data_proc_read(dap_stream_t * a_stream);
size_t dap_stream_data_proc_write(dap_stream_t * a_stream);
void dap_stream_delete(dap_stream_t * a_stream);
--
GitLab