aboutsummaryrefslogtreecommitdiff
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Don't add 'Record-Route' header for mid-dialog requestsEvgeniy Khramtsov2014-05-311-6/+16
| |
* | Process bindings from multiple UACs correctlyEvgeniy Khramtsov2014-05-311-40/+41
| |
* | Don't substitute URI in ACKEvgeniy Khramtsov2014-05-311-2/+2
|/
* Fix previous commitEvgeniy Khramtsov2014-05-301-4/+4
|
* Process 'Contact' headers more accurately (as per RFC3261)Evgeniy Khramtsov2014-05-302-138/+182
|
* Log just one [info] message on Carbons negotiationHolger Weiss2014-05-291-3/+3
| | | | | | Log one instead of three [info] messages when XEP-0280 (Message Carbons) support is enabled or disabled successfully. On failure, log an additional [warning].
* XEP-0198: Cosmetic change: Reuse event handlerHolger Weiss2014-05-281-5/+1
| | | | | | On stanza queue overflow, pass a message to self() using the exclamation mark operator instead of send_all_state_event/2. This allows for reusing the existing handler for 'kick' events.
* XEP-0198: Terminate session on queue overflowHolger Weiss2014-05-271-10/+17
| | | | | | On queue overflow, terminate the c2s session instead of just dropping items from the queue. This makes sure all stanzas are either delivered or bounced.
* Merge pull request #226 from weiss/simplify-state-changeEvgeny Khramtsov2014-05-271-14/+7
|\ | | | | XEP-0198: Cosmetic change: Simplify state change
| * XEP-0198: Cosmetic change: Simplify state changeHolger Weiss2014-05-271-14/+7
| | | | | | | | | | | | When the FSM goes into the 'wait_for_resume' state, let fsm_next_state/2 take care of updating #state.mgmt_state and of writing the log line. This doesn't change the behavior, but simplifies the code.
* | Let ejabberd_c2s always use fsm_next_state/2Holger Weiss2014-05-271-3/+2
|/ | | | | Make sure any logic implemented in ejabberd_c2s:fsm_next_state/2 is always applied.
* Merge pull request #220 from weiss/handle-send-failureEvgeny Khramtsov2014-05-271-0/+8
|\ | | | | XEP-0198: Don't exit on socket send failure
| * XEP-0198: Don't exit on socket send failureHolger Weiss2014-05-231-0/+8
| | | | | | | | | | | | | | | | | | If stream management is enabled, don't exit the c2s process when ejabberd_socket:send/2 fails, but close the socket instead. This gives the client a chance to resume the session. Thanks go to Matthias Rieber for reporting the issue, providing detailed logs, and testing the fix.
* | Merge pull request #222 from weiss/keep-session-on-failed-resumeEvgeny Khramtsov2014-05-271-6/+11
|\ \ | | | | | | XEP-0198: Don't drop session on failed resume
| * | XEP-0198: Don't drop session on failed resumeHolger Weiss2014-05-231-6/+11
| |/ | | | | | | | | | | | | | | | | | | The 'previd' value provided by the client during a session resume request includes the client's JID and ejabberd's session ID. If there is a session for the requested JID but with a different session ID, resumption should fail, but that session shouldn't be closed. This commit makes sure the latter won't happen. In practice, this will only make a difference in odd corner cases.
* | Merge pull request #221 from weiss/omit-redundant-guardEvgeny Khramtsov2014-05-271-2/+1
|\ \ | | | | | | XEP-0198: Cosmetic change: Omit redundant guard
| * | XEP-0198: Cosmetic change: Omit redundant guardHolger Weiss2014-05-231-2/+1
| |/ | | | | | | | | The stream management state is never 'pending' when the c2s FSM is in the 'session_established' state.
* | Merge pull request #218 from weiss/omit-iq-xmlnsEvgeny Khramtsov2014-05-271-3/+1
|\ \ | | | | | | Omit XML namespace declaration for <iq/> stanzas
| * | Omit XML namespace declaration for <iq/> stanzasHolger Weiss2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Only the child elements of <iq/> stanzas are qualified by the namespaces in question, not the <iq/> stanzas themselves. This change just clarifies the code. It doesn't alter the behaviour, as those <iq/> stanzas are handed over to jlib:iq_to_xml/1, and that function ignores the 'xmlns' attribute anyway.
* | | Fix odbc_port option processingEvgeniy Khramtsov2014-05-271-1/+1
| | |
* | | Don't forget to include 'Contact' header field in 2xx registrar responsesEvgeniy Khramtsov2014-05-261-1/+6
| | |
* | | Fix proxying of ACK requests for 2xx responsesEvgeniy Khramtsov2014-05-232-17/+58
| |/ |/|
* | Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into ↵Badlop2014-05-211-9/+16
|\ \ | | | | | | | | | | | | | | | | | | weiss-check-packet-type Conflicts: src/ejabberd_c2s.erl
| * | XEP-0198: Check whether routed packets are stanzasHolger Weiss2014-05-121-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | Only stanzas are subject to stream management, so when XEP-0198 support is enabled, we must distinguish them from non-stanza elements. This commit adds a send_packet/2 function that can be used in place of send_stanza/2 or send_element/2 whenever a packet is delivered that might or might not be a stanza.
* | | Merge pull request #217 from weiss/fix-extauth-cache-usagebadlop2014-05-211-0/+2
|\ \ \ | | | | | | | | Don't use cached passwords if "extauth_cache: 0"
| * | | Don't use cached passwords if "extauth_cache: 0"Holger Weiss2014-05-201-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | Regarding "extauth_cache", the guide says: "The integer 0 (zero) enables caching for statistics, but doesn't use that cached information to authenticate users." Make sure the cached password isn't used even if the user is currently logged in with another resource.
* | | Merge pull request #216 from lavrin/p1-c2sbadlop2014-05-211-74/+51
|\ \ \ | | | | | | | | Cleanup some pieces of ejabberd_c2s
| * | | Fix check_from/2 formattingRadosław Szymczyszyn2014-05-201-17/+21
| | | |
| * | | Sanitize copy-pasted get_statustag/1Radosław Szymczyszyn2014-05-201-5/+1
| | | |
| * | | Fix formattingRadosław Szymczyszyn2014-05-201-32/+23
| | | |
| * | | Build proceed/compressed elements in a sane wayRadosław Szymczyszyn2014-05-201-20/+6
| | | |
* | | | Merge pull request #207 from weiss/xep-0334badlop2014-05-213-36/+64
|\ \ \ \ | |_|/ / |/| | | Honor XEP-0334: Message Processing Hints
| * | | Don't log MUC messages with <no-store/> hintHolger Weiss2014-05-121-9/+15
| | | | | | | | | | | | | | | | | | | | Honor the <no-store/> and <no-permanent-store/> hints defined in XEP-0334.
| * | | Don't store messages with <no-store/> hintHolger Weiss2014-05-121-11/+28
| | | | | | | | | | | | | | | | Honor the <no-store/> hint defined in XEP-0334.
| * | | Don't carbon copy messages with <no-copy/> hintHolger Weiss2014-05-111-16/+21
| | | | | | | | | | | | | | | | Honor the <no-copy/> hint defined in XEP-0334.
* | | | If log uses file:write, no need to double escape ~ in messages (EJAB-1696)Badlop2014-05-201-2/+2
| |/ / |/| |
* | | MUC messages with ~ were not logged (EJAB-1696)Badlop2014-05-191-1/+3
| | |
* | | Fix bug when joining empty pathBadlop2014-05-141-0/+1
| | |
* | | Don't miss incoming presence updatesHolger Weiss2014-05-141-1/+1
| |/ |/|
* | Rename disconnect_user/2 commandHolger Weiss2014-05-122-5/+5
|/ | | | | The mod_admin_extra module provides a kick_session/4 command. Rename the disconnect_user/2 command to kick_user/2 for consistency.
* Merge pull request #205 from weiss/xep-019814.05Evgeny Khramtsov2014-05-101-9/+16
|\ | | | | XEP-0198: Improve handling of incorrect stanza counts reported by client
| * XEP-0198: Improve handling of too large 'h' valuesHolger Weiss2014-05-091-7/+14
| | | | | | | | | | | | | | | | If the client says that it handled more stanzas than we sent (due to a bug in the client's or in our code), increase our outgoing stanza count accordingly. There's no point in sticking to the old value even if it was correct, as the client surely won't fix its count during the current session.
| * XEP-0198: Reject <resume/> with negative 'h' valueHolger Weiss2014-05-091-1/+1
| | | | | | | | | | | | | | Make sure the 'h' attribute sent with a <resume/> request is nonnegative, as mandated by XEP-0198. We already have this check for <a/> elements.
| * XEP-0198: Don't warn on invalid ACK elementsHolger Weiss2014-05-091-2/+2
| | | | | | | | | | | | Do not log a warning (but only a debug message) if the client sends an invalid </a> packet. Some clients do that occasionally, and there's nothing server admininistrators could do about that.
* | Do not try to retreive vCards via local SM for foreign JIDsEvgeniy Khramtsov2014-05-091-11/+18
|/
* Fix previous commit (C2S session close on server shutdown)Evgeniy Khramtsov2014-05-081-1/+1
|
* Fix C2S session close on server shutdownEvgeniy Khramtsov2014-05-082-4/+17
|
* TURN support (EJAB-1017)Evgeniy Khramtsov2014-05-083-13/+96
|
* Merge pull request #203 from hamano/added_get_random_pid_error_handlingEvgeny Khramtsov2014-05-083-2/+4
|\ | | | | improve error handling when sql calling with (empty|unknown) host.
| * improve error handling when sql calling with (empty|unknown) host.HAMANO Tsukasa2014-05-013-2/+4
| | | | | | | | see #191