From ed012804c8d089a3bca69574b198bdd987318f01 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 30 十一月 2020 11:00:16 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket_wrapper.h | 13 +++++++++++++
src/socket/dgram_mod_socket.h | 8 ++------
test_net_socket/test_net_mod_socket.c | 2 +-
src/socket/shm_stream_mod_socket.h | 8 ++------
src/socket/dgram_mod_socket.c | 7 -------
src/queue/shm_mm_wraper.h | 0
src/queue/shm_mm_wrapper.c | 0
src/socket/net_mod_socket_wrapper.c | 11 +++++++++++
8 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/src/queue/shm_mm.h b/src/queue/shm_mm_wraper.h
similarity index 100%
rename from src/queue/shm_mm.h
rename to src/queue/shm_mm_wraper.h
diff --git a/src/queue/shm_mm.c b/src/queue/shm_mm_wrapper.c
similarity index 100%
rename from src/queue/shm_mm.c
rename to src/queue/shm_mm_wrapper.c
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index cd560b2..1976616 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -7,14 +7,7 @@
} dgram_mod_socket_t;
-int dgram_mod_remove_keys(int keys[], int length){
- return ShmModSocket::remove_keys(keys, length);
-}
-int dgram_mod_remove_key(int key){
- int keys[] = {key};
- return ShmModSocket::remove_keys(keys, 1);
-}
/**
* 鍒涘缓socket
* @return socket鍦板潃
diff --git a/src/socket/dgram_mod_socket.h b/src/socket/dgram_mod_socket.h
index 22fbe85..dbfd6e2 100644
--- a/src/socket/dgram_mod_socket.h
+++ b/src/socket/dgram_mod_socket.h
@@ -2,9 +2,7 @@
#define __DGRAM_MOD_SOCKET_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
+
/**
* 鍒犻櫎key瀵瑰簲鐨勫叡浜槦鍒楋紝骞跺湪bus閲屽垹闄よkey鐨勮闃�
@@ -124,8 +122,6 @@
* 閲婃斁瀛樺偍鎺ユ敹淇℃伅鐨刡uf
*/
void dgram_mod_free(void *buf) ;
-#ifdef __cplusplus
-}
-#endif
+
#endif
\ No newline at end of file
diff --git a/src/socket/net_mod_socket_wrapper.c b/src/socket/net_mod_socket_wrapper.c
index d597644..7e7ed92 100644
--- a/src/socket/net_mod_socket_wrapper.c
+++ b/src/socket/net_mod_socket_wrapper.c
@@ -215,3 +215,14 @@
return NetModSocket::free_recv_msg_arr(arr, len);
}
+
+
+
+int shm_mod_socket_remove_keys(int keys[], int length){
+ return ShmModSocket::remove_keys(keys, length);
+}
+
+int shm_mod_socket_remove_key(int key){
+ int keys[] = {key};
+ return ShmModSocket::remove_keys(keys, 1);
+}
diff --git a/src/socket/net_mod_socket_wrapper.h b/src/socket/net_mod_socket_wrapper.h
index 9bbdb21..830a992 100644
--- a/src/socket/net_mod_socket_wrapper.h
+++ b/src/socket/net_mod_socket_wrapper.h
@@ -12,6 +12,8 @@
NetModSocket *sockt;
};
+
+
/**
* 鍒涘缓
*/
@@ -147,6 +149,17 @@
*/
void net_mod_socket_free(void *buf) ;
+
+/**
+ * 鍒犻櫎key瀵瑰簲鐨勫叡浜槦鍒楋紝骞跺湪bus閲屽垹闄よkey鐨勮闃�
+ */
+int shm_mod_socket_remove_key(int key);
+
+/**
+ * 鎵归噺鍒犻櫎key瀵瑰簲鐨勫叡浜槦鍒楋紝骞跺湪bus閲屽垹闄よkey鐨勮闃�
+ */
+int shm_mod_socket_remove_keys(int keys[], int length);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/socket/shm_stream_mod_socket.h b/src/socket/shm_stream_mod_socket.h
index 9fd29a2..305c2fd 100644
--- a/src/socket/shm_stream_mod_socket.h
+++ b/src/socket/shm_stream_mod_socket.h
@@ -2,9 +2,7 @@
#define __shm_stream_mod_socket_SOCKET_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
+
enum socket_mod_t
{
@@ -70,8 +68,6 @@
*/
int shm_stream_mod_socket_get_key(void * _socket);
-#ifdef __cplusplus
-}
-#endif
+
#endif
\ No newline at end of file
diff --git a/test_net_socket/test_net_mod_socket.c b/test_net_socket/test_net_mod_socket.c
index 6527a4e..4989b14 100644
--- a/test_net_socket/test_net_mod_socket.c
+++ b/test_net_socket/test_net_mod_socket.c
@@ -29,7 +29,7 @@
printf("Start net proxy\n");
void *serverSocket = net_mod_server_socket_open(port);
if(net_mod_server_socket_start(serverSocket) != 0) {
- err_msg(errno, "net_mod_server_socket_start");
+ err_exit(errno, "net_mod_server_socket_start");
}
}
--
Gitblit v1.8.0