[Asterisk-cvs] asterisk/include/asterisk channel.h,1.39,1.40 channel_pvt.h,1.12,1.13

[markster at lists.digium.com]

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

Modified Files:
	channel.h channel_pvt.h 
Log Message:
Add support for parking with IAX2


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- channel.h	27 Feb 2004 06:15:49 -0000	1.39
+++ channel.h	4 Mar 2004 01:11:25 -0000	1.40
@@ -777,6 +777,8 @@
    and 1 if supported and requested */
 int ast_transfer(struct ast_channel *chan, char *dest);
 
+int ast_do_masquerade(struct ast_channel *chan, int grablock);
+
 /* Misc. functions below */
 
 //! Waits for activity on a group of channels

Index: channel_pvt.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel_pvt.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- channel_pvt.h	28 Jun 2003 16:40:02 -0000	1.12
+++ channel_pvt.h	4 Mar 2004 01:11:25 -0000	1.13
@@ -60,7 +60,7 @@
 	/*! Indicate a particular condition (e.g. AST_CONTROL_BUSY or AST_CONTROL_RINGING or AST_CONTROL_CONGESTION */
 	int (*indicate)(struct ast_channel *c, int condition);
 	/*! Fix up a channel:  If a channel is consumed, this is called.  Basically update any ->owner links */
-	int (*fixup)(struct ast_channel *oldchan, struct ast_channel *newchan);
+	int (*fixup)(struct ast_channel *oldchan, struct ast_channel *newchan, int lock);
 	/*! Set a given option */
 	int (*setoption)(struct ast_channel *chan, int option, void *data, int datalen);
 	/*! Query a given option */