Merge branch 'udp-server-print' of https://github.com/petterreinholdtsen/gr-gsm into petterreinholdtsen-udp-server-print

# Conflicts:
#	apps/grgsm_livemon.grc

1 files changed, 15 insertions, 64 deletions

diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc
index 98613f8..1b21377 100644
--- a/apps/grgsm_livemon.grc
+++ b/apps/grgsm_livemon.grc
@@ -384,7 +384,7 @@
     </param>
     <param>
       <key>host</key>
-      <value>collector</value>
+      <value>127.0.0.1</value>
     </param>
     <param>
       <key>id</key>
@@ -392,7 +392,7 @@
     </param>
     <param>
       <key>mtu</key>
-      <value>1500</value>
+      <value>10000</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -404,7 +404,7 @@
     </param>
     <param>
       <key>port</key>
-      <value>collectorport</value>
+      <value>4729</value>
     </param>
     <param>
       <key>tcp_no_delay</key>
@@ -435,7 +435,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1512, 459)</value>
+      <value>(976, 184)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -463,7 +463,7 @@
     </param>
     <param>
       <key>port</key>
-      <value>4729</value>
+      <value>serverport</value>
     </param>
     <param>
       <key>tcp_no_delay</key>
@@ -854,7 +854,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1512, 270)</value>
+      <value>(1120, 188)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2892,7 +2892,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1248, 8)</value>
+      <value>(784, 112)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2900,54 +2900,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>collector</value>
+      <value>serverport</value>
     </param>
     <param>
       <key>label</key>
-      <value>IP or DNS name of collector point</value>
-    </param>
-    <param>
-      <key>short_id</key>
-      <value></value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>string</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>localhost</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>(1248, 96)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>collectorport</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>UDP port number of collector</value>
+      <value>UDP server listening port</value>
     </param>
     <param>
       <key>short_id</key>
@@ -2975,6 +2932,12 @@
     <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>
     <source_key>bursts</source_key>
@@ -2993,24 +2956,12 @@
     <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>
     <source_key>bursts</source_key>