From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/net/net_mod_socket_wrapper.cpp | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/net/net_mod_socket_wrapper.cpp b/src/net/net_mod_socket_wrapper.cpp
index 1dd2465..6f9a66e 100644
--- a/src/net/net_mod_socket_wrapper.cpp
+++ b/src/net/net_mod_socket_wrapper.cpp
@@ -20,6 +20,11 @@
delete sockt;
}
+int net_mod_socket_stop(void *_socket) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->stop();
+}
+
/**
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
@@ -35,8 +40,8 @@
*/
int net_mod_socket_force_bind(void * _socket, int key) {
NetModSocket *sockt = (NetModSocket *)_socket;
- // return sockt->force_bind(key);
- return sockt->bind(key);
+ return sockt->force_bind(key);
+ // return sockt->bind(key);
}
/**
@@ -54,6 +59,7 @@
NetModSocket *sockt = (NetModSocket *)_socket;
logger->debug("net_mod_socket_sendto: %d sendto %d", net_mod_socket_get_key(_socket), key);
return sockt->sendto_timeout(buf, size, key, sec, nsec);
+ // return sockt->sendto(buf, size, key);
}
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
int net_mod_socket_sendto_nowait(void *_socket, const void *buf, const int size, const int key){
@@ -76,12 +82,14 @@
logger->debug(" %d net_mod_socket_recvfrom after. rv = %d", net_mod_socket_get_key(_socket), rv);
return rv;
}
+
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
int net_mod_socket_recvfrom_timeout(void *_socket, void **buf, int *size, int *key, int sec, int nsec){
NetModSocket *sockt = (NetModSocket *)_socket;
- //return sockt->recvfrom(buf, size, key);
+ // return sockt->recvfrom(buf, size, key);
return sockt->recvfrom_timeout(buf, size, key, sec, nsec);
}
+
int net_mod_socket_recvfrom_nowait(void *_socket, void **buf, int *size, int *key){
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->recvfrom_nowait(buf, size, key);
@@ -92,6 +100,7 @@
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
}
+
/**
* 濡傛灉寤虹珛杩炴帴鐨勮妭鐐规病鏈夋帴鍙楀埌娑堟伅绛夊緟timeout鐨勬椂闂村悗杩斿洖
* @timeout 绛夊緟鏃堕棿锛屽崟浣嶆槸鍗冨垎涔嬩竴绉�
@@ -99,6 +108,7 @@
int net_mod_socket_sendandrecv_timeout(void *_socket, net_node_t *node_arr, int arrlen, void *send_buf, int send_size,
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size, int timeout){
NetModSocket *sockt = (NetModSocket *)_socket;
+ // return sockt->sendandrecv(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
return sockt->sendandrecv_timeout(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size, timeout);
}
@@ -108,7 +118,25 @@
return sockt->sendandrecv_nowait(node_arr, arrlen, send_buf, send_size, recv_arr, recv_arr_size);
}
-
+
+int net_mod_socket_recvandsend(void *_socket, recvandsend_callback_wrapper_fn callback, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->recvandsend( callback, NULL, 0, user_data);
+
+}
+
+int net_mod_socket_recvandsend_timeout(void *_socket, recvandsend_callback_wrapper_fn callback,
+ int sec, int nsec, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ struct timespec timeout = {sec, nsec};
+ return sockt->recvandsend( callback, &timeout, BUS_TIMEOUT_FLAG, user_data);
+}
+
+int net_mod_socket_recvandsend_nowait(void *_socket, recvandsend_callback_wrapper_fn callback, void * user_data) {
+ NetModSocket *sockt = (NetModSocket *)_socket;
+ return sockt->recvandsend( callback, NULL, BUS_NOWAIT_FLAG, user_data);
+}
+
/**
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
@@ -117,15 +145,15 @@
* @content 鍐呭锛孈content_size 鍐呭闀垮害
* @return 鎴愬姛鍙戝竷鐨勮妭鐐圭殑涓暟
*/
-int net_mod_socket_pub(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size) {
+int net_mod_socket_pub(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size) {
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->pub(node_arr, node_arr_len, topic, topic_size, content, content_size);
}
-int net_mod_socket_pub_timeout(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size, int msec){
+int net_mod_socket_pub_timeout(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size, int msec){
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->pub_timeout(node_arr, node_arr_len, topic, topic_size, content, content_size, msec);
}
-int net_mod_socket_pub_nowait(void *_socket, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size){
+int net_mod_socket_pub_nowait(void *_socket, net_node_t *node_arr, int node_arr_len, const char *topic, int topic_size, const void *content, int content_size){
NetModSocket *sockt = (NetModSocket *)_socket;
return sockt->pub_nowait(node_arr, node_arr_len, topic, topic_size, content, content_size);
}
@@ -207,10 +235,9 @@
int shm_mod_socket_remove_keys(int keys[], int length){
- return ShmModSocket::remove_keys(keys, length);
+ return 0;
}
int shm_mod_socket_remove_key(int key){
- int keys[] = {key};
- return ShmModSocket::remove_keys(keys, 1);
+ return 0;
}
--
Gitblit v1.8.0