From ddbeeaaffeab5bc997a0b7a7e8dcac863610feee Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 05 八月 2020 20:04:52 +0800
Subject: [PATCH] udpate
---
/dev/null | 0
src/socket/dgram_mod_socket.c | 127 +++++++++++++++++++++++++++++++++++-------
2 files changed, 105 insertions(+), 22 deletions(-)
diff --git a/src/libshm_queue.a b/src/libshm_queue.a
deleted file mode 100644
index 5f592d6..0000000
--- a/src/libshm_queue.a
+++ /dev/null
Binary files differ
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 4d58458..e733ff6 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -1,58 +1,113 @@
#include "dgram_mod_socket.h"
+#include "dmod_socket.h"
+
+typedef struct dgram_mod_socket_t {
+ DModSocket *m_socket;
+
+} dgram_mod_socket_t;
/**
* 鍒涘缓socket
* @return socket鍦板潃
*/
-void *dgram_mod_open_socket();
+void *dgram_mod_open_socket() {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *)calloc(1, sizeof(dgram_mod_socket_t));
+ // socket->mod = (socket_mod_t)mod;
+ socket->m_socket = new DModSocket;
+ return (void *)socket;
+}
/**
* 鍏抽棴socket
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_close_socket(void * _socket);
+int dgram_mod_close_socket(void * _socket) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ delete socket->m_socket;
+ free(_socket);
+ return 0;
+}
/**
* 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_bind(void * _socket, int port);
+int dgram_mod_bind(void * _socket, int port) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->bind(port);
+}
/**
* 寮哄埗缁戝畾绔彛鍒皊ocket, 閫傜敤浜庣▼搴忛潪姝ｅ父鍏抽棴鐨勬儏鍐典笅锛岄噸鍚▼搴忕粦瀹氬師鏉ヨ繕娌￠噴鏀剧殑key
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_force_bind(void * _socket, int port);
+int dgram_mod_force_bind(void * _socket, int port) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->force_bind(port);
+}
/**
* 鍙戦�佷俊鎭�
* @port 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_sendto(void *_socket, const void *buf, const int size, const int port);
+int dgram_mod_sendto(void *_socket, const void *buf, const int size, const int port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->sendto(buf, size,port);
+}
+
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
-int dgram_mod_sendto_timeout(void *_socket, const void *buf, const int size, const int port, int sec, int nsec);
+int dgram_mod_sendto_timeout(void *_socket, const void *buf, const int size, const int port, int sec, int nsec){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ struct timespec timeout = {sec, nsec};
+ return socket->m_socket->sendto_timeout(buf, size, port, &timeout);
+}
+
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
-int dgram_mod_sendto_nowait(void *_socket, const void *buf, const int size, const int port);
+int dgram_mod_sendto_nowait(void *_socket, const void *buf, const int size, const int port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->sendto_nowait(buf, size,port);
+}
/**
* 鎺ユ敹淇℃伅
* @port 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_recvfrom(void *_socket, void **buf, int *size, int *port);
+int dgram_mod_recvfrom(void *_socket, void **buf, int *size, int *port) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->recvfrom(buf, size, port);
+}
// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int dgram_mod_recvfrom_timeout(void *_socket, void **buf, int *size, int *port, int sec, int nsec);
-int dgram_mod_recvfrom_nowait(void *_socket, void **buf, int *size, int *port);
+int dgram_mod_recvfrom_timeout(void *_socket, void **buf, int *size, int *port, int sec, int nsec){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ struct timespec timeout = {sec, nsec};
+ return socket->m_socket->recvfrom_timeout(buf, size, port, &timeout);
+}
+
+int dgram_mod_recvfrom_nowait(void *_socket, void **buf, int *size, int *port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->recvfrom_nowait(buf, size, port);
+}
/**
* 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
* @port 鍙戦�佺粰璋�
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_sendandrecv(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+int dgram_mod_sendandrecv(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->sendandrecv(send_buf, send_size, port, recv_buf, recv_size);
+}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int dgram_mod_sendandrecv_timeout(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, int sec, int nsec) ;
-int dgram_mod_sendandrecv_nowait(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) ;
+int dgram_mod_sendandrecv_timeout(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size, int sec, int nsec){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ struct timespec timeout = {sec, nsec};
+ return socket->m_socket->sendandrecv_timeout(send_buf, send_size, port, recv_buf, recv_size, &timeout);
+}
+int dgram_mod_sendandrecv_nowait(void * _socket, const void *send_buf, const int send_size, const int port, void **recv_buf, int *recv_size) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->sendandrecv_nowait(send_buf, send_size, port, recv_buf, recv_size);
+}
/**
@@ -60,7 +115,10 @@
*
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
-int dgram_mod_start_bus(void * _socket);
+int dgram_mod_start_bus(void * _socket) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->start_bus();
+}
/**
* 璁㈤槄鎸囧畾涓婚
@@ -68,10 +126,20 @@
* @size 涓婚闀垮害
* @port 鎬荤嚎绔彛
*/
-int dgram_mod_sub(void * _socket, void *topic, int size, int port);
+int dgram_mod_sub(void * _socket, void *topic, int size, int port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->sub(topic, size, port);
+}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int dgram_mod_sub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec);
-int dgram_mod_sub_nowait(void * _socket, void *topic, int size, int port);
+int dgram_mod_sub_timeout(void * _socket, void *topic, int size, int port, int sec, int nsec){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ struct timespec timeout = {sec, nsec};
+ return socket->m_socket->sub_timeout(topic, size, port, &timeout);
+}
+int dgram_mod_sub_nowait(void * _socket, void *topic, int size, int port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->sub_nowait(topic, size, port);
+}
@@ -81,19 +149,34 @@
* @content 涓婚鍐呭
* @port 鎬荤嚎绔彛
*/
-int dgram_mod_pub(void * _socket, void *topic, int topic_size, void *content, int content_size, int port);
+int dgram_mod_pub(void * _socket, void *topic, int topic_size, void *content, int content_size, int port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->pub(topic, topic_size, content, content_size, port);
+}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int dgram_mod_pub_timeout(void * _socket, void *topic, int topic_size, void *content, int content_size, int port, int sec, int nsec);
-int dgram_mod_pub_nowait(void * _socket, void *topic, int topic_size, void *content, int content_size, int port);
+int dgram_mod_pub_timeout(void * _socket, void *topic, int topic_size, void *content, int content_size, int port, int sec, int nsec){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ struct timespec timeout = {sec, nsec};
+ return socket->m_socket->pub_timeout(topic, topic_size, content, content_size, port, &timeout);
+}
+int dgram_mod_pub_nowait(void * _socket, void *topic, int topic_size, void *content, int content_size, int port){
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->pub_nowait(topic, topic_size, content, content_size, port);
+}
/**
* 鑾峰彇soket绔彛鍙�
*/
-int dgram_mod_get_port(void * _socket) ;
+int dgram_mod_get_port(void * _socket) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return socket->m_socket->get_port();
+}
/**
* 閲婃斁瀛樺偍鎺ユ敹淇℃伅鐨刡uf
*/
-void dgram_mod_free(void *buf) ;
\ No newline at end of file
+void dgram_mod_free(void *buf) {
+ free(buf);
+}
\ No newline at end of file
--
Gitblit v1.8.0