From 8b89e81b09adbb06f6e5e64aa115a1eef6e75b57 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 30 十一月 2020 11:10:15 +0800
Subject: [PATCH] update
---
test_net_socket/test_net_mod_socket.c | 384 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 332 insertions(+), 52 deletions(-)
diff --git a/test_net_socket/test_net_mod_socket.c b/test_net_socket/test_net_mod_socket.c
index a65cd20..15c9e55 100644
--- a/test_net_socket/test_net_mod_socket.c
+++ b/test_net_socket/test_net_mod_socket.c
@@ -1,50 +1,77 @@
#include "net_mod_server_socket_wrapper.h"
#include "net_mod_socket_wrapper.h"
-#include "shm_mm.h"
-#include "dgram_mod_socket.h"
+#include "shm_mm_wraper.h"
#include "usg_common.h"
+#include <getopt.h>
typedef struct Targ {
- int port;
+ char *sendlist;
int id;
}Targ;
-void server(int port) {
+struct argument_t {
+ char *fun;
+ int port;
+ int key;
+ char *sendlist;
+ char *publist;
+ char **cmd_arr;
+ int cmd_arr_len;
+};
+
+argument_t parse_args (int argc, char *argv[]);
+void usage(char *name);
+int parse_node_list(char *str, net_node_t *node_arr_addr[]) ;
+void print_node_list(net_node_t *node_arr, int len);
+
+void start_net_proxy(int port) {
+ printf("Start net proxy\n");
void *serverSocket = net_mod_server_socket_open(port);
if(net_mod_server_socket_start(serverSocket) != 0) {
err_exit(errno, "net_mod_server_socket_start");
}
}
-void client(int port ){
+
+void *print_sub_msg(void *sockt) {
+ pthread_detach(pthread_self());
+ void *recvbuf;
+ int size;
+ int key;
+ while (net_mod_socket_recvfrom( sockt, &recvbuf, &size, &key) == 0) {
+ printf("鏀跺埌璁㈤槄娑堟伅:%s\n", recvbuf);
+ free(recvbuf);
+ }
+
+}
+
+void start_net_client(char *sendlist, char*publist ){
void * client = net_mod_socket_open();
char content[MAXLINE];
char action[512];
char topic[512];
+ int buskey;
int recv_arr_size, i, n;
-
-
net_mod_recv_msg_t *recv_arr;
- //192.168.20.104
- int node_arr_size = 2;
- net_node_t node_arr[] = {
- // {"192.168.5.22", port, 11},
- {"192.168.20.10", port, 11},
- {"192.168.20.104", port, 11}
- };
- int pub_node_arr_size = 3;
- net_node_t pub_node_arr[] = {
- {"192.168.5.22", port, 8},
- {"192.168.20.10", port, 8},
- {"192.168.20.104", port, 8}
- };
+ 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);
+
+ //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);
while (true) {
//printf("Usage: pub <topic> [content] or sub <topic>\n");
- printf("Can I help you? pub, send or quit\n");
+ printf("Can I help you? pub,sub,desub,send or quit\n");
scanf("%s",action);
if(strcmp(action, "pub") == 0) {
@@ -60,7 +87,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);
+ n = net_mod_socket_sendandrecv_timeout(client, node_arr, node_arr_size, content,
+ strlen(content), &recv_arr, &recv_arr_size, 5000);
printf("send %d nodes\n", n);
for(i=0; i<recv_arr_size; i++) {
printf("host:%s, port: %d, key:%d, content: %s\n",
@@ -75,6 +103,31 @@
net_mod_socket_free_recv_msg_arr(recv_arr, recv_arr_size);
}
}
+ else if(strcmp(action, "desub") == 0) {
+ printf("Please input buskey and topic!\n");
+
+ scanf("%d %s", &buskey, topic);
+ if (net_mod_socket_desub(client, topic, strlen(topic), buskey) == 0) {
+ printf("%d Desub success!\n", net_mod_socket_get_key(client));
+ } else {
+ printf("Desub failture!\n");
+ exit(0);
+ }
+
+ }
+ else if(strcmp(action, "sub") == 0) {
+ printf("Please input buskey and topic!\n");
+ scanf("%d %s",&buskey, topic);
+
+ printf("===%d %s\n",buskey, topic);
+ if (net_mod_socket_sub(client, topic, strlen(topic), buskey) == 0) {
+ printf("%d Sub success!\n", net_mod_socket_get_key(client));
+ } else {
+ printf("Sub failture!\n");
+ exit(0);
+ }
+
+ }
else if(strcmp(action, "quit") == 0) {
break;
} else {
@@ -93,19 +146,16 @@
void *runclient(void *arg) {
Targ *targ = (Targ *)arg;
- int port = targ->port;
char sendbuf[512];
int i,j, n, recv_arr_size;
net_mod_recv_msg_t *recv_arr;
- int node_arr_size = 2;
- //192.168.20.104
- net_node_t node_arr[] = {
- // {"192.168.5.22", port, 11},
- {"192.168.20.10", port, 11},
- {"192.168.20.104", port, 11}
- };
+
+
+ net_node_t *node_arr;
+ int node_arr_size = parse_node_list(targ->sendlist, &node_arr);
+
void * client = net_mod_socket_open();
@@ -138,9 +188,9 @@
return (void *)i;
}
-void mclient(int port) {
+void start_net_mclient(char *sendlist) {
- int status, i = 0, processors = 2;
+ int status, i = 0, processors = 4;
void *res[processors];
// Targ *targs = (Targ *)calloc(processors, sizeof(Targ));
Targ targs[processors];
@@ -152,7 +202,7 @@
printf("寮�濮嬫祴璇�...\n");
gettimeofday(&start, NULL);
for (i = 0; i < processors; i++) {
- targs[i].port = port;
+ targs[i].sendlist = sendlist;
targs[i].id = i;
pthread_create(&tids[i], NULL, runclient, (void *)&targs[i]);
}
@@ -175,28 +225,258 @@
// fflush(stdout);
}
-int main(int argc, char *argv[]) {
- shm_init(512);
+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);
+}
- int port;
- if (argc < 3) {
- fprintf(stderr, "Usage: %s %s|%s <PORT> \n", argv[0], "server", "client");
- return 1;
+
+
+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);
}
-
- port = atoi(argv[2]);
-
-
- if (strcmp("server", argv[1]) == 0 ) {
- server(port);
- }
-
- if (strcmp("client", argv[1]) == 0)
- client(port);
-
- if (strcmp("mclient", argv[1]) == 0)
- mclient(port);
}
+
+int main(int argc, char *argv[]) {
+ shm_mm_wrapper_init(512);
+
+ argument_t opt = parse_args(argc, argv);
+
+ // port = atoi(argv[2]);
+
+
+ if (strcmp("start_net_proxy", opt.fun) == 0 ) {
+ if(opt.port == 0) {
+ usage(argv[0]);
+ exit(1);
+ }
+ start_net_proxy(opt.port);
+
+ }
+ else if (strcmp("start_bus_server", opt.fun) == 0) {
+ if(opt.key == 0) {
+ usage(argv[0]);
+ exit(1);
+ }
+ start_bus_server(opt.key);
+ }
+ else if (strcmp("start_reply", opt.fun) == 0) {
+ if(opt.key == 0) {
+ usage(argv[0]);
+ exit(1);
+ }
+ start_reply(opt.key);
+ }
+ else if (strcmp("start_net_client", opt.fun) == 0) {
+ if(opt.sendlist == 0) {
+ fprintf(stderr, "Missing sendlist .\n");
+ usage(argv[0]);
+ exit(1);
+ }
+ if(opt.publist == 0) {
+ fprintf(stderr, "Missing publist.\n");
+ usage(argv[0]);
+ exit(1);
+ }
+ start_net_client(opt.sendlist, opt.publist);
+ }
+ else if (strcmp("start_net_mclient", opt.fun) == 0) {
+ if(opt.sendlist == 0) {
+ fprintf(stderr, "Missing sendlist .\n");
+ usage(argv[0]);
+ exit(1);
+ }
+
+ start_net_mclient(opt.sendlist);
+ }
+ else {
+ usage(argv[0]);
+ exit(1);
+
+ }
+
+}
+
+
+
+void usage(char *name)
+{
+ fprintf(stderr, "Usage: %s [OPTIONS] [ARG...]\n\n", name);
+ fprintf(stderr, "Test net mod socket\n\n");
+ fprintf(stderr, "Options:\n\n");
+ #define fpe(str) fprintf(stderr, " %s", str);
+ fpe("-f, --funciton Function name\n");
+ fpe("-p, --port TCP/IP Port\n");
+ fpe("-k, --key SHM Key\n");
+ fpe("\n");
+}
+
+
+
+argument_t parse_args (int argc, char *argv[])
+{
+ int c;
+
+ if(argc < 2) {
+ usage(argv[0]);
+ exit(1);
+ }
+
+ if(argc == 2 && strcmp(argv[1], "--help") == 0) {
+ usage(argv[0]);
+ exit(0);
+ }
+
+
+ argument_t mopt = {};
+
+ // mopt.volume_list_size = 0;
+
+ opterr = 0;
+
+
+ static struct option long_options[] =
+ {
+ /* These options set a flag. */
+
+ {"fun", required_argument, 0, 'f'},
+ {"key", required_argument, 0, 'k'},
+ {"port", required_argument, 0, 'p'},
+ {"sendlist", required_argument, (int *)mopt.sendlist, 0},
+ {"publist", required_argument, (int *)mopt.publist, 0},
+ {0, 0, 0, 0}
+ };
+ /* getopt_long stores the option index here. */
+ int option_index = 0;
+ while (1)
+ {
+
+
+ c = getopt_long (argc, argv, "+f:k:p:", long_options, &option_index);
+
+ /* Detect the end of the options. */
+ if (c == -1)
+ break;
+
+ switch (c)
+ {
+ case 0:
+ /* If this option set a flag, do nothing else now. */
+ if (long_options[option_index].flag != 0)
+ break;
+
+ if(strcmp(long_options[option_index].name, "sendlist") == 0) {
+ mopt.sendlist = optarg;
+ }
+ else if(strcmp(long_options[option_index].name, "publist") == 0) {
+ mopt.publist = optarg;
+ }
+ else {
+ printf ("option %s", long_options[option_index].name);
+ if (optarg)
+ printf (" with arg %s", optarg);
+ printf ("\n");
+ }
+
+ break;
+
+ case 'f':
+ mopt.fun = optarg;
+ break;
+
+ case 'k':
+ mopt.key = atoi(optarg);
+ break;
+
+ case 'p':
+ // printf ("==name with value `%s'\n", optarg);
+ mopt.port = atoi(optarg);
+ break;
+
+ case '?':
+ printf ("==? optopt=%c, %s, `%s', %d\n", optopt, optarg, argv[optind], optind);
+ /* getopt_long already printed an error message. */
+ usage(argv[0]);
+ exit(1);
+ break;
+
+ default:
+ //printf ("==default optopt=%c, %s, `%s'\n",optopt, optarg, argv[optind]);
+ break;
+ }
+ }
+
+ // printf ("optind = %d, argc=%d \n", optind, argc);
+ /* Print any remaining command line arguments (not options). */
+ if (optind < argc)
+ {
+ mopt.cmd_arr = &argv[optind];
+ mopt.cmd_arr_len = argc - optind;
+ // printf ("non-option ARGV-elements: ");
+ // while (optind < argc)
+ // printf ("%d, %d, %s \n", optind, argc, argv[optind++]);
+ // putchar ('\n');
+ }
+ return mopt;
+
+}
+
+
+/**
+ * @str "192.168.5.10:5000:11, 192.168.5.22:5000:11, 192.168.5.104:5000:11"
+ * @node_arr_addr 杩斿洖澶勭悊鍚庣殑缃戠粶鑺傜偣鏁扮粍
+ * {
+ * {"192.168.5.22", 5000, 11},
+ * {"192.168.20.10", 5000, 11},
+ * {"192.168.20.104", 5000, 11}
+ * }
+ * @return 鏁扮粍鐨勯暱搴�
+ */
+int parse_node_list(char *str, net_node_t *node_arr_addr[]) {
+ int i, j;
+ char **property_arr;
+ int property_arr_len;
+ char **entry_arr;
+ int entry_arr_len = str_split(str, ",", &entry_arr);
+
+ 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]);
+ free(property_arr[1]);
+ free(property_arr[2]);
+ }
+ *node_arr_addr = node_arr;
+
+
+ return entry_arr_len;
+}
+
+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("============node list end==========\n");
+}
--
Gitblit v1.8.0