From 95349b79a5a646736c706fe19645181146ee9486 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 20 十月 2020 16:29:59 +0800
Subject: [PATCH] update
---
src/socket/net_mod_server_socket.c | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 51e10e9..9448a39 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -43,6 +43,7 @@
socklen_t clientlen;
struct sockaddr_storage clientaddr;
char portstr[32];
+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) err_msg(errno, "signal");
//shmModSocket = new ShmModSocket;
sprintf(portstr, "%d", port);
@@ -58,7 +59,7 @@
/* Wait for listening/connected descriptor(s) to become ready */
pool.ready_set = pool.read_set;
pool.nready = select(pool.maxfd + 1, &pool.ready_set, NULL, NULL, NULL);
-
+ // LoggerFactory::getLogger()->debug("select return \n");
/* If listening descriptor ready, add new client to pool */
if (FD_ISSET(listenfd, &pool.ready_set))
{
@@ -135,11 +136,12 @@
request_head = NetModSocket::decode_request_head(request_head_bs);
if(request_head.content_length > max_buf) {
- buf = realloc(buf, request_head.content_length);
- max_buf = request_head.content_length;
- if(buf == NULL) {
- LoggerFactory::getLogger()->error(errno, "process_client realloc");
+
+ if( (buf = realloc(buf, request_head.content_length)) == NULL) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc buf");
exit(1);
+ } else {
+ max_buf = request_head.content_length;
}
}
@@ -148,7 +150,12 @@
}
if(request_head.mod == REQ_REP) {
+// printf("server response===========\n");
+ memcpy(response_head.host, request_head.host, NI_MAXHOST);
+ response_head.port = request_head.port;
+ response_head.key = request_head.key;
if(shmModSocket.sendandrecv_unsafe(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size) != 0) {
+
response_head.code = 1;
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 )
@@ -160,8 +167,14 @@
response_buf_size = NET_MODE_RESPONSE_HEAD_LENGTH + recv_size;
if(max_response_buf < response_buf_size) {
- buf = (char *)realloc(response_buf, response_buf_size);
- max_response_buf = response_buf_size;
+ if( (response_buf = (char *)realloc(response_buf, response_buf_size)) == NULL ) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc response_buf");
+ exit(1);
+ } else {
+ max_response_buf = response_buf_size;
+ }
+
+
}
memcpy(response_buf, NetModSocket::encode_response_head(response_head), NET_MODE_RESPONSE_HEAD_LENGTH);
memcpy(response_buf + NET_MODE_RESPONSE_HEAD_LENGTH, recv_buf, recv_size);
@@ -176,11 +189,11 @@
} else if(request_head.mod == BUS) {
if(request_head.topic_length > max_topic_buf) {
- topic_buf = realloc(topic_buf, request_head.topic_length);
- max_topic_buf = request_head.topic_length;
- if(topic_buf == NULL) {
- LoggerFactory::getLogger()->error(errno, "process_client realloc");
+ if( (topic_buf = realloc(topic_buf, request_head.topic_length)) == NULL ) {
+ LoggerFactory::getLogger()->error(errno, "NetModServerSocket::process_client realloc topic_buf");
exit(1);
+ } else {
+ max_topic_buf = request_head.topic_length;
}
}
@@ -200,7 +213,7 @@
{
int i, connfd;
//rio_t *rio;
-
+ Logger * logger = LoggerFactory::getLogger();
for (i = 0; (i <= pool.maxi) && (pool.nready > 0); i++)
{
@@ -211,10 +224,13 @@
{
pool.nready--;
if(process_client(connfd) != 0) {
- LoggerFactory::getLogger()->debug("===server close client %d\n", connfd);
- Close(connfd); //line:conc:echoservers:closeconnfd
+
+
+ Close(connfd);
FD_CLR(connfd, &pool.read_set);
pool.clientfd[i] = -1;
+ logger->debug("===server close client %d\n", connfd);
+ // printf("===server close client %d\n", connfd);
}
}
--
Gitblit v1.8.0