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

diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml
index 37b27e569ee822fca38442a7d6b7a093f6bf23cb..074b7976ac221c4b8aece74743b0097b669c890f 100644 (file)
--- a/grc/data/platforms/python/block_tree.xml
+++ b/grc/data/platforms/python/block_tree.xml
@@ -16,6 +16,7 @@
                <block>gr_glfsr_source_x</block>
                <block>gr_null_source</block>
                <block>gr_file_source</block>
+               <block>blks2_tcp_source</block>
                <block>gr_udp_source</block>
                <block>audio_source</block>
                <block>gr_wavfile_source</block>
@@ -27,6 +28,7 @@
                <block>gr_vector_sink_x</block>
                <block>gr_null_sink</block>
                <block>gr_file_sink</block>
+               <block>blks2_tcp_sink</block>
                <block>gr_udp_sink</block>
                <block>audio_sink</block>
                <block>gr_wavfile_sink</block>

diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index 179a5407aee3c846b6819ad331f47ef2e7de85cf..a5ae57a7327c6230dc7a31a1a8a75af2ef776887 100644 (file)
--- 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 (file)
index 0000000..cfe7b42
--- /dev/null
+++ b/grc/data/platforms/python/blocks/blks2_tcp_sink.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##TCP Sink: Custom blks2 block
+###################################################
+ -->
+<block>
+       <name>TCP Sink</name>
+       <key>blks2_tcp_sink</key>
+       <import>from grc_gnuradio import blks2 as grc_blks2</import>
+       <make>grc_blks2.tcp_sink(
+       itemsize=$type.size*$vlen,
+       addr=$addr,
+       port=$port,
+       server=$server,
+)</make>
+       <param>
+               <name>Input Type</name>
+               <key>type</key>
+               <type>enum</type>
+               <option>
+                       <name>Complex</name>
+                       <key>complex</key>
+                       <opt>size:gr.sizeof_gr_complex</opt>
+               </option>
+               <option>
+                       <name>Float</name>
+                       <key>float</key>
+                       <opt>size:gr.sizeof_float</opt>
+               </option>
+               <option>
+                       <name>Int</name>
+                       <key>int</key>
+                       <opt>size:gr.sizeof_int</opt>
+               </option>
+               <option>
+                       <name>Short</name>
+                       <key>short</key>
+                       <opt>size:gr.sizeof_short</opt>
+               </option>
+               <option>
+                       <name>Byte</name>
+                       <key>byte</key>
+                       <opt>size:gr.sizeof_char</opt>
+               </option>
+       </param>
+       <param>
+               <name>Address</name>
+               <key>addr</key>
+               <value>127.0.0.1</value>
+               <type>string</type>
+       </param>
+       <param>
+               <name>Port</name>
+               <key>port</key>
+               <value>0</value>
+               <type>int</type>
+       </param>
+       <param>
+               <name>Mode</name>
+               <key>server</key>
+               <value>False</value>
+               <type>enum</type>
+               <option>
+                       <name>Server</name>
+                       <key>True</key>
+               </option>
+               <option>
+                       <name>Client</name>
+                       <key>False</key>
+               </option>
+       </param>
+       <param>
+               <name>Vec Length</name>
+               <key>vlen</key>
+               <value>1</value>
+               <type>int</type>
+       </param>
+       <check>$vlen &gt; 0</check>
+       <sink>
+               <name>in</name>
+               <type>$type</type>
+               <vlen>$vlen</vlen>
+       </sink>
+               <doc>
+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.
+       </doc>
+</block>

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 (file)
index 0000000..6bf742a
--- /dev/null
+++ b/grc/data/platforms/python/blocks/blks2_tcp_source.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##TCP Source: Custom blks2 block
+###################################################
+ -->
+<block>
+       <name>TCP Source</name>
+       <key>blks2_tcp_source</key>
+       <import>from grc_gnuradio import blks2 as grc_blks2</import>
+       <make>grc_blks2.tcp_source(
+       itemsize=$type.size*$vlen,
+       addr=$addr,
+       port=$port,
+       server=$server,
+)</make>
+       <param>
+               <name>Output Type</name>
+               <key>type</key>
+               <type>enum</type>
+               <option>
+                       <name>Complex</name>
+                       <key>complex</key>
+                       <opt>size:gr.sizeof_gr_complex</opt>
+               </option>
+               <option>
+                       <name>Float</name>
+                       <key>float</key>
+                       <opt>size:gr.sizeof_float</opt>
+               </option>
+               <option>
+                       <name>Int</name>
+                       <key>int</key>
+                       <opt>size:gr.sizeof_int</opt>
+               </option>
+               <option>
+                       <name>Short</name>
+                       <key>short</key>
+                       <opt>size:gr.sizeof_short</opt>
+               </option>
+               <option>
+                       <name>Byte</name>
+                       <key>byte</key>
+                       <opt>size:gr.sizeof_char</opt>
+               </option>
+       </param>
+       <param>
+               <name>Address</name>
+               <key>addr</key>
+               <value>127.0.0.1</value>
+               <type>string</type>
+       </param>
+       <param>
+               <name>Port</name>
+               <key>port</key>
+               <value>0</value>
+               <type>int</type>
+       </param>
+       <param>
+               <name>Mode</name>
+               <key>server</key>
+               <value>True</value>
+               <type>enum</type>
+               <option>
+                       <name>Server</name>
+                       <key>True</key>
+               </option>
+               <option>
+                       <name>Client</name>
+                       <key>False</key>
+               </option>
+       </param>
+       <param>
+               <name>Vec Length</name>
+               <key>vlen</key>
+               <value>1</value>
+               <type>int</type>
+       </param>
+       <check>$vlen &gt; 0</check>
+       <source>
+               <name>out</name>
+               <type>$type</type>
+               <vlen>$vlen</vlen>
+       </source>
+       <doc>
+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.
+       </doc>
+</block>

diff --git a/grc/src/grc_gnuradio/blks2/Makefile.am b/grc/src/grc_gnuradio/blks2/Makefile.am
index 7db1d5c8c15804787c64249802f41a37454b90ef..89889605bae7849e753517e35fd5a9017a9d43a5 100644 (file)
--- 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 a28498a33496335a40bda6804b87e78b6a772a05..cb1196f255dc901765123db612af2d2a2d1f6009 100644 (file)
--- 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 (file)
index 0000000..c6739b7
--- /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))