[sr-dev] git:master:69a41cea: Merge branch 'master' of https://github.com/kamailio/kamailio

Module: kamailio Branch: master Commit: 69a41ceab86317e7f77989ad145c9caafd49e444 URL: https://github.com/kamailio/kamailio/commit/69a41ceab86317e7f77989ad145c9ca… Author: The Root <root(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2016-10-19T12:01:08+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio # By Federico Cabiddu # Via Federico Cabiddu (1) and GitHub (1) * 'master' of https://github.com/kamailio/kamailio: modules/tmx: fix mi command t_uac_cancel --- Modified: modules/tmx/t_mi.c --- Diff: https://github.com/kamailio/kamailio/commit/69a41ceab86317e7f77989ad145c9ca… Patch: https://github.com/kamailio/kamailio/commit/69a41ceab86317e7f77989ad145c9ca… --- diff --git a/modules/tmx/t_mi.c b/modules/tmx/t_mi.c index c3b14fb..d6ada3e 100644 --- a/modules/tmx/t_mi.c +++ b/modules/tmx/t_mi.c @@ -641,6 +641,7 @@ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) init_cancel_info(&cancel_data); cancel_data.cancel_bitmap = ~0; /*all branches*/ + _tmx_tmb.prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); _tmx_tmb.unref_cell(trans);