Minor modifications prior to integration

orbcode · Jun 25, 2022 · ae66cf9 · ae66cf9
1 parent a9a2093
commit ae66cf9
Show file tree

Hide file tree

Showing 10 changed files with 338 additions and 290 deletions.
diff --git a/Inc/dataStream.h b/Inc/dataStream.h
diff --git a/Inc/stream.h b/Inc/stream.h
@@ -0,0 +1,33 @@
+#ifndef _STREAM_H_
+#define _STREAM_H_
+
+#include <stddef.h>
+#include <sys/time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum ReceiveResult
+{
+    RECEIVE_RESULT_OK,
+    RECEIVE_RESULT_TIMEOUT,
+    RECEIVE_RESULT_EOF,
+    RECEIVE_RESULT_ERROR,
+};
+
+struct Stream
+{
+    enum ReceiveResult ( *receive )( struct Stream *stream, void *buffer, size_t bufferSize,
+                                     struct timeval *timeout, size_t *receivedSize );
+    void ( *close )( struct Stream *stream );
+};
+
+struct Stream *streamCreateSocket( const char *server, int port );
+struct Stream *streamCreateFile( const char *file );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Makefile b/Makefile
@@ -105,11 +105,11 @@ endif
 # ==========
 
 ORBLIB_CFILES = $(App_DIR)/itmDecoder.c $(App_DIR)/tpiuDecoder.c $(App_DIR)/msgDecoder.c $(App_DIR)/msgSeq.c $(App_DIR)/traceDecoder.c
-ORBLIB_CFILES = $(App_DIR)/itmDecoder.c $(App_DIR)/tpiuDecoder.c $(App_DIR)/msgDecoder.c $(App_DIR)/msgSeq.c $(App_DIR)/traceDecoder.c $(App_DIR)/dataStream_socket.c 
+ORBLIB_CFILES = $(App_DIR)/itmDecoder.c $(App_DIR)/tpiuDecoder.c $(App_DIR)/msgDecoder.c $(App_DIR)/msgSeq.c $(App_DIR)/traceDecoder.c $(App_DIR)/stream_socket.c 
 
 ifdef WINDOWS
 else
-	ORBLIB_CFILES += $(App_DIR)/dataStream_file_posix.c
+	ORBLIB_CFILES += $(App_DIR)/stream_file_posix.c
 endif
 
 ORBUCULUM_CFILES  = $(App_DIR)/$(ORBUCULUM).c $(App_DIR)/nwclient.c

diff --git a/Src/dataStream_file_posix.c b/Src/dataStream_file_posix.c
diff --git a/Src/dataStream_socket.c b/Src/dataStream_socket.c