From 26ed48c4e616014ee760fd13d13dbdc8539c34e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 19:21:55 +0800
Subject: [PATCH] 解决sendandrecv发送到一个不存在key的情况
---
src/socket/shm_socket.h | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 4f1efc2..cf6737f 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -5,29 +5,13 @@
#include "usg_typedef.h"
#include "shm_queue.h"
-
-
-enum shm_msg_type_t
-{
- SHM_SOCKET_OPEN = 1,
- SHM_SOCKET_OPEN_REPLY = 2,
- SHM_SOCKET_CLOSE = 3,
- SHM_COMMON_MSG = 4
-
-};
-
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,
@@ -40,8 +24,24 @@
SHM_CONN_ESTABLISHED=3
};
+enum shm_socket_type_t
+{
+ SHM_SOCKET_STREAM = 1,
+ SHM_SOCKET_DGRAM = 2
+
+};
+
+enum shm_msg_type_t
+{
+ SHM_SOCKET_OPEN = 1,
+ SHM_SOCKET_OPEN_REPLY = 2,
+ SHM_SOCKET_CLOSE = 3,
+ SHM_COMMON_MSG = 4
+
+};
+
typedef struct shm_msg_t {
- int port;
+ int key;
shm_msg_type_t type;
size_t size;
void * buf;
@@ -53,8 +53,8 @@
typedef struct shm_socket_t {
shm_socket_type_t socket_type;
- // 鏈湴port
- int port;
+ // 鏈湴key
+ int key;
bool force_bind;
int mutex;
shm_connection_status_t status;
@@ -77,33 +77,36 @@
int shm_close_socket(shm_socket_t * socket) ;
-int shm_socket_bind(shm_socket_t * socket, int port) ;
+int shm_socket_bind(shm_socket_t * socket, int key) ;
-int shm_socket_force_bind(shm_socket_t * socket, int port) ;
+int shm_socket_force_bind(shm_socket_t * socket, int key) ;
int shm_listen(shm_socket_t * socket) ;
shm_socket_t* shm_accept(shm_socket_t* socket);
-int shm_connect(shm_socket_t * socket, int port);
+int shm_connect(shm_socket_t * socket, int key);
int shm_send(shm_socket_t * socket, const void *buf, const int 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, const struct timespec * timeout = NULL, const int flags=0);
+/**
+ * @flags : SHM_MSG_NOWAIT
+ */
+int shm_sendto(shm_socket_t *socket, const void *buf, const int size, const int key, const struct timespec * timeout = NULL, const int flags=0);
-int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *port, struct timespec * timeout = NULL, int flags=0);
+int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, 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,
+int shm_sendandrecv(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size,
struct timespec * timeout = NULL, int flags=0);
/**
* 鍔熻兘鍚宻hm_sendandrecv, 浣嗘槸涓嶆槸绾跨▼瀹夊叏鐨�
*/
-int shm_sendandrecv_unsafe(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_port, void **recv_buf, int *recv_size,
+int shm_sendandrecv_unsafe(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size,
struct timespec * timeout = NULL, int flags=0);
--
Gitblit v1.8.0