Merged revisions 293530 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293530 | rmudgett | 2010-11-01 12:29:30 -0500 (Mon, 01 Nov 2010) | 10 lines
  
  Analog 3-way call would not connect all parties if one was using sig_pri.
  
  Also the "dahdi show channel" would not show the correct 3-way call
  status.
  
  * Synchronized the inthreeway flag between chan_dahdi and sig_analog.
  
  * Fixed a my_set_linear_mode() sign error and made take an analog sub
  channel enum.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293531 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 21 insertions, 10 deletions

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 64bfd3295..e44d0d975 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -2068,19 +2068,26 @@ static void my_deadlock_avoidance_private(void *pvt)
 /* linear_mode = 0 - turn linear mode off, >0 - turn linear mode on
 * 	returns the last value of the linear setting 
 */ 
-static int my_set_linear_mode(void *pvt, int idx, int linear_mode)
+static int my_set_linear_mode(void *pvt, enum analog_sub sub, int linear_mode)
 {
 	struct dahdi_pvt *p = pvt;
 	int oldval;
+	int idx = analogsub_to_dahdisub(sub);
 	
-    if (0 > linear_mode || !dahdi_setlinear(p->subs[idx].dfd, linear_mode)) {
-        return -1;
-    }
+	dahdi_setlinear(p->subs[idx].dfd, linear_mode);
 	oldval = p->subs[idx].linear;
-	p->subs[idx].linear = linear_mode;
+	p->subs[idx].linear = linear_mode ? 1 : 0;
 	return oldval;
 }
 
+static void my_set_inthreeway(void *pvt, enum analog_sub sub, int inthreeway)
+{
+	struct dahdi_pvt *p = pvt;
+	int idx = analogsub_to_dahdisub(sub);
+
+	p->subs[idx].inthreeway = inthreeway;
+}
+
 static int get_alarms(struct dahdi_pvt *p);
 static void handle_alarms(struct dahdi_pvt *p, int alms);
 static void my_get_and_handle_alarms(void *pvt)
@@ -2382,24 +2389,27 @@ static void my_swap_subchannels(void *pvt, enum analog_sub a, struct ast_channel
 	struct dahdi_pvt *p = pvt;
 	int da, db;
 	int tchan;
+	int tinthreeway;
 
 	da = analogsub_to_dahdisub(a);
 	db = analogsub_to_dahdisub(b);
 
 	tchan = p->subs[da].chan;
-
 	p->subs[da].chan = p->subs[db].chan;
-
 	p->subs[db].chan = tchan;
 
+	tinthreeway = p->subs[da].inthreeway;
+	p->subs[da].inthreeway = p->subs[db].inthreeway;
+	p->subs[db].inthreeway = tinthreeway;
+
+	p->subs[da].owner = ast_a;
+	p->subs[db].owner = ast_b;
+
 	if (ast_a)
 		ast_channel_set_fd(ast_a, 0, p->subs[da].dfd);
 	if (ast_b)
 		ast_channel_set_fd(ast_b, 0, p->subs[db].dfd);
 
-	p->subs[da].owner = ast_a;
-	p->subs[db].owner = ast_b;
-
 	wakeup_sub(p, a);
 	wakeup_sub(p, b);
 
@@ -3503,6 +3513,7 @@ static struct analog_callback dahdi_analog_callbacks =
 	.decrease_ss_count = my_decrease_ss_count,
 	.distinctive_ring = my_distinctive_ring,
 	.set_linear_mode = my_set_linear_mode,
+	.set_inthreeway = my_set_inthreeway,
 	.get_and_handle_alarms = my_get_and_handle_alarms,
 	.get_sigpvt_bridged_channel = my_get_sigpvt_bridged_channel,
 	.get_sub_fd = my_get_sub_fd,