From c46be6db32872bfd7c4010b43526b5e6bc0fa6a5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 14:04:59 +0800
Subject: [PATCH] update
---
test_net_socket/heart_beat.cpp | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/test_net_socket/heart_beat.cpp b/test_net_socket/heart_beat.cpp
index 939afc6..cd21a84 100644
--- a/test_net_socket/heart_beat.cpp
+++ b/test_net_socket/heart_beat.cpp
@@ -2,7 +2,7 @@
#include "net_mod_socket_wrapper.h"
#include "bus_server_socket_wrapper.h"
-#include "shm_mm_wraper.h"
+#include "shm_mm_wrapper.h"
#include "usg_common.h"
#include <getopt.h>
@@ -15,9 +15,9 @@
void sigint_handler(int sig) {
// net_mod_socket_close(server_socket);
- printf("===Catch sigint======================\n");
- shm_mm_wrapper_destroy();
- exit(0);
+ // printf("===Catch sigint======================\n");
+ // shm_mm_wrapper_destroy();
+ // exit(0);
}
void server(int port) {
@@ -28,10 +28,13 @@
char sendbuf[512];
int rv;
int remote_port;
- while (net_mod_socket_recvfrom(serv, &recvbuf, &size, &remote_port) == 0) {
- printf( "RECEIVED HREARTBEAT FROM %d: %s\n", remote_port, recvbuf);
- net_mod_socket_sendto(serv, "suc", strlen("suc")+1, remote_port);
- free(recvbuf);
+ while (true) {
+ if(net_mod_socket_recvfrom_timeout(serv, &recvbuf, &size, &remote_port, 0, 2000000000)==0) {
+ printf( "RECEIVED HREARTBEAT FROM %d: %s\n", remote_port, recvbuf);
+ net_mod_socket_sendto(serv, "suc", strlen("suc")+1, remote_port);
+ free(recvbuf);
+ }
+
}
// sleep(1000);
net_mod_socket_close(serv);
@@ -62,7 +65,7 @@
void *runclient(void *arg) {
- signal(SIGINT, sigint_handler);
+ // signal(SIGINT, sigint_handler);
Targ *targ = (Targ *)arg;
int port = targ->port;
void *client = net_mod_socket_open();
--
Gitblit v1.8.0