mirror of
https://github.com/geohot/qira
synced 2024-12-25 21:46:54 +03:00
Merge pull request #222 from cromize/master
fix socat init print format
This commit is contained in:
commit
b349141547
@ -23,23 +23,23 @@ def start_bindserver(program, port, parent_id, start_cl, loop = False):
|
||||
bound_ports[port] = myss
|
||||
else:
|
||||
myss = bound_ports[port]
|
||||
|
||||
|
||||
if os.fork() != 0:
|
||||
return
|
||||
print("**** socat listening on %s:%s" % myss.getsockname())
|
||||
|
||||
# bindserver runs in a fork
|
||||
while 1:
|
||||
print("**** listening on",myss)
|
||||
(cs, address) = myss.accept()
|
||||
|
||||
# fork off the child if we are looping
|
||||
if loop:
|
||||
if os.fork() != 0:
|
||||
cs.close()
|
||||
continue
|
||||
run_id = get_next_run_id()
|
||||
print("**** ID",run_id,"CLIENT",cs, address, cs.fileno())
|
||||
|
||||
fd = cs.fileno()
|
||||
print("**** ID %s CLIENT %s:%s fd: %s" % (run_id, address[0], address[1], fd))
|
||||
|
||||
# python nonblocking is a lie...
|
||||
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
|
||||
try:
|
||||
@ -47,9 +47,9 @@ def start_bindserver(program, port, parent_id, start_cl, loop = False):
|
||||
fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL, 0) & ~os.O_NONBLOCK)
|
||||
except:
|
||||
pass
|
||||
os.dup2(fd, 0)
|
||||
os.dup2(fd, 1)
|
||||
os.dup2(fd, 2)
|
||||
os.dup2(fd, 0)
|
||||
os.dup2(fd, 1)
|
||||
os.dup2(fd, 2)
|
||||
for i in range(3, fd+1):
|
||||
try:
|
||||
os.close(i)
|
||||
|
Loading…
Reference in New Issue
Block a user