Rename websocket -> ws

pupy/network/lib/picocmd/picocmd.py

@@ -546,7 +546,7 @@ class Connect(Command):
     well_known_transports_decode = dict(enumerate([
         'obfs3','kc4','http','tcp_cleartext','rsa',
         'ssl','udp_cleartext','scramblesuit','ssl_rsa', 'ec4',
-        'websocket', 'ecm'
+        'ws', 'ecm'
     ], 1))
 
     well_known_transports_encode = {

pupy/network/transports/ws/conf.py

@@ -15,7 +15,7 @@ DEFAULT_USER_AGENT = \
 
 class TransportConf(Transport):
     info = "TCP transport using Websocket with RSA+AES"
-    name = "websocket"
+    name = "ws"
     server = PupyTCPServer
     client = PupyTCPClient
     stream = PupySocketStream

pupy/pupy.conf.default

@@ -11,7 +11,7 @@ logs = false
 webserver = false
 
 #Multiple listeners are allowed. Example
-#listen = ssl,kc4,websocket
+#listen = ssl,kc4,ws
 listen = ssl
 
 #igd=True allow pupy to make IGD/UPNP requests to get you external IP and
@@ -71,7 +71,7 @@ ec4 = 80=1234
 kc4 = 123=1234
 tcp_cleartext = 80=1234
 udp_cleartext = 123=1234
-websocket = 80=8081
+ws = 80=8081
 http = 80=8080
 ecm = 1235