diff options
| author | Pablo Polvorin <pablo.polvorin@process-one.net> | 2010-10-12 17:57:07 +0400 |
|---|---|---|
| committer | Pablo Polvorin <pablo.polvorin@process-one.net> | 2010-10-12 17:57:07 +0400 |
| commit | ce9ce8293ba7b5985535e37cfab59c466dc6790f (patch) | |
| tree | 2d6ed1d1a0e069d4784a4430b20ed29eca94ef92 /src/ejabberd_c2s.erl | |
| parent | 0d5f20cae1be1ba37ebb443741c8fa6e477ef1e4 (diff) | |
| parent | 82a8dc7b3ab20aafcfe5e94a219f05af4921b6c2 (diff) | |
Merge branch 'master' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 0a3cfe6b5..074564225 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -71,6 +71,9 @@ -include("ejabberd.hrl"). -include("mod_privacy.hrl"). +%% Copied from ejabberd_socket.erl +-record(socket_state, {sockmod, socket, receiver}). + -define(SETS, gb_sets). -define(DICT, dict). @@ -528,6 +531,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> "(~w) Accepted legacy authentication for ~s by ~s", [StateData#state.socket, exmpp_jid:to_binary(JID), AuthModule]), + erlang:link((StateData#state.socket)#socket_state.receiver), SID = {now(), self()}, Conn = get_conn_type(StateData), %% Info = [{ip, StateData#state.ip}, {conn, Conn}, @@ -664,8 +668,8 @@ wait_for_feature_request({xmlstreamelement, #xmlel{ns = NS, name = Name} = El}, TLSEnabled == false, SockMod == gen_tcp -> ServerString = binary_to_list(StateData#state.server), - TLSOpts = case ejabberd_config:get_local_option( - {domain_certfile, ServerString}) of + TLSOpts = case ejabberd_config:get_local_option + ({domain_certfile, ServerString}) of undefined -> StateData#state.tls_options; CertFile -> @@ -1595,9 +1599,6 @@ get_auth_tags([_ | L], U, P, D, R) -> get_auth_tags([], U, P, D, R) -> {U, P, D, R}. -%% Copied from ejabberd_socket.erl --record(socket_state, {sockmod, socket, receiver}). - get_conn_type(StateData) -> case (StateData#state.sockmod):get_sockmod(StateData#state.socket) of gen_tcp -> c2s; @@ -1606,8 +1607,8 @@ get_conn_type(StateData) -> if is_pid(StateData#state.socket) -> unknown; true -> - case ejabberd_zlib:get_sockmod( - (StateData#state.socket)#socket_state.socket) of + case ejabberd_zlib:get_sockmod + ((StateData#state.socket)#socket_state.socket) of gen_tcp -> c2s_compressed; tls -> c2s_compressed_tls end |