From 26ed48c4e616014ee760fd13d13dbdc8539c34e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 19:21:55 +0800
Subject: [PATCH] 解决sendandrecv发送到一个不存在key的情况
---
test_net_socket/test_net_mod_socket.c | 191 ++++++++++++++++++++++++++++++++---------------
1 files changed, 131 insertions(+), 60 deletions(-)
diff --git a/test_net_socket/test_net_mod_socket.c b/test_net_socket/test_net_mod_socket.c
index ab16c93..f509e2c 100644
--- a/test_net_socket/test_net_mod_socket.c
+++ b/test_net_socket/test_net_mod_socket.c
@@ -1,5 +1,7 @@
#include "net_mod_server_socket_wrapper.h"
#include "net_mod_socket_wrapper.h"
+#include "bus_server_socket_wrapper.h"
+
#include "shm_mm_wraper.h"
#include "usg_common.h"
#include <getopt.h>
@@ -13,6 +15,7 @@
}Targ;
struct argument_t {
+ bool interactive;
char *fun;
int port;
int key;
@@ -31,15 +34,43 @@
void * client;
-void start_net_proxy(int port) {
+void *proxy_server_handler(void *sockt) {
+ pthread_detach(pthread_self());
+
+ char action[512];
+ while ( true) {
+ printf("Input action: Close?\n");
+ if(scanf("%s",action) < 1) {
+ printf("Invalide action\n");
+ continue;
+ }
+
+ if(strcmp(action, "close") == 0) {
+ net_mod_server_socket_close(sockt);
+ shm_mm_wrapper_destroy();
+ break;
+ } else {
+ printf("Invalide action\n");
+ }
+ }
+}
+
+void start_net_proxy(argument_t &arg) {
+ pthread_t tid;
printf("Start net proxy\n");
- void *serverSocket = net_mod_server_socket_open(port);
+ void *serverSocket = net_mod_server_socket_open(arg.port);
+
+ // 鍒涘缓涓�涓嚎绋�,鍙互鍏抽棴server
+ if(arg.interactive) {
+ pthread_create(&tid, NULL, proxy_server_handler, serverSocket);
+ }
+
if(net_mod_server_socket_start(serverSocket) != 0) {
err_exit(errno, "net_mod_server_socket_start");
}
}
-
+// 鎵撳嵃鎺ュ彈鍒扮殑璁㈤槄娑堟伅
void *print_sub_msg(void *sockt) {
pthread_detach(pthread_self());
void *recvbuf;
@@ -52,6 +83,64 @@
}
+
+void *bus_handler(void *sockt) {
+ pthread_detach(pthread_self());
+
+ char action[512];
+ while ( true) {
+ printf("Input action: Close?\n");
+ if(scanf("%s",action) < 1) {
+ printf("Invalide action\n");
+ continue;
+ }
+
+ if(strcmp(action, "close") == 0) {
+ bus_server_socket_wrapper_close(sockt);
+ break;
+ } else {
+ printf("Invalide action\n");
+ }
+ }
+
+}
+
+
+
+void start_bus_server(argument_t &arg) {
+ printf("Start bus server\n");
+ void * server_socket = bus_server_socket_wrapper_open();
+ pthread_t tid;
+ // 鍒涘缓涓�涓嚎绋�,鍙互鍏抽棴bus
+ if(arg.interactive)
+ pthread_create(&tid, NULL, bus_handler, server_socket);
+
+ if(bus_server_socket_wrapper_start_bus(server_socket) != 0) {
+ printf("start bus failed\n");
+ exit(1);
+ }
+}
+
+
+
+void start_reply(int key) {
+ printf("start reply\n");
+ void *client = net_mod_socket_open();
+ net_mod_socket_bind(client, key);
+ int size;
+ void *recvbuf;
+ char sendbuf[512];
+ int rv;
+ int remote_port;
+ while ( (rv = net_mod_socket_recvfrom(client, &recvbuf, &size, &remote_port) ) == 0) {
+ // printf( "server: RECEIVED REQUEST FROM PORT %d NAME %s\n", remote_port, recvbuf);
+ sprintf(sendbuf, "RECEIVED PORT %d NAME %s", remote_port, recvbuf);
+ net_mod_socket_sendto(client, sendbuf, strlen(sendbuf) + 1, remote_port);
+ free(recvbuf);
+ }
+}
+
+// 浜や簰寮忓鎴风
void start_net_client(char *sendlist, char*publist ){
client = net_mod_socket_open();
char content[MAXLINE];
@@ -63,17 +152,18 @@
net_mod_recv_msg_t *recv_arr;
pthread_t tid;
+ // 鍒涘缓涓�涓嚎绋嬫帴鍙楄闃呮秷鎭�
pthread_create(&tid, NULL, print_sub_msg, client);
//192.168.5.10:5000:11, 192.168.5.22:5000:11, 192.168.5.104:5000:11
net_node_t *node_arr;
int node_arr_size = parse_node_list(sendlist, &node_arr);
- // print_node_list(node_arr, node_arr_size);
+ print_node_list(node_arr, node_arr_size);
//192.168.5.10:5000:8, 192.168.5.22:5000:8, 192.168.5.104:5000:8
net_node_t *pub_node_arr;
int pub_node_arr_size = parse_node_list(publist, &pub_node_arr);
- // print_node_list(pub_node_arr, pub_node_arr_size);
+ print_node_list(pub_node_arr, pub_node_arr_size);
while (true) {
//printf("Usage: pub <topic> [content] or sub <topic>\n");
@@ -93,9 +183,8 @@
if (fgets(content, MAXLINE, stdin) != NULL) {
// 鏀跺埌娑堟伅鐨勮妭鐐瑰嵆浣挎病鏈夊搴旂殑淇℃伅锛� 涔熻鍥炲涓�涓〃绀烘棤鐨勬秷鎭�,鍚﹀垯浼氫竴鐩寸瓑寰�
- n = net_mod_socket_sendandrecv(client, node_arr, node_arr_size, content,
- strlen(content), &recv_arr, &recv_arr_size);
- printf("send %d nodes\n", n);
+ n = net_mod_socket_sendandrecv(client, node_arr, node_arr_size, content, strlen(content), &recv_arr, &recv_arr_size);
+ printf(" %d nodes reply\n", n);
for(i=0; i<recv_arr_size; i++) {
printf("host:%s, port: %d, key:%d, content: %s\n",
recv_arr[i].host,
@@ -110,10 +199,10 @@
}
}
else if(strcmp(action, "desub") == 0) {
- printf("Please input buskey and topic!\n");
+ printf("Please input topic!\n");
- scanf("%d %s", &buskey, topic);
- if (net_mod_socket_desub(client, topic, strlen(topic), buskey) == 0) {
+ scanf("%s", topic);
+ if (net_mod_socket_desub(client, topic, strlen(topic)) == 0) {
printf("%d Desub success!\n", net_mod_socket_get_key(client));
} else {
printf("Desub failture!\n");
@@ -122,11 +211,10 @@
}
else if(strcmp(action, "sub") == 0) {
- printf("Please input buskey and topic!\n");
- scanf("%d %s",&buskey, topic);
+ printf("Please input topic!\n");
+ scanf("%s",topic);
- printf("===%d %s\n",buskey, topic);
- if (net_mod_socket_sub(client, topic, strlen(topic), buskey) == 0) {
+ if (net_mod_socket_sub(client, topic, strlen(topic)) == 0) {
printf("%d Sub success!\n", net_mod_socket_get_key(client));
} else {
printf("Sub failture!\n");
@@ -146,39 +234,6 @@
}
-
-
-void start_bus_server(int key) {
- printf("Start bus server\n");
- void * server_socket = net_mod_socket_open();
-
- net_mod_socket_bind(server_socket, key);
-
- net_mod_socket_start_bus(server_socket);
-}
-
-
-
-void start_reply(int key) {
- printf("start reply\n");
- void *socket = net_mod_socket_open();
- net_mod_socket_bind(socket, key);
- int size;
- void *recvbuf;
- char sendbuf[512];
- int rv;
- int remote_port;
- while ( (rv = net_mod_socket_recvfrom(socket, &recvbuf, &size, &remote_port) ) == 0) {
- // printf( "server: RECEIVED REQUEST FROM PORT %d NAME %s\n", remote_port, recvbuf);
- sprintf(sendbuf, "RECEIVED PORT %d NAME %s", remote_port, recvbuf);
- net_mod_socket_sendto(socket, sendbuf, strlen(sendbuf) + 1, remote_port);
- free(recvbuf);
- }
-}
-
-
-
-
void *_run_sendandrecv_(void *arg) {
Targ *targ = (Targ *)arg;
@@ -346,21 +401,22 @@
// port = atoi(argv[2]);
+ if(opt.fun == NULL) {
+ usage(argv[0]);
+ exit(1);
+ }
if (strcmp("start_net_proxy", opt.fun) == 0 ) {
if(opt.port == 0) {
usage(argv[0]);
exit(1);
}
- start_net_proxy(opt.port);
+ start_net_proxy(opt);
}
else if (strcmp("start_bus_server", opt.fun) == 0) {
- if(opt.key == 0) {
- usage(argv[0]);
- exit(1);
- }
- start_bus_server(opt.key);
+
+ start_bus_server(opt);
}
else if (strcmp("start_reply", opt.fun) == 0) {
if(opt.key == 0) {
@@ -407,6 +463,9 @@
}
+ printf("==========end========\n");
+ shm_mm_wrapper_destroy();
+
}
@@ -444,6 +503,7 @@
argument_t mopt = {};
// mopt.volume_list_size = 0;
+ mopt.interactive = false;
opterr = 0;
@@ -455,6 +515,7 @@
{"fun", required_argument, 0, 'f'},
{"key", required_argument, 0, 'k'},
{"port", required_argument, 0, 'p'},
+ {"interactive", no_argument, 0, 'i'},
{"sendlist", required_argument, (int *)mopt.sendlist, 0},
{"publist", required_argument, (int *)mopt.publist, 0},
{0, 0, 0, 0}
@@ -465,7 +526,7 @@
{
- c = getopt_long (argc, argv, "+f:k:p:", long_options, &option_index);
+ c = getopt_long (argc, argv, "+f:k:p:i", long_options, &option_index);
/* Detect the end of the options. */
if (c == -1)
@@ -499,6 +560,10 @@
case 'k':
mopt.key = atoi(optarg);
+ break;
+
+ case 'i':
+ mopt.interactive = true;
break;
case 'p':
@@ -555,11 +620,17 @@
net_node_t *node_arr = (net_node_t *) calloc(entry_arr_len, sizeof(net_node_t));
for(i = 0; i < entry_arr_len; i++) {
property_arr_len = str_split(entry_arr[i], ":", &property_arr);
- // printf("%s, %s, %s\n", property_arr[0], property_arr[1], property_arr[2]);
- node_arr[i] = {trim(property_arr[0], 0), atoi(property_arr[1]), atoi(property_arr[2])};
- free(entry_arr[i]);
+ printf("=====%s, %s, %s\n", property_arr[0], property_arr[1], property_arr[2]);
+
+ node_arr[i] = {trim(property_arr[0], 0), atoi(property_arr[1]), 0};
+
free(property_arr[1]);
- free(property_arr[2]);
+ if(property_arr_len == 3) {
+ node_arr[i].key = atoi(property_arr[2]);
+ free(property_arr[2]);
+ }
+ free(entry_arr[i]);
+
}
*node_arr_addr = node_arr;
@@ -570,7 +641,7 @@
void print_node_list(net_node_t *node_arr, int len) {
printf("============node list begin==========\n");
for(int i = 0; i < len; i++) {
- printf("%s,%d,%d,\n", node_arr[i].host, node_arr[i].port, node_arr[i].key);
+ printf("host=%s, port=%d, key=%d \n", node_arr[i].host, node_arr[i].port, node_arr[i].key);
}
printf("============node list end==========\n");
}
--
Gitblit v1.8.0