[Asterisk-cvs] asterisk/include/asterisk channel.h, 1.57, 1.58 channel_pvt.h, 1.14, 1.15

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv444/include/asterisk

Modified Files:
	channel.h channel_pvt.h 
Log Message:
First pass at making transfer work within agent (not tested, shouldn't break anything that currently worked)


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- channel.h	3 Oct 2004 04:19:58 -0000	1.57
+++ channel.h	23 Oct 2004 12:19:47 -0000	1.58
@@ -93,8 +93,9 @@
 	/*! Whether or not the generator should be interrupted by write */
 	int writeinterrupt;
 
-	/*! Who are we bridged to, if we're bridged */
-	struct ast_channel *bridge;
+	/*! Who are we bridged to, if we're bridged  Do not access directly,
+	    use ast_bridged_channel(chan) */
+	struct ast_channel *_bridge;
 	/*! Who did we call? */
 	struct ast_channel *dialed;
 	/*! Who called us? */
@@ -815,6 +816,9 @@
 
 int ast_do_masquerade(struct ast_channel *chan);
 
+/* Find bridged channel */
+struct ast_channel *ast_bridged_channel(struct ast_channel *chan);
+
 /* Misc. functions below */
 
 /* Helper function for migrating select to poll */

Index: channel_pvt.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel_pvt.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- channel_pvt.h	6 Apr 2004 22:17:32 -0000	1.14
+++ channel_pvt.h	23 Oct 2004 12:19:47 -0000	1.15
@@ -69,6 +69,8 @@
 	int (*transfer)(struct ast_channel *chan, char *newdest);
 	/*! Write a frame, in standard format */
 	int (*write_video)(struct ast_channel *chan, struct ast_frame *frame);
+	/*! Find bridged channel */
+	struct ast_channel * (*bridged_channel)(struct ast_channel *chan, struct ast_channel *bridge);
 };
 
 //! Create a channel structure