From acbf282b23b4cbdebca562d67132573de3902f94 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期五, 17 九月 2021 10:45:43 +0800
Subject: [PATCH] Merge branch 'master' of http://os.smartai.com:9091/valib/c_bhomebus
---
src/socket/bus_server_socket_wrapper.cpp | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/src/socket/bus_server_socket_wrapper.cpp b/src/socket/bus_server_socket_wrapper.cpp
index d2f5a8e..db8bfe5 100644
--- a/src/socket/bus_server_socket_wrapper.cpp
+++ b/src/socket/bus_server_socket_wrapper.cpp
@@ -7,7 +7,6 @@
* 鍒涘缓
*/
void * bus_server_socket_wrapper_open() {
- logger->debug("===bus_server_socket_wrapper_open\n");
BusServerSocket *sockt = new BusServerSocket;
return (void *)sockt;
}
@@ -19,7 +18,6 @@
BusServerSocket *sockt = (BusServerSocket *)_socket;
delete sockt;
- logger->debug("===bus_server_socket_wrapper_close\n");
}
int bus_server_socket_wrapper_stop(void *_socket) {
@@ -35,11 +33,45 @@
int ret;
BusServerSocket *sockt = (BusServerSocket *)_socket;
- if( (ret = sockt->force_bind(SHM_BUS_KEY)) == 0) {
+ if( (ret = sockt->bind(SHM_BUS_KEY)) == 0) {
return sockt->start();
} else {
logger->error("start bus failed");
return -1;
}
-}
\ No newline at end of file
+}
+
+int bus_server_socket_wrapper_data_get(void * _socket, int val) {
+ int ret;
+ BusServerSocket *sockt = (BusServerSocket *)_socket;
+
+ ret = sockt->get_data(val);
+
+ return ret;
+
+}
+
+int bus_server_socket_wrapper_proc_check(void * _socket, int val, char *buf, int len, void **buf_ret, int *len_ret, \
+ const struct timespec *timeout, const int flag) {
+ int ret;
+ BusServerSocket *sockt = (BusServerSocket *)_socket;
+
+ ret = sockt->check_proc(val, buf, len, buf_ret, len_ret, timeout, flag);
+
+ return ret;
+
+}
+
+void bus_server_socket_wrapper_proc_release(void * _socket, int val) {
+
+ BusServerSocket *sockt = (BusServerSocket *)_socket;
+
+ sockt->remove_proc(val);
+
+}
+
+
+
+
+
--
Gitblit v1.8.0