From 9e64ecf008d2258cab142b10f07eca6b538d6c19 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 05 八月 2020 19:39:53 +0800
Subject: [PATCH] update
---
src/socket/include/shm_socket.h | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/socket/include/shm_socket.h b/src/socket/include/shm_socket.h
index 822450d..6bb0448 100644
--- a/src/socket/include/shm_socket.h
+++ b/src/socket/include/shm_socket.h
@@ -5,9 +5,7 @@
#include "usg_typedef.h"
#include "shm_queue.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+
enum shm_msg_type_t
{
@@ -18,11 +16,22 @@
};
+enum shm_socket_flag_t
+{
+ SHM_MSG_TIMEOUT = 1,
+ SHM_MSG_NOWAIT = 2
+};
+
enum shm_socket_type_t
{
SHM_SOCKET_STREAM = 1,
SHM_SOCKET_DGRAM = 2
+};
+
+enum shm_socket_error_type_t {
+ SHM_SOCKET_ECONNFAILED = 1,
+ SHM_SOCKET_ETIMEOUT = 2
};
enum shm_connection_status_t {
@@ -40,10 +49,13 @@
} shm_msg_t;
+
+
typedef struct shm_socket_t {
shm_socket_type_t socket_type;
// 鏈湴port
int port;
+ bool force_bind;
shm_connection_status_t status;
SHMQueue<shm_msg_t> *queue;
SHMQueue<shm_msg_t> *remoteQueue;
@@ -65,6 +77,9 @@
int shm_socket_bind(shm_socket_t * socket, int port) ;
+int shm_socket_force_bind(shm_socket_t * socket, int port) ;
+
+
int shm_listen(shm_socket_t * socket) ;
shm_socket_t* shm_accept(shm_socket_t* socket);
@@ -73,17 +88,16 @@
int shm_send(shm_socket_t * socket, const void *buf, const int size) ;
-int shm_sendandrecv(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size);
int shm_recv(shm_socket_t * socket, void **buf, int *size) ;
-int shm_sendto(shm_socket_t *socket, const void *buf, const int size, const int port);
+int shm_sendto(shm_socket_t *socket, const void *buf, const int size, const int port, const struct timespec * timeout = NULL, const int flags=0);
-int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *port);
+int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *port, struct timespec * timeout = NULL, int flags=0);
+
+int shm_sendandrecv(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size,
+ struct timespec * timeout = NULL, int flags=0);
-#ifdef __cplusplus
-}
-#endif
#endif
\ No newline at end of file
--
Gitblit v1.8.0