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 | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/test_socket/dgram_mod_survey.c b/test_socket/dgram_mod_survey.c
index f19b6a1..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;
@@ -18,16 +18,14 @@
}
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) {
sprintf(sendbuf, "%d", i);
printf("SEND HEART:%s\n", sendbuf);
dgram_mod_sendto(socket, sendbuf, strlen(sendbuf) + 1, port);
- free(recvbuf);
sleep(1);
i++;
}
--
Gitblit v1.8.0