diff options
author | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 16:48:44 +0000 |
---|---|---|
committer | dilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 16:48:44 +0000 |
commit | 2d14b373ac9ef900b12160ba64bafdcc0530f1dc (patch) | |
tree | 52e15b1f248599722f3d29cc4a4a5ee894e5fe65 /third_party | |
parent | 658e883290c87808964c8fe245a4755c67b98eab (diff) | |
download | chromium_src-2d14b373ac9ef900b12160ba64bafdcc0530f1dc.zip chromium_src-2d14b373ac9ef900b12160ba64bafdcc0530f1dc.tar.gz chromium_src-2d14b373ac9ef900b12160ba64bafdcc0530f1dc.tar.bz2 |
Websocket to TCP proxy running in a separate thread (only on ChromeOS).
With this webproxy: authorized extensions can connect to ws://127.0.0.1:10101/tcpproxy,
pass authorization_token:hostname:port: in first frame,
then webproxy establishes TCP connection to hostname:port and forwards any subsequent
communication.
Subsequent communication between extension and webproxy is base64-encoded.
TODO(dilmah): remove this temporary solution, get rid of separate thread and listening socket,
instead provide the same functionality via hooks into websocket layer.
BUG=chromium-os:9667
TEST=Manual
Review URL: http://codereview.chromium.org/6801008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/libevent/chromium.patch | 13 | ||||
-rw-r--r-- | third_party/libevent/evdns.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/third_party/libevent/chromium.patch b/third_party/libevent/chromium.patch index 04a73b0..af43e719 100644 --- a/third_party/libevent/chromium.patch +++ b/third_party/libevent/chromium.patch @@ -1,3 +1,16 @@ +diff --git a/third_party/libevent/evdns.h b/third_party/libevent/evdns.h +index 1eb5c38..fca4ac3 100644 +--- a/third_party/libevent/evdns.h ++++ b/third_party/libevent/evdns.h +@@ -165,7 +165,7 @@ extern "C" { + #endif + + /* For integer types. */ +-#include <evutil.h> ++#include "evutil.h" + + /** Error codes 0-5 are as described in RFC 1035. */ + #define DNS_ERR_NONE 0 diff --git a/third_party/libevent/event-config.h b/third_party/libevent/event-config.h new file mode 100644 index 0000000..78a4727 diff --git a/third_party/libevent/evdns.h b/third_party/libevent/evdns.h index 1eb5c38..fca4ac3 100644 --- a/third_party/libevent/evdns.h +++ b/third_party/libevent/evdns.h @@ -165,7 +165,7 @@ extern "C" { #endif /* For integer types. */ -#include <evutil.h> +#include "evutil.h" /** Error codes 0-5 are as described in RFC 1035. */ #define DNS_ERR_NONE 0 |