From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:12:17 +0800
Subject: [PATCH] fix conflict
---
test_socket/dgram_mod_bus.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 01a5ac6..63ea0cd 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -12,13 +12,13 @@
void server(int port, bool restart) {
// signal(SIGINT, sigint_handler);
server_socket = dgram_mod_open_socket();
- dgram_mod_force_bind(server_socket, port);
-
- // if(restart) {
-
- // } else {
- // // dgram_mod_bind(server_socket, port);
- // }
+
+
+ if(restart) {
+ dgram_mod_force_bind(server_socket, port);
+ } else {
+ dgram_mod_bind(server_socket, port);
+ }
dgram_mod_start_bus(server_socket);
--
Gitblit v1.8.0