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_bus.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 01a5ac6..70f09c4 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -10,15 +10,15 @@
}
void server(int port, bool restart) {
- // signal(SIGINT, sigint_handler);
+ 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