From 688c81e4174359cba8ddb1d09cf08517331874d5 Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Sat, 26 Aug 2017 13:32:51 +0200 Subject: Fixing collectorport and collector removed in the last commit from grgsm_livemon --- apps/grgsm_livemon | 52 +++++++++++++------ apps/grgsm_livemon.grc | 136 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 147 insertions(+), 41 deletions(-) (limited to 'apps') diff --git a/apps/grgsm_livemon b/apps/grgsm_livemon index 799dd30..e1c273d 100755 --- a/apps/grgsm_livemon +++ b/apps/grgsm_livemon @@ -25,7 +25,7 @@ # Title: Gr-gsm Livemon # Author: Piotr Krysik # Description: Interactive monitor of a single C0 channel with analysis performed by Wireshark (command to run wireshark: sudo wireshark -k -f udp -Y gsmtap -i lo) -# Generated: Sat Aug 26 12:54:55 2017 +# Generated: Sat Aug 26 13:26:35 2017 ################################################## if __name__ == '__main__': @@ -58,7 +58,7 @@ import time class grgsm_livemon(gr.top_block, Qt.QWidget): - def __init__(self, args="", fc=941.8e6, gain=30, osr=4, ppm=0, samp_rate=2000000.052982, shiftoff=400e3, serverport="4729"): + def __init__(self, args="", collector="localhost", collectorport="4729", fc=941.8e6, gain=30, osr=4, ppm=0, samp_rate=2000000.052982, serverport="4729", shiftoff=400e3): gr.top_block.__init__(self, "Gr-gsm Livemon") Qt.QWidget.__init__(self) self.setWindowTitle("Gr-gsm Livemon") @@ -85,13 +85,15 @@ class grgsm_livemon(gr.top_block, Qt.QWidget): # Parameters ################################################## self.args = args + self.collector = collector + self.collectorport = collectorport self.fc = fc self.gain = gain self.osr = osr self.ppm = ppm self.samp_rate = samp_rate - self.shiftoff = shiftoff self.serverport = serverport + self.shiftoff = shiftoff ################################################## # Variables @@ -185,8 +187,8 @@ class grgsm_livemon(gr.top_block, Qt.QWidget): self.gsm_bcch_ccch_sdcch4_demapper_0 = grgsm.gsm_bcch_ccch_sdcch4_demapper( timeslot_nr=0, ) + self.blocks_socket_pdu_0_1 = blocks.socket_pdu("UDP_CLIENT", collector, collectorport, 1500, False) self.blocks_socket_pdu_0_0 = blocks.socket_pdu("UDP_SERVER", "127.0.0.1", serverport, 10000, False) - self.blocks_socket_pdu_0 = blocks.socket_pdu("UDP_CLIENT", "127.0.0.1", "4729", 10000, False) self.blocks_rotator_cc_0 = blocks.rotator_cc(-2*pi*shiftoff/samp_rate) ################################################## @@ -195,8 +197,8 @@ class grgsm_livemon(gr.top_block, Qt.QWidget): self.msg_connect((self.blocks_socket_pdu_0_0, 'pdus'), (self.gsm_message_printer_1, 'msgs')) self.msg_connect((self.gsm_bcch_ccch_sdcch4_demapper_0, 'bursts'), (self.gsm_control_channels_decoder_0, 'bursts')) self.msg_connect((self.gsm_clock_offset_control_0, 'ctrl'), (self.gsm_input_0, 'ctrl_in')) - self.msg_connect((self.gsm_control_channels_decoder_0, 'msgs'), (self.blocks_socket_pdu_0, 'pdus')) - self.msg_connect((self.gsm_control_channels_decoder_0_0, 'msgs'), (self.blocks_socket_pdu_0, 'pdus')) + self.msg_connect((self.gsm_control_channels_decoder_0, 'msgs'), (self.blocks_socket_pdu_0_1, 'pdus')) + self.msg_connect((self.gsm_control_channels_decoder_0_0, 'msgs'), (self.blocks_socket_pdu_0_1, 'pdus')) self.msg_connect((self.gsm_decryption_0, 'bursts'), (self.gsm_control_channels_decoder_0_0, 'bursts')) self.msg_connect((self.gsm_receiver_0, 'C0'), (self.gsm_bcch_ccch_sdcch4_demapper_0, 'bursts')) self.msg_connect((self.gsm_receiver_0, 'measurements'), (self.gsm_clock_offset_control_0, 'measurements')) @@ -219,6 +221,18 @@ class grgsm_livemon(gr.top_block, Qt.QWidget): def set_args(self, args): self.args = args + def get_collector(self): + return self.collector + + def set_collector(self, collector): + self.collector = collector + + def get_collectorport(self): + return self.collectorport + + def set_collectorport(self, collectorport): + self.collectorport = collectorport + def get_fc(self): return self.fc @@ -258,6 +272,12 @@ class grgsm_livemon(gr.top_block, Qt.QWidget): self.qtgui_freq_sink_x_0.set_frequency_range(self.fc_slider, self.samp_rate) self.rtlsdr_source_0.set_sample_rate(self.samp_rate) + def get_serverport(self): + return self.serverport + + def set_serverport(self, serverport): + self.serverport = serverport + def get_shiftoff(self): return self.shiftoff @@ -267,12 +287,6 @@ class grgsm_livemon(gr.top_block, Qt.QWidget): self.rtlsdr_source_0.set_center_freq(self.fc_slider-self.shiftoff, 0) self.rtlsdr_source_0.set_bandwidth(250e3+abs(self.shiftoff), 0) - def get_serverport(self): - return self.serverport - - def set_serverport(self, serverport): - self.serverport = serverport - def get_ppm_slider(self): return self.ppm_slider @@ -301,6 +315,12 @@ def argument_parser(): parser.add_option( "", "--args", dest="args", type="string", default="", help="Set Device Arguments [default=%default]") + parser.add_option( + "", "--collector", dest="collector", type="string", default="localhost", + help="Set IP or DNS name of collector point [default=%default]") + parser.add_option( + "", "--collectorport", dest="collectorport", type="string", default="4729", + help="Set UDP port number of collector [default=%default]") parser.add_option( "-f", "--fc", dest="fc", type="eng_float", default=eng_notation.num_to_str(941.8e6), help="Set GSM channel's central frequency [default=%default]") @@ -316,12 +336,12 @@ def argument_parser(): parser.add_option( "-s", "--samp-rate", dest="samp_rate", type="eng_float", default=eng_notation.num_to_str(2000000.052982), help="Set samp_rate [default=%default]") - parser.add_option( - "-o", "--shiftoff", dest="shiftoff", type="eng_float", default=eng_notation.num_to_str(400e3), - help="Set Frequency Shiftoff [default=%default]") parser.add_option( "", "--serverport", dest="serverport", type="string", default="4729", help="Set UDP server listening port [default=%default]") + parser.add_option( + "-o", "--shiftoff", dest="shiftoff", type="eng_float", default=eng_notation.num_to_str(400e3), + help="Set Frequency Shiftoff [default=%default]") return parser @@ -335,7 +355,7 @@ def main(top_block_cls=grgsm_livemon, options=None): Qt.QApplication.setGraphicsSystem(style) qapp = Qt.QApplication(sys.argv) - tb = top_block_cls(args=options.args, fc=options.fc, gain=options.gain, osr=options.osr, ppm=options.ppm, samp_rate=options.samp_rate, shiftoff=options.shiftoff, serverport=options.serverport) + tb = top_block_cls(args=options.args, collector=options.collector, collectorport=options.collectorport, fc=options.fc, gain=options.gain, osr=options.osr, ppm=options.ppm, samp_rate=options.samp_rate, serverport=options.serverport, shiftoff=options.shiftoff) tb.start() tb.show() diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index 1b21377..3342fb6 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -376,7 +376,7 @@ _coordinate - (1512, 363) + (1632, 295) _rotation @@ -388,7 +388,7 @@ id - blocks_socket_pdu_0 + blocks_socket_pdu_0_0 mtu @@ -404,7 +404,7 @@ port - 4729 + serverport tcp_no_delay @@ -412,7 +412,7 @@ type - "UDP_CLIENT" + "UDP_SERVER" @@ -435,7 +435,7 @@ _coordinate - (976, 184) + (1504, 295) _rotation @@ -443,15 +443,15 @@ host - 127.0.0.1 + collector id - blocks_socket_pdu_0_0 + blocks_socket_pdu_0_1 mtu - 10000 + 1500 maxoutbuf @@ -463,7 +463,7 @@ port - serverport + collectorport tcp_no_delay @@ -471,7 +471,93 @@ type - "UDP_SERVER" + "UDP_CLIENT" + + + + parameter + + alias + + + + comment + + + + _enabled + True + + + _coordinate + (1240, 7) + + + _rotation + 0 + + + id + collector + + + label + IP or DNS name of collector point + + + short_id + + + + type + string + + + value + localhost + + + + parameter + + alias + + + + comment + + + + _enabled + True + + + _coordinate + (1240, 95) + + + _rotation + 0 + + + id + collectorport + + + label + UDP port number of collector + + + short_id + + + + type + string + + + value + 4729 @@ -854,7 +940,7 @@ _coordinate - (1120, 188) + (1776, 302) _rotation @@ -2849,7 +2935,7 @@ _coordinate - (784, 11) + (1400, 7) _rotation @@ -2857,23 +2943,23 @@ id - shiftoff + serverport label - Frequency Shiftoff + UDP server listening port short_id - o + type - eng_float + string value - 400e3 + 4729 @@ -2892,7 +2978,7 @@ _coordinate - (784, 112) + (784, 11) _rotation @@ -2900,23 +2986,23 @@ id - serverport + shiftoff label - UDP server listening port + Frequency Shiftoff short_id - + o type - string + eng_float value - 4729 + 400e3 @@ -2951,13 +3037,13 @@ gsm_control_channels_decoder_0 - blocks_socket_pdu_0 + blocks_socket_pdu_0_1 msgs pdus gsm_control_channels_decoder_0_0 - blocks_socket_pdu_0 + blocks_socket_pdu_0_1 msgs pdus -- cgit v1.2.3