From e4130d29e80a40884310481ded90ff845c614f43 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 24 十二月 2020 10:03:14 +0800
Subject: [PATCH] bus force bind
---
src/socket/net_mod_server_socket.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 7924421..46c3bce 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -3,6 +3,7 @@
#include "socket_io.h"
#include "net_mod_socket_io.h"
#include "net_mod_socket.h"
+#include "key_def.h"
static Logger * logger = LoggerFactory::getLogger();
@@ -51,7 +52,7 @@
sprintf(portstr, "%d", port);
listenfd = open_listenfd(portstr);
if(listenfd < 0) {
- LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start . errno=%d", errno);
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::start . errno=%d ", errno);
return -1;
}
init_pool(listenfd);
@@ -167,9 +168,7 @@
if(request_head.timeout > 0) {
timeout.tv_sec = request_head.timeout / 1000;
timeout.tv_nsec = (request_head.timeout - timeout.tv_sec * 1000) * 10e6;
-
// printf(" timeout.tv_sec = %d, timeout.tv_nsec=%ld\n", timeout.tv_sec, timeout.tv_nsec );
-
ret = shmModSocket.sendandrecv_unsafe_timeout(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size, &timeout);
}
else if(request_head.timeout == 0) {
@@ -214,6 +213,7 @@
} else if(request_head.mod == BUS) {
+
if(request_head.topic_length > max_topic_buf) {
if( (topic_buf = realloc(topic_buf, request_head.topic_length)) == NULL ) {
LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc topic_buf");
@@ -229,20 +229,19 @@
// LoggerFactory::getLogger()->debug("====server pub %s===\n", buf);
memcpy(response_head.host, request_head.host, NI_MAXHOST);
response_head.port = request_head.port;
- response_head.key = request_head.key;
+ // response_head.key = request_head.key;
if(request_head.timeout > 0) {
timeout.tv_sec = request_head.timeout / 1000;
timeout.tv_nsec = (request_head.timeout - timeout.tv_sec * 1000) * 10e6;
- ret = shmModSocket.pub_timeout((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, request_head.key, &timeout);
+ ret = shmModSocket.pub_timeout((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, BUS_KEY, &timeout);
}
else if(request_head.timeout == 0) {
- ret = shmModSocket.pub_nowait((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, request_head.key);
+ ret = shmModSocket.pub_nowait((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, BUS_KEY);
}
else if(request_head.timeout == -1) {
- ret = shmModSocket.pub((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, request_head.key);
+ ret = shmModSocket.pub((char*)topic_buf, request_head.topic_length, buf, request_head.content_length, BUS_KEY);
}
-
response_head.code = ret;
response_head.content_length = 0;
if( rio_writen(connfd, NetModSocket::encode_response_head(response_head), NET_MODE_RESPONSE_HEAD_LENGTH) != NET_MODE_RESPONSE_HEAD_LENGTH )
--
Gitblit v1.8.0