summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2010-12-09 19:09:30 -0800
committerAvery Pennarun <apenwarr@gmail.com>2010-12-09 19:20:09 -0800
commit1907048dad40c5cd6e8b13fe093b6cdf5598b9ff (patch)
tree441ca7d748afa4ed3c7a2a06e211125a3f7c8589
parent82e1d1c1661a5c5b969dae9f32c72e0bda9e2334 (diff)
Remove the never-used and misleading CMD_CLOSE.sshuttle-0.43
-rw-r--r--ssnet.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/ssnet.py b/ssnet.py
index e8dde65..1577aa4 100644
--- a/ssnet.py
+++ b/ssnet.py
@@ -15,7 +15,7 @@ CMD_EXIT = 0x4200
CMD_PING = 0x4201
CMD_PONG = 0x4202
CMD_CONNECT = 0x4203
-CMD_CLOSE = 0x4204
+# CMD_CLOSE = 0x4204 # never used - removed
CMD_EOF = 0x4205
CMD_DATA = 0x4206
CMD_ROUTES = 0x4207
@@ -27,7 +27,6 @@ cmd_to_name = {
CMD_PING: 'PING',
CMD_PONG: 'PONG',
CMD_CONNECT: 'CONNECT',
- CMD_CLOSE: 'CLOSE',
CMD_EOF: 'EOF',
CMD_DATA: 'DATA',
CMD_ROUTES: 'ROUTES',
@@ -459,10 +458,7 @@ class MuxWrapper(SockWrapper):
return None # no data available right now
def got_packet(self, cmd, data):
- if cmd == CMD_CLOSE:
- self.noread()
- self.nowrite()
- elif cmd == CMD_EOF:
+ if cmd == CMD_EOF:
self.noread()
elif cmd == CMD_DATA:
self.buf.append(data)