From 145d78dcbfccfee5469692b7cde3658cdeb1f4f2 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Fri, 25 Aug 2017 08:19:58 +0000
Subject: Make UDP server port configurable using --serverport parameter.

This make it possible to run several grgsm_livemon processes on the same machine,
by giving them unique ports to listen on.
---
 apps/grgsm_livemon.grc | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'apps')

diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc
index 40bee70..260e29b 100644
--- a/apps/grgsm_livemon.grc
+++ b/apps/grgsm_livemon.grc
@@ -463,7 +463,7 @@
     </param>
     <param>
       <key>port</key>
-      <value>4729</value>
+      <value>serverport</value>
     </param>
     <param>
       <key>tcp_no_delay</key>
@@ -2876,6 +2876,49 @@
       <value>400e3</value>
     </param>
   </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(784, 112)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>serverport</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UDP server listening port</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>4729</value>
+    </param>
+  </block>
   <connection>
     <source_block_id>blocks_rotator_cc_0</source_block_id>
     <sink_block_id>gsm_input_0</sink_block_id>
-- 
cgit v1.2.3


From d7ab8c06051977cb10078b771bf4b59ded1cd729 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Fri, 25 Aug 2017 10:23:27 +0200
Subject: Connect Message Printer block to UDP server block.

Instead of printing messages in parallel to the UDP package sending,
move the printing to after the UDP server block.  This make it both
possible to disable message printing by changing the server port to a
different value from the client port, and to print messages collected
by several clients by pointing all clients to the same server.
---
 apps/grgsm_livemon.grc | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'apps')

diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc
index 260e29b..1b21377 100644
--- a/apps/grgsm_livemon.grc
+++ b/apps/grgsm_livemon.grc
@@ -435,7 +435,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1512, 459)</value>
+      <value>(976, 184)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -854,7 +854,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1512, 270)</value>
+      <value>(1120, 188)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2931,6 +2931,12 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>blocks_socket_pdu_0_0</source_block_id>
+    <sink_block_id>gsm_message_printer_1</sink_block_id>
+    <source_key>pdus</source_key>
+    <sink_key>msgs</sink_key>
+  </connection>
   <connection>
     <source_block_id>gsm_bcch_ccch_sdcch4_demapper_0</source_block_id>
     <sink_block_id>gsm_control_channels_decoder_0</sink_block_id>
@@ -2949,24 +2955,12 @@
     <source_key>msgs</source_key>
     <sink_key>pdus</sink_key>
   </connection>
-  <connection>
-    <source_block_id>gsm_control_channels_decoder_0</source_block_id>
-    <sink_block_id>gsm_message_printer_1</sink_block_id>
-    <source_key>msgs</source_key>
-    <sink_key>msgs</sink_key>
-  </connection>
   <connection>
     <source_block_id>gsm_control_channels_decoder_0_0</source_block_id>
     <sink_block_id>blocks_socket_pdu_0</sink_block_id>
     <source_key>msgs</source_key>
     <sink_key>pdus</sink_key>
   </connection>
-  <connection>
-    <source_block_id>gsm_control_channels_decoder_0_0</source_block_id>
-    <sink_block_id>gsm_message_printer_1</sink_block_id>
-    <source_key>msgs</source_key>
-    <sink_key>msgs</sink_key>
-  </connection>
   <connection>
     <source_block_id>gsm_decryption_0</source_block_id>
     <sink_block_id>gsm_control_channels_decoder_0_0</sink_block_id>
-- 
cgit v1.2.3