crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename self.client to self.request, in preparation for merging pull 

request #72. The standard Python SocketServer/BaseRequestHandler
requires this name.
This commit is contained in:
Peter Åstrand (astrand) 2013-11-28 13:23:50 +01:00
parent 34a1b68d79
commit 558402848e
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/echo.py
View File

@ -28,21 +28,21 @@ class WebSocketEcho(WebSocketServer):
cqueue = [] cqueue = []
c_pend = 0 c_pend = 0
cpartial = "" cpartial = ""
rlist = [self.client] rlist = [self.request]
while True: while True:
wlist = [] wlist = []
if cqueue or c_pend: wlist.append(self.client) if cqueue or c_pend: wlist.append(self.request)
ins, outs, excepts = select.select(rlist, wlist, [], 1) ins, outs, excepts = select.select(rlist, wlist, [], 1)
if excepts: raise Exception("Socket exception") if excepts: raise Exception("Socket exception")
if self.client in outs: if self.request in outs:
# Send queued target data to the client # Send queued target data to the client
c_pend = self.send_frames(cqueue) c_pend = self.send_frames(cqueue)
cqueue = [] cqueue = []
if self.client in ins: if self.request in ins:
# Receive client data, decode it, and send it back # Receive client data, decode it, and send it back
frames, closed = self.recv_frames() frames, closed = self.recv_frames()
cqueue.extend(frames) cqueue.extend(frames)

2
tests/load.py
View File

@ -34,7 +34,7 @@ class WebSocketLoad(WebSocketServer):
self.recv_cnt = 0 self.recv_cnt = 0
try: try:
self.responder(self.client) self.responder(self.request)
except: except:
print "accumulated errors:", self.errors print "accumulated errors:", self.errors
self.errors = 0 self.errors = 0

16
websockify/websocket.py
View File

@ -477,7 +477,7 @@ Sec-WebSocket-Accept: %s\r
while self.send_parts: while self.send_parts:
# Send pending frames # Send pending frames
buf = self.send_parts.pop(0) buf = self.send_parts.pop(0)
sent = self.client.send(buf) sent = self.request.send(buf)
if sent == len(buf): if sent == len(buf):
self.print_traffic("<") self.print_traffic("<")
@ -499,7 +499,7 @@ Sec-WebSocket-Accept: %s\r
bufs = [] bufs = []
tdelta = int(time.time()*1000) - self.start_time tdelta = int(time.time()*1000) - self.start_time
buf = self.client.recv(self.buffer_size) buf = self.request.recv(self.buffer_size)
if len(buf) == 0: if len(buf) == 0:
closed = {'code': 1000, 'reason': "Client closed abruptly"} closed = {'code': 1000, 'reason': "Client closed abruptly"}
return bufs, closed return bufs, closed
@ -555,7 +555,7 @@ Sec-WebSocket-Accept: %s\r
msg = pack(">H%ds" % len(reason), code, reason) msg = pack(">H%ds" % len(reason), code, reason)
buf, h, t = self.encode_hybi(msg, opcode=0x08, base64=False) buf, h, t = self.encode_hybi(msg, opcode=0x08, base64=False)
self.client.send(buf) self.request.send(buf)
def do_websocket_handshake(self, headers, path): def do_websocket_handshake(self, headers, path):
h = self.headers = headers h = self.headers = headers
@ -755,7 +755,7 @@ Sec-WebSocket-Accept: %s\r
# handler process # handler process
try: try:
try: try:
self.client = self.do_handshake(startsock, address) self.request = self.do_handshake(startsock, address)
if self.record: if self.record:
# Record raw frame data as JavaScript array # Record raw frame data as JavaScript array
@ -774,7 +774,7 @@ Sec-WebSocket-Accept: %s\r
except self.CClose: except self.CClose:
# Close the client # Close the client
_, exc, _ = sys.exc_info() _, exc, _ = sys.exc_info()
if self.client: if self.request:
self.send_close(exc.args[0], exc.args[1]) self.send_close(exc.args[0], exc.args[1])
except self.EClose: except self.EClose:
_, exc, _ = sys.exc_info() _, exc, _ = sys.exc_info()
@ -792,10 +792,10 @@ Sec-WebSocket-Accept: %s\r
self.rec.write("'EOF'];\n") self.rec.write("'EOF'];\n")
self.rec.close() self.rec.close()
if self.client and self.client != startsock: if self.request and self.request != startsock:
# Close the SSL wrapped socket # Close the SSL wrapped socket
# Original socket closed by caller # Original socket closed by caller
self.client.close() self.request.close()
def new_client(self): def new_client(self):
""" Do something with a WebSockets client connection. """ """ Do something with a WebSockets client connection. """
@ -841,7 +841,7 @@ Sec-WebSocket-Accept: %s\r
while True: while True:
try: try:
try: try:
self.client = None self.request = None
startsock = None startsock = None
pid = err = 0 pid = err = 0
child_count = 0 child_count = 0

8
websockify/websocketproxy.py
View File

@ -241,23 +241,23 @@ Traffic Legend:
cqueue = [] cqueue = []
c_pend = 0 c_pend = 0
tqueue = [] tqueue = []
rlist = [self.client, target] rlist = [self.request, target]
while True: while True:
wlist = [] wlist = []
if tqueue: wlist.append(target) if tqueue: wlist.append(target)
if cqueue or c_pend: wlist.append(self.client) if cqueue or c_pend: wlist.append(self.request)
ins, outs, excepts = select(rlist, wlist, [], 1) ins, outs, excepts = select(rlist, wlist, [], 1)
if excepts: raise Exception("Socket exception") if excepts: raise Exception("Socket exception")
if self.client in outs: if self.request in outs:
# Send queued target data to the client # Send queued target data to the client
c_pend = self.send_frames(cqueue) c_pend = self.send_frames(cqueue)
cqueue = [] cqueue = []
if self.client in ins: if self.request in ins:
# Receive client data, decode it, and queue for target # Receive client data, decode it, and queue for target
bufs, closed = self.recv_frames() bufs, closed = self.recv_frames()
tqueue.extend(bufs) tqueue.extend(bufs)