Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stream Management (XEP-0198) #195

Merged
merged 28 commits into from
May 19, 2014
Merged

Stream Management (XEP-0198) #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3cf00de
Apply SM patch set
erszcz Mar 14, 2014
04d9bb0
Import mod_stream_management.erl
erszcz Mar 14, 2014
e61a7fb
Add missing SM namespace
erszcz Mar 17, 2014
e9fc407
Use #xmlel{} instead of #xmlelement{} in SM code
erszcz Mar 17, 2014
5d2cfcc
Use binary datatype in SM code
erszcz Mar 17, 2014
104e639
Apply ejabberd_sm changes needed for SM
erszcz Mar 17, 2014
99f6bdb
Generate binary SMID
erszcz Mar 17, 2014
5b336e6
fix resending of subscription requests
Mar 24, 2014
b8366c5
fix jid_to_string -> jid_to_binary
Mar 27, 2014
642aa3f
fix some error paths
Apr 2, 2014
986e59c
more debug info
Apr 7, 2014
b94d1dd
handle incoming stanzas in resume_session state
Apr 7, 2014
4c6b1a6
fix delay timestamps
Apr 8, 2014
17480a0
don't store delay tags in db
Apr 8, 2014
81b996a
refactoring
Apr 11, 2014
aa9e680
create sid if it is undefined while enabling stream management
Apr 15, 2014
83f51db
deffer checking unacked buffer size constraint
Apr 17, 2014
33959af
allow to set resume timeout (used in sm_SUITE)
Apr 18, 2014
f0768a8
add mod_stream_management to config file
Apr 18, 2014
e642385
move catch send_element to function
Apr 18, 2014
336cfae
send a privacy lists broadcast message immediately because if it is r…
Apr 18, 2014
7305601
Use tests from branch stream-management
michalwski Apr 22, 2014
8ab8bb0
fetch subscription requests every time the user becomes available fro…
Apr 23, 2014
4de6eb9
remove possible delay tags from stanzas incoming directly from user
Apr 23, 2014
bf422b4
print ejabberd.log always
michalwski May 15, 2014
11f439c
fail ci build when 0 tests succeeded
michalwski May 15, 2014
8e88b70
read user sessions only once while routing message
michalwski May 16, 2014
3050fd9
simplify route_message
May 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ language: erlang
before_install: sudo apt-get install libpam0g-dev libexpat1-dev
before_script: tools/travis-setup-db.sh
script: tools/travis-build.sh
after_failure:
- tail -100 dev/mongooseim_node1/log/ejabberd.log

after_script:
- tail -100 dev/mongooseim_node1/log/ejabberd.log
- if [ -s dev/mongooseim_node1/log/crash.log ]; then cat dev/mongooseim_node1/log/crash.log; fi
- cat `ls -1 -d -t test/ejabberd_tests/ct_report/ct_run.* | head -1`/ejabberd_tests.*/run.*/suite.log
services: redis-server
branches:
Expand Down
2 changes: 2 additions & 0 deletions apps/ejabberd/include/jlib.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@

-define(NS_HTTPBIND, <<"http://jabber.org/protocol/httpbind">>).

-define(NS_STREAM_MGNT_3, <<"urn:xmpp:sm:3">>).

% TODO: remove<<"code" attribute (currently it used for backward-compatibility)
-define(STANZA_ERROR(Code, Type, Condition),
{xmlel,<<"error">>,
Expand Down
Loading