[Asterisk-cvs] asterisk-addons/res_perl AstAPIBase.c, 1.4, 1.5 AstAPIBase_wrap.c, 1.4, 1.5

[anthm at lists.digium.com]

Update of /usr/cvsroot/asterisk-addons/res_perl
In directory mongoose.digium.com:/tmp/cvs-serv25001

Modified Files:
	AstAPIBase.c AstAPIBase_wrap.c 
Log Message:
merge in updates to keep up with CVS

Index: AstAPIBase.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/res_perl/AstAPIBase.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- AstAPIBase.c	15 Nov 2004 14:29:21 -0000	1.4
+++ AstAPIBase.c	9 Jan 2005 15:06:06 -0000	1.5
@@ -668,44 +668,40 @@
 
 
 int asterisk_bridge_call(struct ast_channel *chan, struct ast_channel *peer, int allowredir_in, int allowredir_out, int allowdisconnect) {
-	struct ast_bridge_config config;
+	struct ast_bridge_config bconfig;
   
 	if(!chan || !peer) {
 		ast_log(LOG_WARNING, "No Channel!\n");
 		return -1;
 	}
   
-	memset(&config,0,sizeof(struct ast_bridge_config));
-	config.allowredirect_in = allowredir_in;
-	config.allowredirect_out = allowredir_out;
-	config.allowdisconnect_in = allowdisconnect;
-	config.allowdisconnect_out = allowdisconnect;
-	return ast_bridge_call(chan,peer,&config);
+	memset(&bconfig,0,sizeof(struct ast_bridge_config));
+	bconfig.features_caller |= AST_FEATURE_DISCONNECT;
+	bconfig.features_callee |= AST_FEATURE_DISCONNECT;
+	return ast_bridge_call(chan,peer,&bconfig);
 	
 }
 
 
 
 int asterisk_bridge_call_long(struct ast_channel *chan, struct ast_channel *peer, int allowredir_in, int allowredir_out, int allowdisconnect_in, int allowdisconnect_out,long timelimit,long play_warning,long warning_freq,char *warning_sound,char *end_sound,char *start_sound) {
-	struct ast_bridge_config config;
+	struct ast_bridge_config bconfig;
   
 	if(!chan || !peer) {
 		ast_log(LOG_WARNING, "No Channel!\n");
 		return -1;
 	}
   
-	memset(&config,0,sizeof(struct ast_bridge_config));
-	config.allowredirect_in = allowredir_in;
-	config.allowredirect_out = allowredir_out;
-	config.allowdisconnect_in = allowdisconnect_in;
-	config.allowdisconnect_out = allowdisconnect_out;
-	config.timelimit = timelimit;
-	config.play_warning = play_warning;
-	config.warning_freq = warning_freq;
-	config.warning_sound = warning_sound;
-	config.end_sound = end_sound;
-	config.start_sound = start_sound;
-	return ast_bridge_call(chan,peer,&config);
+	memset(&bconfig,0,sizeof(struct ast_bridge_config));
+	bconfig.features_caller |= AST_FEATURE_DISCONNECT;
+	bconfig.features_callee |= AST_FEATURE_DISCONNECT;
+	bconfig.timelimit = timelimit;
+	bconfig.play_warning = play_warning;
+	bconfig.warning_freq = warning_freq;
+	bconfig.warning_sound = warning_sound;
+	bconfig.end_sound = end_sound;
+	bconfig.start_sound = start_sound;
+	return ast_bridge_call(chan,peer,&bconfig);
 	
 }