merging r4318:4437 to fix ticket:131 from branche trondeau/udp udp source/sink pairs working

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4438 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 13 insertions, 16 deletions

diff --git a/gnuradio-examples/python/hier/networking/vector_source.py b/gnuradio-examples/python/hier/networking/vector_source.py
index 3491ad94b..d31a0baa2 100755
--- a/gnuradio-examples/python/hier/networking/vector_source.py
+++ b/gnuradio-examples/python/hier/networking/vector_source.py
@@ -25,41 +25,38 @@ from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
 class vector_source(gr.hier_block2):
-    def __init__(self, local_ipaddress, remote_ipaddress, port, mtu):
+    def __init__(self, src, dst, port, pkt_size):
         gr.hier_block2.__init__(self, 
                                 "vector_source",	# Block type 
                                 gr.io_signature(0,0,0), # Input signature
                                 gr.io_signature(0,0,0)) # Output signature
 
-        data = [i*0.1 for i in range(1000)]
+        data = [i*0.01 for i in range(1000)]
         self.define_component("data", gr.vector_source_f(data, True))
-	self.define_component("thr", gr.throttle(gr.sizeof_float, 8000))
 
-        udp = gr.udp_sink(gr.sizeof_float, local_ipaddress, 0,
-                          remote_ipaddress, port, mtu)
+        udp = gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size)
         self.define_component("dst",  udp)
 
-        self.connect("data", 0, "thr", 0)
-	self.connect("thr", 0, "dst", 0)
+        self.connect("data", 0, "dst", 0)
 
 if __name__ == '__main__':
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1",
-                      help="local IP address")
-    parser.add_option("", "--remote-ipaddr", type="string", default="127.0.0.1",
-                      help="Remote IP address")
-    parser.add_option("", "--remote-port", type="int", default=65500,
+    parser.add_option("", "--src-name", type="string", default="localhost",
+                      help="local host name (domain name or IP address)")
+    parser.add_option("", "--dst-name", type="string", default="localhost",
+                      help="Remote host name (domain name or IP address")
+    parser.add_option("", "--dst-port", type="int", default=65500,
                       help="port value to connect to")
-    parser.add_option("", "--mtu", type="int", default=540,
-                     help="packet size.")
+    parser.add_option("", "--packet-size", type="int", default=1471,
+                      help="packet size.")
     (options, args) = parser.parse_args()
     if len(args) != 0:
         parser.print_help()
         raise SystemExit, 1
 
 # Create an instance of a hierarchical block
-    top_block = vector_source(options.local_ipaddr, options.remote_ipaddr,
-                              options.remote_port, options.mtu)
+    top_block = vector_source(options.src_name, options.dst_name,
+                              options.dst_port, options.packet_size)
     
     # Create an instance of a runtime, passing it the top block
     runtime = gr.runtime(top_block)