[sr-dev] git:4.1:7ec74722: dialog: use proper flags for script callback that clean dlg shortcuts

Module: kamailio Branch: 4.1 Commit: 7ec74722f6731539aa11db1f5a3322204c17694e URL: https://github.com/kamailio/kamailio/commit/7ec74722f6731539aa11db1f5a33222… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2015-01-24T18:47:34+01:00 dialog: use proper flags for script callback that clean dlg shortcuts (cherry picked from commit b0679c91f22a9eb9b995175b1d1abfb836a5a3f6) (cherry picked from commit 4fa400f262d2426a8a714ec65c5c88ec8e67f733) --- Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/7ec74722f6731539aa11db1f5a33222… Patch: https://github.com/kamailio/kamailio/commit/7ec74722f6731539aa11db1f5a33222… --- diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 566eb0d..0bcaff5 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -639,17 +639,17 @@ static int mod_init(void) return -1; } - if (register_script_cb( spiral_detect_reset, POST_SCRIPT_CB|REQUEST_CB,0)<0) { + if (register_script_cb(spiral_detect_reset,POST_SCRIPT_CB|REQUEST_CB,0)<0) { LM_ERR("cannot register req pre-script spiral detection reset callback\n"); return -1; } - if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|ONREPLY_CB_TYPE,0)<0) { + if (register_script_cb(cb_dlg_locals_reset,POST_SCRIPT_CB|ONREPLY_CB,0)<0) { LM_ERR("cannot register reply post-script dlg locals reset callback\n"); return -1; } - if (register_script_cb( cb_dlg_locals_reset, POST_SCRIPT_CB|FAILURE_CB_TYPE,0)<0) { + if (register_script_cb(cb_dlg_locals_reset,POST_SCRIPT_CB|FAILURE_CB,0)<0) { LM_ERR("cannot register failure post-script dlg locals reset callback\n"); return -1; } diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index fd1e9b0..20a5968 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -78,7 +78,7 @@ int cb_dlg_cfg_reset(sip_msg_t *msg, unsigned int flags, void *cbp) int cb_dlg_locals_reset(sip_msg_t *msg, unsigned int flags, void *cbp) { - LM_DBG("resetting the local dialog shortcuts\n"); + LM_DBG("resetting the local dialog shortcuts on script callback: %u\n", flags); cb_dlg_cfg_reset(msg, flags, cbp); cb_profile_reset(msg, flags, cbp);