diff options
| author | Badlop <badlop@process-one.net> | 2009-10-20 15:28:48 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-10-20 15:28:48 +0000 |
| commit | 04545f2668a09c5a235007d663a2de0897dd9d18 (patch) | |
| tree | be39dbe996ef704c8a121263e107093f710faa90 /src/mod_proxy65/mod_proxy65_lib.erl | |
| parent | add release_notes_2.0.1 (diff) | |
| parent | does not use slash as default separator in nodename (EJAB-667) (diff) | |
Create branch for ejabberd 2.1.x release line.
SVN Revision: 2688
Diffstat (limited to 'src/mod_proxy65/mod_proxy65_lib.erl')
| -rw-r--r-- | src/mod_proxy65/mod_proxy65_lib.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/mod_proxy65/mod_proxy65_lib.erl b/src/mod_proxy65/mod_proxy65_lib.erl index 8e30bb4a6..2e7d44578 100644 --- a/src/mod_proxy65/mod_proxy65_lib.erl +++ b/src/mod_proxy65/mod_proxy65_lib.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov <xram@jabber.ru> %%% %%% -%%% ejabberd, Copyright (C) 2002-2008 Process-one +%%% ejabberd, Copyright (C) 2002-2009 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -16,7 +16,7 @@ %%% but WITHOUT ANY WARRANTY; without even the implied warranty of %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. -%%% +%%% %%% You should have received a copy of the GNU General Public License %%% along with this program; if not, write to the Free Software %%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -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). |