diff options
| author | Badlop <badlop@process-one.net> | 2008-07-24 18:03:28 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-07-24 18:03:28 +0000 |
| commit | 1e115254059214db8f1f970884548e77a40b7de7 (patch) | |
| tree | bcf02a45b906349fce772e8c9eef988556d6eafb | |
| parent | * src/mod_register.erl: When a registration is blocked due to IP (diff) | |
* src/mod_proxy65/mod_proxy65_lib.erl: Send protocol compliant
SOCKS5 reply; this breaks support of uncompliant Psi<0.10 (thanks
to Felix Geyer)(EJAB-632)
* src/mod_proxy65/mod_proxy65_stream.erl: Likewise
SVN Revision: 1488
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/mod_proxy65/mod_proxy65_lib.erl | 10 | ||||
| -rw-r--r-- | src/mod_proxy65/mod_proxy65_stream.erl | 2 |
3 files changed, 9 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2008-07-24 Badlop <badlop@process-one.net> + * src/mod_proxy65/mod_proxy65_lib.erl: Send protocol compliant + SOCKS5 reply; this breaks support of uncompliant Psi<0.10 (thanks + to Felix Geyer)(EJAB-632) + * src/mod_proxy65/mod_proxy65_stream.erl: Likewise + * src/mod_register.erl: When a registration is blocked due to IP limitation, return description in error stanza (EJAB-692) diff --git a/src/mod_proxy65/mod_proxy65_lib.erl b/src/mod_proxy65/mod_proxy65_lib.erl index 8e30bb4a6..490ef0479 100644 --- a/src/mod_proxy65/mod_proxy65_lib.erl +++ b/src/mod_proxy65/mod_proxy65_lib.erl @@ -35,7 +35,7 @@ unpack_request/1, make_init_reply/1, make_auth_reply/1, - make_reply/0, + make_reply/1, make_error_reply/1, make_error_reply/2 ]). @@ -73,12 +73,8 @@ make_init_reply(Method) -> make_auth_reply(true) -> [1, ?SUCCESS]; make_auth_reply(false) -> [1, ?ERR_NOT_ALLOWED]. -%% WARNING: According to SOCKS5 RFC, this reply is _incorrect_, but -%% Psi writes junk to the beginning of the file on correct reply. -%% I'm not sure, but there may be an issue with other clients. -%% Needs more testing. -make_reply() -> - [?VERSION_5, ?SUCCESS, 0, 0, 0, 0]. +make_reply(#s5_request{rsv = RSV, sha1 = SHA1}) -> + [?VERSION_5, ?SUCCESS, RSV, ?ATYP_DOMAINNAME, length(SHA1), SHA1, 0,0]. make_error_reply(Request) -> make_error_reply(Request, ?ERR_NOT_ALLOWED). diff --git a/src/mod_proxy65/mod_proxy65_stream.erl b/src/mod_proxy65/mod_proxy65_stream.erl index 046ac8e71..230e2a7b3 100644 --- a/src/mod_proxy65/mod_proxy65_stream.erl +++ b/src/mod_proxy65/mod_proxy65_stream.erl @@ -172,7 +172,7 @@ wait_for_request(Packet, #state{socket=Socket} = StateData) -> case catch mod_proxy65_sm:register_stream(SHA1) of {atomic, ok} -> inet:setopts(Socket, [{active, false}]), - gen_tcp:send(Socket, mod_proxy65_lib:make_reply()), + gen_tcp:send(Socket, mod_proxy65_lib:make_reply(Request)), {next_state, wait_for_activation, StateData#state{sha1=SHA1}}; _ -> Err = mod_proxy65_lib:make_error_reply(Request), |