From a1439e59c2ff561b0d83a796769b1f4a71d1c01c Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Mon, 15 Jun 2020 11:31:02 +0200
Subject: [PATCH] update Mo 15. Jun 11:31:02 CEST 2020

---
 server/api.js     |  2 +-
 server/app_cfg.js | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/server/api.js b/server/api.js
index fc8ce87..ceb43eb 100755
--- a/server/api.js
+++ b/server/api.js
@@ -21,7 +21,7 @@ module.exports = function (io, sql, app_cfg, waip) {
 
       // Remote-Verbindung nur zulassen, wenn IP in Access-List, und Access-List ueberhaupt befuellt
       if (!app_cfg.api.access_list.includes(remote_ip) && app_cfg.api.access_list.length > 0) {
-        socket.terminate();
+        socket.disconnect(true);
         sql.db_log('API', 'Verbindung von ' + remote_ip + ' geschlossen, da nicht in Zugangsliste.');
       };
 
diff --git a/server/app_cfg.js b/server/app_cfg.js
index 182c2a6..fea9942 100644
--- a/server/app_cfg.js
+++ b/server/app_cfg.js
@@ -17,7 +17,7 @@ app_cfg.global = {
   defaultuserip: '127.0.0.1',
   ip_auth_range: ['::ffff:172.16.5.0/24', '::ffff:192.168.2.0/24'],
   saltRounds: 10,
-  sessionsecret: '0987654321abcdef#xyz' 
+  sessionsecret: '0987654321abcdef#xyz'
 };
 
 // Einstellungen zur Erscheinung der Seite
@@ -38,14 +38,14 @@ app_cfg.public = {
 app_cfg.rmld = {
   backup_to_mail: true,
   backup_to_file: true,
-  backup_path: '/misc/bkp/' 
+  backup_path: '/misc/bkp/'
 };
 
 // Schnittstelle um Daten von anderen Clients zu empfangen
 app_cfg.api = {
   enabled: true,
   secret: 'asdfwert1234567890#',
-  access_list: ['192.168.2.20', '192.168.2.30']
+  access_list: ['192.168.2.20', '192.168.2.30', '80.147.87.170']
 };
 
 // Schnittstelle um Daten an andere Server zu senden
@@ -59,7 +59,17 @@ app_cfg.endpoint = {
 app_cfg.filter = {
   enabled: true,
   on_message_from: ['192.168.2.20', 'https://192.168.1.25:8090/api'],
-  remove_data: ['besonderheiten', 'strasse', 'objekt', 'objektnr', 'wachfolge', 'wgs84_x', 'wgs84_y']
-};  
+  remove_data: ['besonderheiten', 'strasse', 'objekt', 'objektnr', 'wachfolge', 'wgs84_x', 'wgs84_y'],
+  block_data: [{
+    for_wache: '520101',
+    block: ['Rettungseinsatz', 'Krankentransport']
+  }, {
+    for_wache: '520102',
+    block: ['Rettungseinsatz', 'Krankentransport']
+  }, {
+    for_wache: '520103',
+    block: ['Rettungseinsatz', 'Krankentransport']
+  }]
+};
 
 module.exports = app_cfg;
\ No newline at end of file