From baa6fb17d950c4f5684f5d798f90595456723418 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 16:16:46 +0800
Subject: [PATCH] conflict
---
demo/dgram_mod_req_rep.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/demo/dgram_mod_req_rep.c b/demo/dgram_mod_req_rep.c
index 01ba750..4a70a4e 100644
--- a/demo/dgram_mod_req_rep.c
+++ b/demo/dgram_mod_req_rep.c
@@ -6,7 +6,7 @@
#include "usg_common.h"
void server(int port) {
- void *socket = dgram_mod_open_socket(REQ_REP);
+ void *socket = dgram_mod_open_socket();
dgram_mod_bind(socket, port);
int size;
void *recvbuf;
@@ -14,8 +14,8 @@
int rv;
int remote_port;
while ( (rv = dgram_mod_recvfrom(socket, &recvbuf, &size, &remote_port) ) == 0) {
- printf( "REGIST CENTER RECEIVED REQUEST FROM PORT %d NAME %s\n", remote_port, recvbuf);
- sprintf(sendbuf, "RECEIVED FROM PORT %d NAME %s", remote_port, recvbuf);
+ printf( "server: RECEIVED REQUEST FROM PORT %d NAME %s\n", remote_port, recvbuf);
+ sprintf(sendbuf, "RECEIVED PORT %d NAME %s", remote_port, recvbuf);
dgram_mod_sendto(socket, sendbuf, strlen(sendbuf) + 1, remote_port);
free(recvbuf);
}
@@ -23,12 +23,15 @@
}
void client(int port, char *sendbuf) {
- void *socket = dgram_mod_open_socket(REQ_REP);
+ void *socket = dgram_mod_open_socket();
int size;
void *recvbuf;
- dgram_mod_sendandrecv(socket, sendbuf, strlen(sendbuf) + 1, port, &recvbuf, &size);
- printf("reply: %s\n", (char *)recvbuf);
- free(recvbuf);
+ printf("client :send request%s\n", sendbuf);
+ if(dgram_mod_sendandrecv(socket, sendbuf, strlen(sendbuf) + 1, port, &recvbuf, &size) == 0) {
+ printf("client :received reply => %s\n", (char *)recvbuf);
+ free(recvbuf);
+ }
+
dgram_mod_close_socket(socket);
}
--
Gitblit v1.8.0