[Commit-gnuradio] gnuradio-examples/python/networking measurement...

[Eric Blossom]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-examples
Changes by:     Eric Blossom <eb>       06/06/22 20:13:06

Modified files:
        python/networking: measurement_slave.py 

Log message:
        work-in-progress

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-examples/python/networking/measurement_slave.py?cvsroot=gnuradio&r1=1.3&r2=1.4

Patches:
Index: measurement_slave.py
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-examples/python/networking/measurement_slave.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- measurement_slave.py        22 Jun 2006 19:56:43 -0000      1.3
+++ measurement_slave.py        22 Jun 2006 20:13:06 -0000      1.4
@@ -25,6 +25,7 @@
 import asyncore
 import sys
 import optparse
+import random
 from gnuradio.eng_option import eng_option
 
 LOOP_TIMEOUT = 0.001
@@ -54,6 +55,7 @@
         asyncore.dispatcher.__init__(self)
 
         self._verbose = verbose
+        self._udp_socket = udp_socket
 
         host = ''                       # symbolic name for localhost
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -70,10 +72,10 @@
         
     def handle_accept(self):
         socket, addr = self.accept()
-        sys.stderr.write("handle_accept: %r" % addr)
+        sys.stderr.write("handle_accept: %r\n" % (addr,))
         if not(socket is None):
             # instantiate a server
-            s = control_server(socket, addr, udp_socket, self._verbose)
+            s = control_server(socket, addr, self._udp_socket, self._verbose)
         
 
 class gr_dispatcher(asyncore.dispatcher):
@@ -144,6 +146,7 @@
     def __init__(self, socket, addr, udp_socket, verbose=False):
         gr_dispatcher.__init__(self, sock=socket)
         
+        self._udp_socket = udp_socket
         self.verbose = verbose
         self.setblocking(1)
 
@@ -158,7 +161,7 @@
                 logfile.write(pkt[len(annotate):])
                 logfile.write('\n')
                 logfile.flush()
-            if pkt.startswith('SEND'):
+            elif pkt.startswith('SEND'):
                 tokens = pkt.split()
                 if len(tokens) < 4:
                     invalid_packet(pkt)
@@ -166,7 +169,7 @@
                     npkts = int(tokens[1])
                     size = int(tokens[2])
                     power = float(tokens[3])
-                    send_test_packets(udp_socket, npkts, size, power)
+                    send_test_packets(self._udp_socket, npkts, size, power)
             else:
                 invalid_packet(pkt)
 
@@ -178,7 +181,7 @@
     sys.stderr.write('received unrecognized packet: %s\n' % (pkt,))
 
 
-def make_random_payload(self, size):
+def make_random_payload(size):
     p = [0] * size
     if 1:
         for i in range(size):
@@ -195,9 +198,7 @@
     payload = make_random_payload(size - 2)
     for n in range(npkts):
         pkt = struct.pack('!H', n) + payload
-        r = udp_socket.sendall(pkt)
-        if r != len(pkt):
-            sys.stderr.write('Short write on sendall: request = %d, actual = 
%d\n' % (len(pkt), r))
+        udp_socket.sendall(pkt)
 
 
 def open_udp_broadcast_socket(gr0_host_ip, port):