Commit Graph

890 Commits

Author SHA1 Message Date
Joel Martin 89d2c92474 Move SSL target support into websocket.py.
This is cleanup related to:
https://github.com/kanaka/websockify/pull/45
2012-05-23 09:20:08 -05:00
Joel Martin d24f474362 Merge pull request #45 from d4nshields/master
feature from issue #8: Support connecting to SSL/TLS target socket
2012-05-23 06:47:14 -07:00
Karim Allah Ahmed f3054df53a Adding TCP_NODELAY to the source sockets 2012-05-22 16:49:00 +02:00
Karim Allah Ahmed c8018f29c9 Adding support for proxying from a unix socket 2012-05-22 16:09:07 +02:00
Daniel Shields 763d2d7c1c Feature: target_host is wrapped in SSL using --ssl-target option 2012-05-20 13:58:45 -04:00
Joel Martin e1c206b315 Release version 0.1.0 2012-05-11 12:12:50 -05:00
Joel Martin 63600bf422 Fix return code when client closes. 2012-05-10 22:00:27 -05:00
Joel Martin 19a9730744 Make CClose exception work in python 2.4.
Fixes https://github.com/kanaka/websockify/issues/41
2012-05-10 08:04:30 -05:00
Joel Martin 7a4dbad3e8 Fix latency test.
For echo/latency tests default to current host:port or URL.
2012-04-25 13:44:37 -05:00
Joel Martin 9a88f1800c Better close code/reason handling. 2012-04-25 13:44:01 -05:00
Joel Martin 37c0c80a93 C websockify: add --run-once option. 2012-04-13 10:36:16 -05:00
Joel Martin aef7ab3a57 Clean socket shutdown in C version too.
Related to https://github.com/kanaka/noVNC/issues/58 (supporting Apple
Remote Desktop).
2012-03-23 12:17:50 -05:00
Joel Martin 27c3da1908 Fix feature matrix link and clarify paragraph. 2012-02-23 17:45:27 -06:00
Joel Martin 9fcd92c39a Remove copy of kumina implementation.
The canonical location is https://github.com/kumina/wsproxy

There are now several external implementations of Websockify that
I link to from
https://github.com/kanaka/websockify/wiki/Feature_Matrix
2012-02-23 17:18:10 -06:00
Joel Martin 7ea468b5d7 Node impl to use einaros/ws and support HyBi.
Also adds web serving functionality and Flash policy service.
2012-02-23 17:06:35 -06:00
Joel Martin 9decfe1c95 Don't swallow SSL EOF errors. 2012-02-20 16:34:30 -06:00
Joel Martin cb839e85c4 Pull base64.js from noVNC.
Better illegal character debug output.
2012-02-20 15:49:18 -06:00
Joel Martin 31716a7265 Merge pull request #31 from SlapOS/master
Eggify websockify
2012-02-18 12:53:04 -08:00
Cédric de Saint Martin 301f3ae580 Eggify websockify 2012-02-18 09:43:12 +01:00
Joel Martin db17151941 Sync include/webutil.js with noVNC. 2012-02-14 17:37:01 -06:00
Joel Martin 7d44853da7 Pull include/util.js from noVNC. Add map to arrays for IE9.
IE9 still doesn't support [].map() so add it to the prototype in
include/util.js.
2012-02-14 07:51:44 -06:00
Joel Martin b405cdae7b Rename client.html to simple.html 2012-02-09 17:47:22 -06:00
Joel Martin e02b698015 Add simple client: tests/client.html. 2012-02-09 17:46:47 -06:00
Joel Martin bea32aebed Handle partial HyBi client frames. Cleanup buffer names.
Significant refactor of decode_hybi() and use of it in do_proxy().
2012-02-03 11:55:03 -06:00
Joel Martin bc1ea59867 Fix response to empty close frame. 2012-02-02 11:06:19 -06:00
Joel Martin b76c357f3f Fix --ssl-only option. 2012-02-02 08:11:06 -06:00
Joel Martin 8e95f18f99 Add openssl cert generation procedure to README. 2012-02-02 07:05:55 -06:00
Joel Martin 27ec5cff89 Remove more wswrapper Makefile references. 2012-02-02 06:51:39 -06:00
Joel Martin e2497313f5 Remove pointless md5_test.c file. 2012-02-01 19:17:56 -06:00
Joel Martin 04b3b2057c HyBi/IETF 6455 support to C websockify.
It's probably broken and it's definitely still messy in several ways,
but basic tests work with Chrome.

