Hello,

thanks for the fix.

Just to point it out for all devs, whenever possible for backports, try to use 'git cherry-pick -x ...' with master branch commit id (some details at http://www.kamailio.org/wiki/devel/backporting-to-3.2.x).

One good advantage is that the command git log with parameter '--cherry-pick' can be used to find which commits are not backported, for example, to get the commits from master not cherry picked in 3.2:

git log --oneline --left-right --cherry-pick origin/3.2...origin/master

Cheers, Daniel

On 5/4/12 11:10 AM, Anca Vamanu wrote:

Module: sip-router Branch: 3.2 Commit: d22d83bfca84f4e50169859eafb23f6b89a91350 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d22d83bf...

Author: Anca Vamanuanca.vamanu@1and1.ro Committer: Anca Vamanuanca.vamanu@1and1.ro Date: Fri May 4 11:45:05 2012 +0300

modules_k/dialog Fixed 2 macros for dialog state with same value

---

modules_k/dialog/dlg_cb.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 8d364ba..2af9bc2 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -76,7 +76,7 @@ typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg, #define DLGCB_RPC_CONTEXT (1<<12) #define DLGCB_DESTROY (1<<13) #define DLGCB_SPIRALED (1<<14) -#define DLGCB_TERMINATED_CONFIRMED (1<<14) +#define DLGCB_TERMINATED_CONFIRMED (1<<15)

struct dlg_callback { int types;

---

sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev