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

remove unused send_parts code

This commit is contained in:
Antoine Martin 2016-08-24 09:56:28 +07:00
parent 002a8c1151
commit fd846b3f5d
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
websockify/websocket.py
View File

@ -327,21 +327,7 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
opcode = 1 opcode = 1
else: else:
opcode = 2 opcode = 2
encbufs = self.send_hybi(buf, opcode, base64=self.base64, record=self.rec) self.send_hybi(buf, opcode, base64=self.base64, record=self.rec)
while self.send_parts:
# Send pending frames
buf = self.send_parts.pop(0)
sent = self.request.send(buf)
if sent == len(buf):
self.print_traffic("<")
else:
self.print_traffic("<.")
self.send_parts.insert(0, buf[sent:])
break
return len(self.send_parts)
def recv_frames(self): def recv_frames(self):
""" Receive and decode WebSocket frames. """ Receive and decode WebSocket frames.
@ -494,7 +480,6 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler):
# Indicate to server that a Websocket upgrade was done # Indicate to server that a Websocket upgrade was done
self.server.ws_connection = True self.server.ws_connection = True
# Initialize per client settings # Initialize per client settings
self.send_parts = []
self.recv_part = None self.recv_part = None
self.start_time = int(time.time()*1000) self.start_time = int(time.time()*1000)

5
websockify/websocketproxy.py
View File

@ -137,7 +137,6 @@ Traffic Legend:
Proxy client WebSocket to normal target socket. Proxy client WebSocket to normal target socket.
""" """
cqueue = [] cqueue = []
c_pend = 0
tqueue = [] tqueue = []
rlist = [self.request, target] rlist = [self.request, target]
@ -157,7 +156,7 @@ Traffic Legend:
self.send_ping() self.send_ping()
if tqueue: wlist.append(target) if tqueue: wlist.append(target)
if cqueue or c_pend: wlist.append(self.request) if cqueue: wlist.append(self.request)
try: try:
ins, outs, excepts = select.select(rlist, wlist, [], 1) ins, outs, excepts = select.select(rlist, wlist, [], 1)
except (select.error, OSError): except (select.error, OSError):
@ -176,7 +175,7 @@ Traffic Legend:
if self.request 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) self.send_frames(cqueue)
cqueue = [] cqueue = []