]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'moy.iodump'
authorMoises Silva <moy@sangoma.com>
Mon, 6 Dec 2010 12:34:25 +0000 (07:34 -0500)
committerMoises Silva <moy@sangoma.com>
Mon, 6 Dec 2010 12:34:25 +0000 (07:34 -0500)
1  2 
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c

index 4e903ee907e94a63359921affb3877da9f4313ce,e7e4ad68d398634200ea935c5e1c71aa9a04ccea..78435a70eecb43a1a98269d750ce8dcc364911ec
@@@ -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);
        }