Several other C websockify cleanups:

- Remove most of the non-thread safe global variable usage (still
  a little bit that could be fixed so that threading would be easier).

- Remove wswrapper. It is unmaintained, out of date, and never worked
  well anyways (since it really needed a way to do asynchronous queued
  work but it was running in another process context making that
  hard).

- Use md5 routines from openssl.

- Remove md5.c and md5.h since no longer needed.

Thanks to https://github.com/dew111 for spurring me on to get this
done by writing code. I didn't end up using much his forked code, but
having something there goaded me enough to just get it working.
2012-02-01 19:10:39 -06:00
Joel Martin b2940c035f Show SSL error string. 2012-01-31 15:20:57 -06:00
Joel Martin 9ed4a17d70 Move alternate implementation data to wiki. 2012-01-30 15:00:58 -06:00
Joel Martin 6549c04fae Ignore clojure/lein artifacts. 2012-01-30 13:40:55 -06:00
Joel Martin 2c053f349c Clojure websockify: -main and command line args.
Can now be launched like so:

lein run websockify --web ../../noVNC/ 6080 localhost:5901
2012-01-30 13:38:18 -06:00
Joel Martin f2f838f7e2 Split generic websocket code out from websockify.
Generic TCP client and Websocket server code is now split out from the
websockify specific code.
2012-01-27 16:01:17 -06:00
Joel Martin 3278905ead Better error handling in Clojure Websockify.
Also, disable verbose debug.
2012-01-27 15:37:35 -06:00
Joel Martin a5d4fe1d18 Working vesrion Clojure Websockify.
Still needs some cleanup related to cleaning up client and target
connections.
2012-01-27 15:14:45 -06:00
Joel Martin 297a818066 Working Clojure Netty client code. 2012-01-27 13:11:38 -06:00
Joel Martin 9aa2844856 Switch to Jetty for Clojure WebSocket support.
This current code accepts WebSocket connections and can send data back
and forth.
2012-01-26 15:36:58 -06:00
Joel Martin 0664584843 Clojure Websockify using Aleph - broken. 2012-01-26 15:31:21 -06:00
Joel Martin 3aedd64765 Add websockify.py symlink for Windows support. 2012-01-05 12:00:22 -06:00
Joel Martin 7e6550806f Switch tests/echo.html to use websock.js. 2012-01-03 07:41:54 -07:00
Joel Martin e02c62932b README: websockify.rb support HyBi. 2011-12-23 10:59:56 -07:00
Joel Martin d5c94db054 Support python 3 with SSL/TLS connections.
Need to detect leading TLS/SSL character by number too for python 3.
2011-12-15 15:35:11 -06:00
Joel Martin 008a5118e7 Add commented out web-socket-js Flash debug var. 2011-12-15 15:10:09 -06:00
Joel Martin 7e2784bfcc Merge remote branch 'snorkeyg/master' 2011-11-04 10:16:17 -05:00
Joel Martin 669f77edb0 Merge commit 'e69a8d89c2354c146fa8969a142e0244be5b229a'
Pruned binary files.
2011-11-04 10:14:40 -05:00
Chris Gordon e80327ac2f Update Windows/Windows Service Readme.txt 2011-11-04 14:01:07 +10:00
Chris Gordon a487e2afa7 Update Windows/Windows Service Readme.txt 2011-11-04 14:00:54 +10:00
Chris Gordon e69a8d89c2 Windows websocket server service wrapper.
Signed-off-by: Chris Gordon <snorkeyg@gmail.com>
2011-11-04 13:52:18 +10:00