From 9beffb6cf797fda028df9a8d82fc62b144498bdd Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Fri, 12 Aug 2016 16:02:11 +0200 Subject: [PATCH] MT#18839 import 5ec9bf2 - b/f:dsm:mod_conference:set callgroup to conference channel Change-Id: Ic7911598f7df720635b841bc2782b1d556378cd1 (cherry picked from commit 437932f29fccf65e1cefe4328a0a483f4a322c0d) (cherry picked from commit 6c32fc4ba7dbc0f34f39107524fdefd2f85fc7ca) --- debian/patches/series | 1 + ...erence-set-callgroup-to-conference-c.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 debian/patches/sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch diff --git a/debian/patches/series b/debian/patches/series index 477d30a9..5438399b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,3 +18,4 @@ sipwise/0016-core-made-sems-aware-of-rfc5764-media-types-UDP-TLS-.patch sipwise/0017-MT-13599-don-t-create-CF-map-if-CF-is-denied-by-prof.patch no_config.patch py_sems_path.patch +sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch diff --git a/debian/patches/sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch b/debian/patches/sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch new file mode 100644 index 00000000..c2fadbb3 --- /dev/null +++ b/debian/patches/sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch @@ -0,0 +1,27 @@ +From 5ec9bf2d042f90f0f29b7de2bb215a8cf6ba7169 Mon Sep 17 00:00:00 2001 +From: Stefan Sayer +Date: Fri, 12 Aug 2016 12:35:45 +0200 +Subject: [PATCH 2/6] b/f:dsm:mod_conference:set callgroup to conference + channel + +--- + apps/dsm/mods/mod_conference/ModConference.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/apps/dsm/mods/mod_conference/ModConference.cpp b/apps/dsm/mods/mod_conference/ModConference.cpp +index 0028a14..8b2e2ce 100644 +--- a/apps/dsm/mods/mod_conference/ModConference.cpp ++++ b/apps/dsm/mods/mod_conference/ModConference.cpp +@@ -117,6 +117,9 @@ static bool ConferenceJoinChannel(DSMConfChannel** dsm_chan, + DSMSession* sc_sess, + const string& channel_id, + const string& mode) { ++ DBG("changing callgroup for session to %s\n", channel_id.c_str()); ++ sess->changeCallgroup(channel_id); ++ + bool connect_play = false; + bool connect_record = false; + if (mode.empty()) { +-- +2.6.4 (Apple Git-63) +