From 34ddc11240baa01d15b24f09e39d09cb4dd15c75 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 13 十月 2020 10:41:20 +0800
Subject: [PATCH] update
---
src/socket/net_mod_server_socket.c | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/socket/net_mod_server_socket.c b/src/socket/net_mod_server_socket.c
index 4e574d8..1cd3838 100644
--- a/src/socket/net_mod_server_socket.c
+++ b/src/socket/net_mod_server_socket.c
@@ -4,7 +4,7 @@
#include "net_mod_socket_io.h"
#include "net_mod_socket.h"
-NetModServerSocket::NetModServerSocket(int port)
+NetModServerSocket::NetModServerSocket(int port):max_buf(1024)
{
char portstr[32];
@@ -12,11 +12,17 @@
sprintf(portstr, "%d", port);
listenfd = Open_listenfd(portstr);
init_pool(listenfd);
+
+ buf = malloc(max_buf);
+ if(buf == NULL) {
+ err_exit(errno, "process_client malloc");
+ }
}
NetModServerSocket::~NetModServerSocket() {
Close(listenfd);
+ fee(buf);
}
void NetModServerSocket::start() {
@@ -88,20 +94,25 @@
int n;
net_mod_request_head_t request_head;
net_mod_response_head_t response_head;
- void *buf, *recv_buf;
+ char request_head_bs[NET_MODE_REQUEST_HEAD_LENGTH];
+ void *recv_buf;
+
int recv_size;
- size_t max_buf = 8096;
-
- buf = malloc(max_buf);
if(buf == NULL) {
- err_exit(errno, "process_client malloc");
+ buf = malloc(max_buf);
+ if(buf == NULL) {
+ err_exit(errno, "process_client malloc");
+ }
}
- if ((n = rio_readnb(rio, &request_head, sizeof(net_mod_request_head_t))) != sizeof(net_mod_request_head_t))
+
+
+ if (rio_readnb(rio, request_head_bs, NET_MODE_REQUEST_HEAD_LENGTH) != NET_MODE_REQUEST_HEAD_LENGTH)
{
- free(buf);
return -1;
}
+
+ request_head = NetModSocket::decode_request_head(request_head_bs);
if(request_head.content_length > max_buf) {
buf = realloc(buf, request_head.content_length);
@@ -112,15 +123,16 @@
}
if ((n = rio_readnb(rio, buf, request_head.content_length)) != request_head.content_length ) {
- free(buf);
return -1;
}
- shmModSocket.sendandrecv(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size);
- response_head.content_length = recv_size;
- Rio_writen(connfd, &response_head, sizeof(response_head));
- Rio_writen(connfd, recv_buf, recv_size);
- free(buf);
+ if(request_head.mod == REQ_REP) {
+ shmModSocket.sendandrecv(buf, request_head.content_length, request_head.key, &recv_buf, &recv_size);
+ response_head.content_length = recv_size;
+ Rio_writen(connfd, NetModSocket::encode_response_head(response_head), NET_MODE_RESPONSE_HEAD_LENGTH);
+ Rio_writen(connfd, recv_buf, recv_size);
+ }
+
return 0;
}
--
Gitblit v1.8.0