mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-08 21:43:07 +02:00
* 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
This commit is contained in:
parent
f841acb21f
commit
2d5fdbab64
|
@ -1,5 +1,10 @@
|
||||||
2008-07-24 Badlop <badlop@process-one.net>
|
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
|
* src/mod_register.erl: When a registration is blocked due to IP
|
||||||
limitation, return description in error stanza (EJAB-692)
|
limitation, return description in error stanza (EJAB-692)
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
unpack_request/1,
|
unpack_request/1,
|
||||||
make_init_reply/1,
|
make_init_reply/1,
|
||||||
make_auth_reply/1,
|
make_auth_reply/1,
|
||||||
make_reply/0,
|
make_reply/1,
|
||||||
make_error_reply/1,
|
make_error_reply/1,
|
||||||
make_error_reply/2
|
make_error_reply/2
|
||||||
]).
|
]).
|
||||||
|
@ -73,12 +73,8 @@ make_init_reply(Method) ->
|
||||||
make_auth_reply(true) -> [1, ?SUCCESS];
|
make_auth_reply(true) -> [1, ?SUCCESS];
|
||||||
make_auth_reply(false) -> [1, ?ERR_NOT_ALLOWED].
|
make_auth_reply(false) -> [1, ?ERR_NOT_ALLOWED].
|
||||||
|
|
||||||
%% WARNING: According to SOCKS5 RFC, this reply is _incorrect_, but
|
make_reply(#s5_request{rsv = RSV, sha1 = SHA1}) ->
|
||||||
%% Psi writes junk to the beginning of the file on correct reply.
|
[?VERSION_5, ?SUCCESS, RSV, ?ATYP_DOMAINNAME, length(SHA1), SHA1, 0,0].
|
||||||
%% 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_error_reply(Request) ->
|
make_error_reply(Request) ->
|
||||||
make_error_reply(Request, ?ERR_NOT_ALLOWED).
|
make_error_reply(Request, ?ERR_NOT_ALLOWED).
|
||||||
|
|
|
@ -172,7 +172,7 @@ wait_for_request(Packet, #state{socket=Socket} = StateData) ->
|
||||||
case catch mod_proxy65_sm:register_stream(SHA1) of
|
case catch mod_proxy65_sm:register_stream(SHA1) of
|
||||||
{atomic, ok} ->
|
{atomic, ok} ->
|
||||||
inet:setopts(Socket, [{active, false}]),
|
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}};
|
{next_state, wait_for_activation, StateData#state{sha1=SHA1}};
|
||||||
_ ->
|
_ ->
|
||||||
Err = mod_proxy65_lib:make_error_reply(Request),
|
Err = mod_proxy65_lib:make_error_reply(Request),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user