Skip to content

S
sshuttle
Commit 1907048d authored by Avery Pennarun's avatar Avery Pennarun
Browse files
Options

Remove the never-used and misleading CMD_CLOSE.

parent 82e1d1c1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
ssnet.py
View file @ 1907048d
...@@ -15,7 +15,7 @@ CMD_EXIT = 0x4200 ...@@ -15,7 +15,7 @@ CMD_EXIT = 0x4200
CMD_PING = 0x4201 CMD_PING = 0x4201
CMD_PONG = 0x4202 CMD_PONG = 0x4202
CMD_CONNECT = 0x4203 CMD_CONNECT = 0x4203
CMD_CLOSE = 0x4204 # CMD_CLOSE = 0x4204 # never used - removed
CMD_EOF = 0x4205 CMD_EOF = 0x4205
CMD_DATA = 0x4206 CMD_DATA = 0x4206
CMD_ROUTES = 0x4207 CMD_ROUTES = 0x4207
...@@ -27,7 +27,6 @@ cmd_to_name = { ...@@ -27,7 +27,6 @@ cmd_to_name = {
CMD_PING: 'PING', CMD_PING: 'PING',
CMD_PONG: 'PONG', CMD_PONG: 'PONG',
CMD_CONNECT: 'CONNECT', CMD_CONNECT: 'CONNECT',
CMD_CLOSE: 'CLOSE',
CMD_EOF: 'EOF', CMD_EOF: 'EOF',
CMD_DATA: 'DATA', CMD_DATA: 'DATA',
CMD_ROUTES: 'ROUTES', CMD_ROUTES: 'ROUTES',
...@@ -459,10 +458,7 @@ class MuxWrapper(SockWrapper): ...@@ -459,10 +458,7 @@ class MuxWrapper(SockWrapper):
return None # no data available right now return None # no data available right now
def got_packet(self, cmd, data): def got_packet(self, cmd, data):
if cmd == CMD_CLOSE: if cmd == CMD_EOF:
self.noread()
self.nowrite()
elif cmd == CMD_EOF:
self.noread() self.noread()
elif cmd == CMD_DATA: elif cmd == CMD_DATA:
self.buf.append(data) self.buf.append(data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment