|
 |
9fdfac7 |
From: rvlad-patrascu <vladp@opensips.org>
|
|
|
9fdfac7 |
Date: Mon, 16 Oct 2017 17:26:29 +0300
|
|
|
9fdfac7 |
Subject: [PATCH] dialog: also share module flags when replicating dialogs
|
|
|
9fdfac7 |
|
|
|
9fdfac7 |
(cherry picked from commit ad35e7cedc44efd90c58f26a853585ece5883bac)
|
|
|
9fdfac7 |
|
|
|
9fdfac7 |
Conflicts:
|
|
|
9fdfac7 |
modules/dialog/dlg_replication.c
|
|
|
9fdfac7 |
|
|
|
9fdfac7 |
diff --git a/modules/dialog/dlg_replication.c b/modules/dialog/dlg_replication.c
|
|
|
9fdfac7 |
index 1eb94816c..c6c084eb2 100644
|
|
|
9fdfac7 |
--- a/modules/dialog/dlg_replication.c
|
|
|
9fdfac7 |
+++ b/modules/dialog/dlg_replication.c
|
|
|
9fdfac7 |
@@ -193,6 +193,7 @@ int dlg_replicated_create(struct dlg_cell *cell, str *ftag, str *ttag, int safe)
|
|
|
9fdfac7 |
bin_pop_str(&vars);
|
|
|
9fdfac7 |
bin_pop_str(&profiles);
|
|
|
9fdfac7 |
bin_pop_int(&dlg->user_flags);
|
|
|
9fdfac7 |
+ bin_pop_int(&dlg->mod_flags);
|
|
|
9fdfac7 |
bin_pop_int(&dlg->flags);
|
|
|
9fdfac7 |
bin_pop_int((void *) &dlg->tl.timeout);
|
|
|
9fdfac7 |
bin_pop_int(&dlg->legs[DLG_CALLER_LEG].last_gen_cseq);
|
|
|
9fdfac7 |
@@ -335,6 +336,7 @@ int dlg_replicated_update(void)
|
|
|
9fdfac7 |
bin_pop_str(&vars);
|
|
|
9fdfac7 |
bin_pop_str(&profiles);
|
|
|
9fdfac7 |
bin_pop_int(&dlg->user_flags);
|
|
|
9fdfac7 |
+ bin_pop_int(&dlg->mod_flags);
|
|
|
9fdfac7 |
bin_pop_int(&dlg->flags);
|
|
|
9fdfac7 |
|
|
|
9fdfac7 |
bin_pop_int(&timeout);
|
|
|
9fdfac7 |
@@ -513,6 +515,7 @@ void replicate_dialog_created(struct dlg_cell *dlg)
|
|
|
9fdfac7 |
bin_push_str(vars);
|
|
|
9fdfac7 |
bin_push_str(profiles);
|
|
|
9fdfac7 |
bin_push_int(dlg->user_flags);
|
|
|
9fdfac7 |
+ bin_push_int(dlg->mod_flags);
|
|
|
9fdfac7 |
bin_push_int(dlg->flags &
|
|
|
9fdfac7 |
~(DLG_FLAG_NEW|DLG_FLAG_CHANGED|DLG_FLAG_VP_CHANGED));
|
|
|
9fdfac7 |
bin_push_int((unsigned int)time(0) + dlg->tl.timeout - get_ticks());
|
|
|
9fdfac7 |
@@ -595,6 +598,7 @@ void replicate_dialog_updated(struct dlg_cell *dlg)
|
|
|
9fdfac7 |
bin_push_str(vars);
|
|
|
9fdfac7 |
bin_push_str(profiles);
|
|
|
9fdfac7 |
bin_push_int(dlg->user_flags);
|
|
|
9fdfac7 |
+ bin_push_int(dlg->mod_flags);
|
|
|
9fdfac7 |
bin_push_int(dlg->flags &
|
|
|
9fdfac7 |
~(DLG_FLAG_NEW|DLG_FLAG_CHANGED|DLG_FLAG_VP_CHANGED));
|
|
|
9fdfac7 |
bin_push_int((unsigned int)time(0) + dlg->tl.timeout - get_ticks());
|