fake_trx: fix compatibility with Python 3
Change-Id: Idce0c631aa3fcd20092a3773558570e442b2fec8
This commit is contained in:
parent
b5e4f26f6f
commit
538bea917b
|
@ -94,7 +94,7 @@ class Application:
|
|||
self.clck.start()
|
||||
|
||||
def sig_handler(self, signum, frame):
|
||||
print "Signal %d received" % signum
|
||||
print("Signal %d received" % signum)
|
||||
if signum is signal.SIGINT:
|
||||
self.clck.stop()
|
||||
self.link.shutdown()
|
||||
|
|
|
@ -54,7 +54,7 @@ class Application:
|
|||
|
||||
if self.ctrl_link.sock in r_event:
|
||||
data, addr = self.ctrl_link.sock.recvfrom(128)
|
||||
sys.stdout.write("\r%s\n" % data)
|
||||
sys.stdout.write("\r%s\n" % data.decode())
|
||||
sys.stdout.flush()
|
||||
|
||||
def handle_cmd(self, cmd):
|
||||
|
|
|
@ -114,12 +114,12 @@ class Application:
|
|||
# CTRL commands from BTS
|
||||
if self.bts_ctrl.sock in r_event:
|
||||
data, addr = self.bts_ctrl.sock.recvfrom(128)
|
||||
self.bts_ctrl.handle_rx(data)
|
||||
self.bts_ctrl.handle_rx(data.decode())
|
||||
|
||||
# CTRL commands from BB
|
||||
if self.bb_ctrl.sock in r_event:
|
||||
data, addr = self.bb_ctrl.sock.recvfrom(128)
|
||||
self.bb_ctrl.handle_rx(data)
|
||||
self.bb_ctrl.handle_rx(data.decode())
|
||||
|
||||
def shutdown(self):
|
||||
print("[i] Shutting down...")
|
||||
|
|
|
@ -41,12 +41,15 @@ class UDPLink:
|
|||
# Check for incoming data
|
||||
if self.sock in r_event:
|
||||
data, addr = self.sock.recvfrom(128)
|
||||
self.handle_rx(data)
|
||||
self.handle_rx(data.decode())
|
||||
|
||||
def shutdown(self):
|
||||
self.sock.close();
|
||||
|
||||
def send(self, data):
|
||||
if type(data) not in [bytearray, bytes]:
|
||||
data = data.encode()
|
||||
|
||||
self.sock.sendto(data, (self.remote_addr, self.remote_port))
|
||||
|
||||
def handle_rx(self, data):
|
||||
|
|
Loading…
Reference in New Issue