Thu, 25 Feb 2010 18:03:15 +0000
Merge with 0.6
core/s2smanager.lua | file | annotate | diff | comparison | revisions | |
net/adns.lua | file | annotate | diff | comparison | revisions |
--- a/core/s2smanager.lua Thu Feb 25 02:01:00 2010 +0000 +++ b/core/s2smanager.lua Thu Feb 25 18:03:15 2010 +0000 @@ -48,7 +48,9 @@ module "s2smanager" -local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end +function compare_srv_priorities(a,b) + return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight); +end local function bounce_sendq(session, reason) local sendq = session.sendq;
--- a/tests/test_core_s2smanager.lua Thu Feb 25 02:01:00 2010 +0000 +++ b/tests/test_core_s2smanager.lua Thu Feb 25 18:03:15 2010 +0000 @@ -30,18 +30,18 @@ assert_equal(csp(r3, r2), false); assert_equal(csp(r3, r3), false); assert_equal(csp(r3, r4), false); - assert_equal(csp(r3, r5), true); + assert_equal(csp(r3, r5), false); assert_equal(csp(r4, r1), false); assert_equal(csp(r4, r2), false); assert_equal(csp(r4, r3), false); assert_equal(csp(r4, r4), false); - assert_equal(csp(r4, r5), true); + assert_equal(csp(r4, r5), false); assert_equal(csp(r5, r1), false); assert_equal(csp(r5, r2), false); - assert_equal(csp(r5, r3), false); - assert_equal(csp(r5, r4), false); + assert_equal(csp(r5, r3), true); + assert_equal(csp(r5, r4), true); assert_equal(csp(r5, r5), false); end