First pass at making transfer work within agent (not tested, shouldn't break anything that currently worked)

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

2 files changed, 8 insertions, 2 deletions

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index a754129f6..a964ea93a 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -93,8 +93,9 @@ struct ast_channel {
 	/*! 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_transfer(struct ast_channel *chan, char *dest);
 
 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 */
diff --git a/include/asterisk/channel_pvt.h b/include/asterisk/channel_pvt.h
index 97a48f902..4343f09e9 100755
--- a/include/asterisk/channel_pvt.h
+++ b/include/asterisk/channel_pvt.h
@@ -69,6 +69,8 @@ struct ast_channel_pvt {
 	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