From 934d3495326f3eeaea24940ee06ec6ac334f38f5 Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Mon, 1 May 2017 15:43:21 -0500
Subject: [PATCH] cleanup

---
 confbridge.py           | 11 +----------
 dmrlink.py              | 13 ++-----------
 ipsc/reporting_const.py | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 ipsc/reporting_const.py

diff --git a/confbridge.py b/confbridge.py
index b9fe5a9..ecb22c6 100755
--- a/confbridge.py
+++ b/confbridge.py
@@ -550,16 +550,7 @@ if __name__ == '__main__':
     # INITIALIZE THE NETWORK-BASED REPORTING SERVER
     if CONFIG['REPORTS']['REPORT_NETWORKS'] == 'NETWORK': 
         logger.info('(confbridge.py) TCP reporting server starting')
-        REP_OPC = {
-            'CONFIG_REQ': '\x00',
-            'CONFIG_SND': '\x01',
-            'BRIDGE_REQ': '\x02',
-            'BRIDGE_SND': '\x03',
-            'CONFIG_UPD': '\x04',
-            'BRIDGE_UPD': '\x05',
-            'LINK_EVENT': '\x06',
-            'BRDG_EVENT': '\x07'
-            }
+        from ipsc.reporting_const import REPORT_OPCODES as REP_OPC
         
         report_server = reportFactory()
         report_server.clients = []
diff --git a/dmrlink.py b/dmrlink.py
index b303645..0b324df 100755
--- a/dmrlink.py
+++ b/dmrlink.py
@@ -1041,18 +1041,9 @@ if __name__ == '__main__':
         reporting.start(CONFIG['REPORTS']['REPORT_INTERVAL'])
         
     # INITIALIZE THE NETWORK-BASED REPORTING SERVER
-    if CONFIG['REPORTS']['REPORT_NETWORKS'] == 'NETWORK': 
+    elif CONFIG['REPORTS']['REPORT_NETWORKS'] == 'NETWORK': 
         logger.info('(confbridge.py) TCP reporting server starting')
-        REP_OPC = {
-            'CONFIG_REQ': '\x00',
-            'CONFIG_SND': '\x01',
-            'BRIDGE_REQ': '\x02',
-            'BRIDGE_SND': '\x03',
-            'CONFIG_UPD': '\x04',
-            'BRIDGE_UPD': '\x05',
-            'LINK_EVENT': '\x06',
-            'BRDG_EVENT': '\x07'
-            }
+        from ipsc.reporting_const import REPORT_OPCODES as REP_OPC
         
         report_server = reportFactory()
         report_server.clients = []
diff --git a/ipsc/reporting_const.py b/ipsc/reporting_const.py
new file mode 100644
index 0000000..f5a7c24
--- /dev/null
+++ b/ipsc/reporting_const.py
@@ -0,0 +1,30 @@
+###############################################################################
+#   Copyright (C) 201t  Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+# Opcodes for the network-based reporting protocol
+
+REPORT_OPCODES = {
+    'CONFIG_REQ': '\x00',
+    'CONFIG_SND': '\x01',
+    'BRIDGE_REQ': '\x02',
+    'BRIDGE_SND': '\x03',
+    'CONFIG_UPD': '\x04',
+    'BRIDGE_UPD': '\x05',
+    'LINK_EVENT': '\x06',
+    'BRDG_EVENT': '\x07'
+    }
\ No newline at end of file