From d4dd7b8a5e52212e472ae9a342fb46b47ec17b91 Mon Sep 17 00:00:00 2001 From: jblum Date: Wed, 20 May 2009 01:06:55 +0000 Subject: [PATCH] Added custom grc_blks2 tcp source and sink blocks + wrappers. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11063 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/data/platforms/python/block_tree.xml | 2 + grc/data/platforms/python/blocks/Makefile.am | 2 + .../python/blocks/blks2_tcp_sink.xml | 89 +++++++++++++++++++ .../python/blocks/blks2_tcp_source.xml | 89 +++++++++++++++++++ grc/src/grc_gnuradio/blks2/Makefile.am | 1 + grc/src/grc_gnuradio/blks2/__init__.py | 1 + grc/src/grc_gnuradio/blks2/tcp.py | 66 ++++++++++++++ 7 files changed, 250 insertions(+) create mode 100644 grc/data/platforms/python/blocks/blks2_tcp_sink.xml create mode 100644 grc/data/platforms/python/blocks/blks2_tcp_source.xml create mode 100644 grc/src/grc_gnuradio/blks2/tcp.py diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml index 37b27e56..074b7976 100644 --- a/grc/data/platforms/python/block_tree.xml +++ b/grc/data/platforms/python/block_tree.xml @@ -16,6 +16,7 @@ gr_glfsr_source_x gr_null_source gr_file_source + blks2_tcp_source gr_udp_source audio_source gr_wavfile_source @@ -27,6 +28,7 @@ gr_vector_sink_x gr_null_sink gr_file_sink + blks2_tcp_sink gr_udp_sink audio_sink gr_wavfile_sink diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am index 179a5407..a5ae57a7 100644 --- a/grc/data/platforms/python/blocks/Makefile.am +++ b/grc/data/platforms/python/blocks/Makefile.am @@ -52,6 +52,8 @@ dist_ourdata_DATA = \ blks2_standard_squelch.xml \ blks2_stream_to_vector_decimator.xml \ blks2_synthesis_filterbank.xml \ + blks2_tcp_sink.xml \ + blks2_tcp_source.xml \ blks2_valve.xml \ blks2_variable_sink_x.xml \ blks2_wfm_rcv.xml \ diff --git a/grc/data/platforms/python/blocks/blks2_tcp_sink.xml b/grc/data/platforms/python/blocks/blks2_tcp_sink.xml new file mode 100644 index 00000000..cfe7b42d --- /dev/null +++ b/grc/data/platforms/python/blocks/blks2_tcp_sink.xml @@ -0,0 +1,89 @@ + + + + TCP Sink + blks2_tcp_sink + from grc_gnuradio import blks2 as grc_blks2 + grc_blks2.tcp_sink( + itemsize=$type.size*$vlen, + addr=$addr, + port=$port, + server=$server, +) + + Input Type + type + enum + + + + + + + + Address + addr + 127.0.0.1 + string + + + Port + port + 0 + int + + + Mode + server + False + enum + + + + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + $type + $vlen + + +In client mode, we attempt to connect to a server at the given address and port. \ +In server mode, we bind a socket to the given address and port and accept the first client. + + diff --git a/grc/data/platforms/python/blocks/blks2_tcp_source.xml b/grc/data/platforms/python/blocks/blks2_tcp_source.xml new file mode 100644 index 00000000..6bf742aa --- /dev/null +++ b/grc/data/platforms/python/blocks/blks2_tcp_source.xml @@ -0,0 +1,89 @@ + + + + TCP Source + blks2_tcp_source + from grc_gnuradio import blks2 as grc_blks2 + grc_blks2.tcp_source( + itemsize=$type.size*$vlen, + addr=$addr, + port=$port, + server=$server, +) + + Output Type + type + enum + + + + + + + + Address + addr + 127.0.0.1 + string + + + Port + port + 0 + int + + + Mode + server + True + enum + + + + + Vec Length + vlen + 1 + int + + $vlen > 0 + + out + $type + $vlen + + +In client mode, we attempt to connect to a server at the given address and port. \ +In server mode, we bind a socket to the given address and port and accept the first client. + + diff --git a/grc/src/grc_gnuradio/blks2/Makefile.am b/grc/src/grc_gnuradio/blks2/Makefile.am index 7db1d5c8..89889605 100644 --- a/grc/src/grc_gnuradio/blks2/Makefile.am +++ b/grc/src/grc_gnuradio/blks2/Makefile.am @@ -29,4 +29,5 @@ ourpython_PYTHON = \ packet.py \ probe.py \ selector.py \ + tcp.py \ variable_sink.py diff --git a/grc/src/grc_gnuradio/blks2/__init__.py b/grc/src/grc_gnuradio/blks2/__init__.py index a28498a3..cb1196f2 100644 --- a/grc/src/grc_gnuradio/blks2/__init__.py +++ b/grc/src/grc_gnuradio/blks2/__init__.py @@ -25,3 +25,4 @@ from packet import options, packet_encoder, packet_decoder, \ from error_rate import error_rate from probe import probe_function, probe_avg_mag_sqrd_c, probe_avg_mag_sqrd_f, probe_density_b, probe_mpsk_snr_c from variable_sink import variable_sink_b, variable_sink_s, variable_sink_i, variable_sink_f, variable_sink_c +from tcp import tcp_source, tcp_sink diff --git a/grc/src/grc_gnuradio/blks2/tcp.py b/grc/src/grc_gnuradio/blks2/tcp.py new file mode 100644 index 00000000..c6739b71 --- /dev/null +++ b/grc/src/grc_gnuradio/blks2/tcp.py @@ -0,0 +1,66 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio 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, or (at your option) +# any later version. +# +# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +from gnuradio import gr +import socket +import os + +def _get_sock_fd(addr, port, server): + """ + Get the file descriptor for the socket. + As a client, block on connect, dup the socket descriptor. + As a server, block on accept, dup the client descriptor. + @param addr the ip address string + @param port the tcp port number + @param server true for server mode, false for client mode + @return the file descriptor number + """ + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + if server: + sock.bind((addr, port)) + sock.listen(1) + clientsock, address = sock.accept() + return os.dup(clientsock.fileno()) + else: + sock.connect((addr, port)) + return os.dup(sock.fileno()) + +class tcp_source(gr.hier_block2): + def __init__(self, itemsize, addr, port, server=True): + #init hier block + gr.hier_block2.__init__( + self, 'tcp_source', + gr.io_signature(0, 0, 0), + gr.io_signature(1, 1, itemsize), + ) + fd = _get_sock_fd(addr, port, server) + self.connect(gr.file_descriptor_source(itemsize, fd), self) + +class tcp_sink(gr.hier_block2): + def __init__(self, itemsize, addr, port, server=False): + #init hier block + gr.hier_block2.__init__( + self, 'tcp_sink', + gr.io_signature(1, 1, itemsize), + gr.io_signature(0, 0, 0), + ) + fd = _get_sock_fd(addr, port, server) + self.connect(self, gr.file_descriptor_sink(itemsize, fd)) -- 2.30.2