diff options
| author | Johnathan Corgan | 2010-05-23 13:36:44 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-23 13:36:44 -0700 |
| commit | 6c0f2f5a5e4eddefc52c272c4b92065a225be3c5 (patch) | |
| tree | 5fc909d73455c015ba60c08cfd667d9c004c7dd4 /grc | |
| parent | 62f8c06058435ed3e16f20327bb07bd29e4d8386 (diff) | |
| parent | b32e803b1bee283033c976a4656bc0af4fe9461f (diff) | |
| download | gnuradio-6c0f2f5a5e4eddefc52c272c4b92065a225be3c5.tar.gz gnuradio-6c0f2f5a5e4eddefc52c272c4b92065a225be3c5.tar.bz2 gnuradio-6c0f2f5a5e4eddefc52c272c4b92065a225be3c5.zip | |
Merge remote branch 'gnuradio/wip/udp_source_sink'
* gnuradio/wip/udp_source_sink:
gnuradio-core: update copyrights
gnuradio-core: allow swig to handle exceptions in UDP source/sink
grc: update UDP source and sink block wrappers
Simplify USE_SELECT usage
Return immediately when using d_residual.
Defend against a peer that sends an invalid message length.
Move initialization of select timeout
Correct update of d_temp_offset (parallel construction)
Identify memory leaks that occur on error conditions
Use -1 as file descriptor "not open" value instead of 0
Add additional conditionalization of networking includes
Flush pending errors in gr_udp_sink on disconnect()
Rework UDP source and sink, with incompatible API changes
Updates to udp source/sink (select(), wait, cleanup)
Discard data in gr_udp_sink until receiver is started.
Use getaddrinfo in gr_udp_{source,sink}
Changes to gr_udp_{source,sink} for MinGW
Ignore ENOPROTOOPT return from setsockopt(SO_LINGER)
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/gr_udp_sink.xml | 32 | ||||
| -rw-r--r-- | grc/blocks/gr_udp_source.xml | 20 |
2 files changed, 28 insertions, 24 deletions
diff --git a/grc/blocks/gr_udp_sink.xml b/grc/blocks/gr_udp_sink.xml index e9f6c2be8..45f81075f 100644 --- a/grc/blocks/gr_udp_sink.xml +++ b/grc/blocks/gr_udp_sink.xml @@ -8,7 +8,7 @@ <name>UDP Sink</name> <key>gr_udp_sink</key> <import>from gnuradio import gr</import> - <make>gr.udp_sink($type.size*$vlen, $ipaddr_local, $port_local, $ipaddr_remote, $port_remote, $mtu)</make> + <make>gr.udp_sink($type.size*$vlen, $ipaddr, $port, $psize, $eof)</make> <callback>set_mtu($mtu)</callback> <param> <name>Input Type</name> @@ -41,34 +41,26 @@ </option> </param> <param> - <name>Local IP Address</name> - <key>ipaddr_local</key> - <value>127.0.0.1</value> + <name>Destination IP Address</name> + <key>ipaddr</key> <type>string</type> </param> <param> - <name>Local Port</name> - <key>port_local</key> - <value>0</value> + <name>Destination Port</name> + <key>port</key> <type>int</type> </param> <param> - <name>Remote IP Address</name> - <key>ipaddr_remote</key> - <value>127.0.0.1</value> - <type>string</type> - </param> - <param> - <name>Remote Port</name> - <key>port_remote</key> - <value>1234</value> + <name>Payload Size</name> + <key>psize</key> + <value>1472</value> <type>int</type> </param> <param> - <name>MTU</name> - <key>mtu</key> - <value>1024</value> - <type>int</type> + <name>Send Null Pkt as EOF</name> + <key>eof</key> + <value>True</value> + <type>bool</type> </param> <param> <name>Vec Length</name> diff --git a/grc/blocks/gr_udp_source.xml b/grc/blocks/gr_udp_source.xml index f03adf802..a1b961651 100644 --- a/grc/blocks/gr_udp_source.xml +++ b/grc/blocks/gr_udp_source.xml @@ -8,7 +8,7 @@ <name>UDP Source</name> <key>gr_udp_source</key> <import>from gnuradio import gr</import> - <make>gr.udp_source($type.size*$vlen, $ipaddr, $port, $mtu)</make> + <make>gr.udp_source($type.size*$vlen, $ipaddr, $port, $psize, $eof, $wait)</make> <callback>set_mtu($mtu)</callback> <param> <name>Output Type</name> @@ -53,12 +53,24 @@ <type>int</type> </param> <param> - <name>MTU</name> - <key>mtu</key> - <value>1024</value> + <name>Payload Size</name> + <key>psize</key> + <value>1472</value> <type>int</type> </param> <param> + <name>Null Pkt is EOF</name> + <key>eof</key> + <value>True</value> + <type>bool</type> + </param> + <param> + <name>Wait for Data</name> + <key>wait</key> + <value>True</value> + <type>bool</type> + </param> + <param> <name>Vec Length</name> <key>vlen</key> <value>1</value> |