From: Moises Silva <moy@sangoma.com>
Date: Mon, 6 Dec 2010 12:34:25 +0000 (-0500)
Subject: Merge branch 'moy.iodump'
X-Git-Tag: v1.2-rc1~243^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=004cc9d7aa52ee541514490c66c5e517830be8b9;p=thirdparty%2Ffreeswitch.git

Merge branch 'moy.iodump'
---

004cc9d7aa52ee541514490c66c5e517830be8b9
diff --cc libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index 4e903ee907,e7e4ad68d3..78435a70ee
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@@ -1210,12 -1263,11 +1263,12 @@@ static FIO_CONFIGURE_SPAN_SIGNALING_FUN
  	openr2_context_set_metering_pulse_timeout(r2data->r2context, r2conf.metering_pulse_timeout);
  	openr2_context_set_double_answer(r2data->r2context, r2conf.double_answer);
  	openr2_context_set_immediate_accept(r2data->r2context, r2conf.immediate_accept);
 +	openr2_context_set_span_id(r2data->r2context, span->span_id);
  
- 	if (r2conf.logdir && r2conf.logdir[0]) {
- 		ftdm_log(FTDM_LOG_DEBUG, "Setting openr2 for span %s logdir to %s\n", span->name, r2conf.logdir);
- 		openr2_context_set_log_directory(r2data->r2context, r2conf.logdir);
- 	}
+ 	ftdm_log(FTDM_LOG_DEBUG, "Setting span %s logdir to %s\n", span->name, r2conf.logdir);
+ 	openr2_context_set_log_directory(r2data->r2context, r2conf.logdir);
+ 	snprintf(r2data->logdir, sizeof(r2data->logdir), "%s", r2conf.logdir);
+ 
  	if (r2conf.advanced_protocol_file) {
  		openr2_context_configure_from_advanced_file(r2data->r2context, r2conf.advanced_protocol_file);
  	}