From eceb5a7f71d4dc76d91fdcc6455947e2f6d600b3 Mon Sep 17 00:00:00 2001
From: Artem30801 <artem30801@gmail.com>
Date: Fri, 26 Jul 2019 12:36:33 +0300
Subject: [PATCH] Minor config changes (added ability to turn off broadcast)

---
 Server/server.py         | 18 ++++++++++++------
 Server/server_config.ini |  5 ++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Server/server.py b/Server/server.py
index 51f6e27..bf8ed6c 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -65,17 +65,22 @@ class Server:
     def load_config(self):
         self.config.read(self.config_path)
         self.port = int(self.config['SERVER']['port'])  # TODO try, init def
-        self.broadcast_port = int(self.config['SERVER']['broadcast_port'])
-        self.BROADCAST_DELAY = int(self.config['SERVER']['broadcast_delay'])
         Server.BUFFER_SIZE = int(self.config['SERVER']['buffer_size'])
 
+        self.use_broadcast = self.config.getboolean('BROADCAST', 'use_broadcast')
+        self.broadcast_port = int(self.config['BROADCAST']['broadcast_port'])
+        self.BROADCAST_DELAY = int(self.config['BROADCAST']['broadcast_delay'])
+
         self.USE_NTP = self.config.getboolean('NTP', 'use_ntp')
         self.NTP_HOST = self.config['NTP']['host']
         self.NTP_PORT = int(self.config['NTP']['port'])
 
-    def start(self):  # do_auto_connect=True, do_ip_broadcast=True, do_listen_broadcast=False
+    def start(self, do_ip_broadcast=None):  # do_auto_connect=True, , do_listen_broadcast=False
         self.time_started = time.time()
 
+        if do_ip_broadcast is None:
+            do_ip_broadcast = self.use_broadcast
+
         logging.info("Starting server with id: {} on {}:{} !".format(self.id, self.ip, self.port))
         logging.info("Starting server socket!")
         self.server_socket.bind((self.ip, self.port))
@@ -84,9 +89,10 @@ class Server:
         self.client_processor_thread_running.set()
         self.autoconnect_thread.start()
 
-        logging.info("Starting broadcast sender thread!")
-        self.broadcast_thread_running.set()
-        self.broadcast_thread.start()
+        if do_ip_broadcast:
+            logging.info("Starting broadcast sender thread!")
+            self.broadcast_thread_running.set()
+            self.broadcast_thread.start()
 
         logging.info("Starting broadcast listener thread!")
         self.listener_thread_running.set()
diff --git a/Server/server_config.ini b/Server/server_config.ini
index e3361fa..0614208 100644
--- a/Server/server_config.ini
+++ b/Server/server_config.ini
@@ -1,8 +1,11 @@
 [SERVER]
 port = 25000
+buffer_size = 1024
+
+[BROADCAST]
+use_broadcast = True
 broadcast_port = 8181
 broadcast_delay = 5
-buffer_size = 1024
 
 [NTP]
 use_ntp = False