From 695953440565103964e816e7326c66f3d171c3e0 Mon Sep 17 00:00:00 2001
From: jimi-wzq <wangzhengquan85@gmail.com>
Date: 星期六, 01 八月 2020 10:48:18 +0800
Subject: [PATCH] fix conflict
---
test_socket/dgram_mod_survey.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test_socket/dgram_mod_survey.c b/test_socket/dgram_mod_survey.c
index 988877b..24a72a5 100644
--- a/test_socket/dgram_mod_survey.c
+++ b/test_socket/dgram_mod_survey.c
@@ -3,7 +3,7 @@
#include "usg_common.h"
void server(int port) {
- void *socket = dgram_mod_open_socket(SURVEY);
+ void *socket = dgram_mod_open_socket();
dgram_mod_bind(socket, port);
int size;
void *recvbuf;
@@ -11,23 +11,23 @@
int rv;
int remote_port;
while ( (rv = dgram_mod_recvfrom(socket, &recvbuf, &size, &remote_port) ) == 0) {
- printf( "鏀跺埌鏉ヨ嚜%d娉ㄥ唽淇℃伅: %s", remote_port, recvbuf);
+ printf( "RECEIVED HREARTBEAT FROM %d: %s\n", remote_port, recvbuf);
free(recvbuf);
}
dgram_mod_close_socket(socket);
}
void client(int port) {
- void *socket = dgram_mod_open_socket(SURVEY);
+ void *socket = dgram_mod_open_socket();
int size;
- void *recvbuf;
char sendbuf[512];
+ long i = 0;
while (true) {
- printf("request: ");
- scanf("%s", sendbuf);
- dgram_mod_send(socket, sendbuf, strlen(sendbuf) + 1, port, &recvbuf, &size);
- printf("reply: %s\n", (char *)recvbuf);
- free(recvbuf);
+ sprintf(sendbuf, "%d", i);
+ printf("SEND HEART:%s\n", sendbuf);
+ dgram_mod_sendto(socket, sendbuf, strlen(sendbuf) + 1, port);
+ sleep(1);
+ i++;
}
dgram_mod_close_socket(socket);
}
--
Gitblit v1.8.0