May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8735 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 May '08

31 May '08

Author: stkn Date: Sat May 31 16:55:28 2008 New Revision: 8735 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update event callback after db schema changes Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sat May 31 16:55:28 2008 @@ -225,13 +225,13 @@ if (argc >= 3) { if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_EXPIRE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[6]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[8]); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", argv[0]); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[1]); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "host", "%s", argv[2]); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", argv[3]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%s", argv[4]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user-agent", "%s", argv[5]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%s", argv[6]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user-agent", "%s", argv[7]); switch_event_fire(&s_event); } }

1 0

[commit] r8734 - in freeswitch/trunk/src: . mod/languages/mod_spidermonkey
by Freeswitch SVN 31 May '08

31 May '08

Author: anthm Date: Sat May 31 12:48:54 2008 New Revision: 8734 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/trunk/src/switch_core_io.c Log: keep hangup hook in the session thread Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat May 31 12:48:54 2008 @@ -38,18 +38,17 @@ #include <curl/curl.h> #endif static int foo = 0; +static void check_hangup_hook(struct js_session *jss); SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown); SWITCH_MODULE_DEFINITION(mod_spidermonkey, mod_spidermonkey_load, mod_spidermonkey_shutdown, NULL); -#define METHOD_SANITY_CHECK() do { \ -if (!jss || !jss->session) { \ - eval_some_js("~throw new Error(\"You must call the session.originate method before calling this method!\");", cx, obj, rval); \ - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); \ - return JS_FALSE; \ - } \ - } while(foo == 1) +#define METHOD_SANITY_CHECK() if (!jss || !jss->session) { \ + eval_some_js("~throw new Error(\"You must call the session.originate method before calling this method!\");", cx, obj, rval); \ + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); \ + return JS_FALSE; \ + } else check_hangup_hook(jss) #define CHANNEL_SANITY_CHECK() do { \ if (!switch_channel_ready(channel)) { \ @@ -1148,11 +1147,11 @@ jss->stack_depth--; return SWITCH_STATUS_FALSE; } - + check_hangup_hook(jss); JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); - + check_hangup_hook(jss); jss->stack_depth--; return SWITCH_STATUS_SUCCESS; } @@ -1420,7 +1419,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; + check_hangup_hook(jss); switch_ivr_record_file(jss->session, &fh, file_name, &args, limit); + check_hangup_hook(jss); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -1470,7 +1471,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; + check_hangup_hook(jss); switch_ivr_collect_digits_callback(jss->session, &args, to); + check_hangup_hook(jss); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -1544,9 +1547,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; - + check_hangup_hook(jss); switch_ivr_phrase_macro(jss->session, phrase_name, phrase_data, phrase_lang, &args); - + check_hangup_hook(jss); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -1559,7 +1562,8 @@ int argc = 0; jsval ret; - if (jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_ROUTING)) { + if (!jss->check_state && jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_ROUTING)) { + jss->check_state++; argv[argc++] = OBJECT_TO_JSVAL(jss->obj); if (jss->hook_state == CS_HANGUP) { argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(jss->cx, "hangup")); @@ -1579,7 +1583,7 @@ switch_channel_state_t state = switch_channel_get_state(channel); if (jss->hook_state != state) { jss->hook_state = state; - check_hangup_hook(jss); + jss->check_state = 0; } } @@ -1673,7 +1677,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; + check_hangup_hook(jss); switch_ivr_play_file(jss->session, &fh, file_name, &args); + check_hangup_hook(jss); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -1862,7 +1868,9 @@ args.buflen = len; switch_core_speech_flush_tts(&jss->speech->sh); + check_hangup_hook(jss); switch_ivr_speak_text_handle(jss->session, &jss->speech->sh, &jss->speech->codec, NULL, text, &args); + check_hangup_hook(jss); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -2011,7 +2019,7 @@ if (argc > 0) { JS_ValueToInt32(cx, argv[0], &timeout); } - + check_hangup_hook(jss); saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_timestamp_now() - started) / 1000)) > (switch_time_t) timeout) @@ -2029,7 +2037,7 @@ switch_yield(1000); } JS_ResumeRequest(cx, saveDepth); - + check_hangup_hook(jss); return JS_TRUE; } @@ -2050,7 +2058,7 @@ if (argc > 0) { JS_ValueToInt32(cx, argv[0], &timeout); } - + check_hangup_hook(jss); saveDepth = JS_SuspendRequest(cx); for (;;) { if (((elapsed = (unsigned int) ((switch_timestamp_now() - started) / 1000)) > (switch_time_t) timeout) @@ -2067,7 +2075,7 @@ switch_yield(1000); } JS_ResumeRequest(cx, saveDepth); - + check_hangup_hook(jss); return JS_TRUE; } @@ -2097,7 +2105,9 @@ if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { saveDepth = JS_SuspendRequest(cx); + check_hangup_hook(jss); switch_core_session_exec(jss->session, application_interface, app_arg); + check_hangup_hook(jss); JS_ResumeRequest(cx, saveDepth); retval = JS_TRUE; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Sat May 31 12:48:54 2008 @@ -146,6 +146,7 @@ char *rdnis; char *context; char *username; + int check_state; struct js_session_speech *speech; }; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Sat May 31 12:48:54 2008 @@ -634,6 +634,11 @@ status = SWITCH_STATUS_SUCCESS; break; default: + if (ptime_mismatch) { + status = perform_write(session, frame, flags, stream_id); + return SWITCH_STATUS_SUCCESS; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", frame->codec->codec_interface->interface_name); return status; }

1 0

[commit] r8733 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 30 May '08

30 May '08

Author: anthm Date: Fri May 30 17:02:04 2008 New Revision: 8733 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: make global_setvar only have 2 fields so you can set foo=bar=blah w/o quotes Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri May 30 17:02:04 2008 @@ -2246,7 +2246,7 @@ #define GLOBAL_SETVAR_SYNTAX "<var> <value>" SWITCH_STANDARD_API(global_setvar_function) { - char *mycmd = NULL, *argv[3] = { 0 }; + char *mycmd = NULL, *argv[2] = { 0 }; int argc = 0; if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {

1 0

[commit] r8732 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 30 May '08

30 May '08

Author: anthm Date: Fri May 30 16:59:14 2008 New Revision: 8732 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: make mod_portaudio less chatty on startup Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri May 30 16:59:14 2008 @@ -152,7 +152,7 @@ static switch_status_t engage_device(int samplerate, int codec_ms); static switch_status_t engage_ring_device(int sample_rate, int channels); static void deactivate_ring_device(void); -static int dump_info(void); +static int dump_info(int verbose); static switch_status_t load_config(void); static int get_dev_by_name(char *name, int in); static int get_dev_by_number(int number, int in); @@ -690,7 +690,7 @@ Pa_Initialize(); - if (dump_info()) { + if (dump_info(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't find any audio devices!\n"); return SWITCH_STATUS_TERM; } @@ -987,7 +987,7 @@ return SWITCH_STATUS_SUCCESS; } -static int dump_info(void) +static int dump_info(int verbose) { int i, numDevices, defaultDisplayed; const PaDeviceInfo *deviceInfo; @@ -1010,6 +1010,11 @@ } switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "Number of devices = %d\n", numDevices); + + if (!verbose) { + return 0; + } + for (i = 0; i < numDevices; i++) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "%s", line); deviceInfo = Pa_GetDeviceInfo(i); @@ -1082,7 +1087,7 @@ PrintSupportedStandardSampleRates(&inputParameters, &outputParameters); } } - + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "%s", line); return 0; @@ -1615,7 +1620,7 @@ } else if (!strcasecmp(argv[0], "devlist")) { func = devlist; } else if (!strcasecmp(argv[0], "dump")) { - dump_info(); + dump_info(1); goto done; } else if (!strcasecmp(argv[0], "list")) { func = list_calls;

1 0

[commit] r8731 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 30 May '08

30 May '08

Author: mikej Date: Fri May 30 16:29:32 2008 New Revision: 8731 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: don't free reason string passed to nua_respond before we are done using it. (nh scope instead of session) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri May 30 16:29:32 2008 @@ -988,7 +988,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); - nua_respond(tech_pvt->nh, code, reason, TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), + nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); if (!switch_channel_test_flag(channel, CF_ANSWERED)) { @@ -1003,12 +1003,12 @@ sofia_glue_tech_patch_sdp(tech_pvt); sofia_glue_tech_proxy_remote_addr(tech_pvt); } - nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); } else { - nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); } if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri May 30 16:29:32 2008 @@ -91,6 +91,7 @@ #include <sofia-sip/su_log.h> #include <sofia-sip/nea.h> #include <sofia-sip/msg_addr.h> +#include "nua_stack.h" typedef enum { DTMF_2833, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri May 30 16:29:32 2008 @@ -35,7 +35,6 @@ * */ #include "mod_sofia.h" -#include "nua_stack.h" static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg) {

1 0

[commit] r8730 - freeswitch/trunk/src
by Freeswitch SVN 30 May '08

30 May '08

Author: anthm Date: Fri May 30 14:11:05 2008 New Revision: 8730 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add failed_xml_cdr magic variable Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri May 30 14:11:05 2008 @@ -1202,6 +1202,7 @@ } done: + *cause = SWITCH_CAUSE_UNALLOCATED; if (caller_channel && !switch_channel_ready(caller_channel)) { @@ -1216,8 +1217,18 @@ *cause = SWITCH_CAUSE_SUCCESS; } else { + const char *cdr_var = NULL; + int cdr_total = 0; + switch_xml_t cdr; + char *xml_text; + char buf[128] = "", buf2[128] = ""; + + if (caller_channel) { + cdr_var = switch_channel_get_variable(caller_channel, "failed_xml_cdr_prefix"); + } + if (peer_channel) { - *cause = switch_channel_get_cause(peer_channel); + *cause = switch_channel_get_cause(peer_channel); } else { for (i = 0; i < and_argc; i++) { if (!peer_channels[i]) { @@ -1227,6 +1238,28 @@ break; } } + + if (cdr_var) { + for (i = 0; i < and_argc; i++) { + if (!peer_sessions[i]) { + continue; + } + + if (switch_ivr_generate_xml_cdr(peer_sessions[i], &cdr) == SWITCH_STATUS_SUCCESS) { + if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { + switch_snprintf(buf, sizeof(buf), "%s_%d", cdr_var, ++cdr_total); + switch_channel_set_variable(caller_channel, buf, xml_text); + switch_safe_free(xml_text); + } + switch_xml_free(cdr); + cdr = NULL; + } + + } + switch_snprintf(buf, sizeof(buf), "%s_total", cdr_var); + switch_snprintf(buf2, sizeof(buf2), "%d", cdr_total ? cdr_total : 0); + switch_channel_set_variable(caller_channel, buf, buf2); + } if (!*cause) { if (reason) {

1 0

[commit] r8729 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 30 May '08

30 May '08

Author: anthm Date: Fri May 30 13:27:32 2008 New Revision: 8729 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: tweak constructor Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri May 30 13:27:32 2008 @@ -2619,7 +2619,8 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { struct js_session *jss = NULL; - + JSObject *session_obj = NULL; + jss = malloc(sizeof(*jss)); switch_assert(jss); memset(jss, 0, sizeof(*jss)); @@ -2627,10 +2628,31 @@ jss->obj = obj; JS_SetPrivate(cx, obj, jss); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + if (argc > 0) { char *uuid = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - if (uuid) { + + if (!strchr(uuid, '/')) { jss->session = switch_core_session_locate(uuid); + switch_set_flag(jss, S_HUP); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + } else { + struct js_session *old_jss = NULL; + + if (argc > 1) { + if (JS_ValueToObject(cx, argv[1], &session_obj) && session_obj) { + old_jss = JS_GetPrivate(cx, session_obj); + } + } + if (switch_ivr_originate(old_jss ? old_jss->session : NULL, + &jss->session, &jss->cause, uuid, 60, NULL, NULL, NULL, NULL, SOF_NONE) == SWITCH_STATUS_SUCCESS) { + switch_set_flag(jss, S_HUP); + switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_SOFT_EXECUTE); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + } else { + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause))); + } } }

1 0

[commit] r8728 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:56:35 2008 New Revision: 8728 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: double doh Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:56:35 2008 @@ -312,7 +312,7 @@ globals.legs |= CDR_LEG_A; } - if (strchr(val, 'a')) { + if (strchr(val, 'b')) { globals.legs |= CDR_LEG_B; } } else if (!strcasecmp(var, "log-base")) {

1 0

[commit] r8727 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:49:01 2008 New Revision: 8727 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: legs option to cdr_csv doh2 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:49:01 2008 @@ -173,7 +173,7 @@ char *log_line, *path = NULL; if (!((globals.legs & CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { - if ((globals.legs && CDR_LEG_A)) { + if ((globals.legs & CDR_LEG_A)) { if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8726 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:46:49 2008 New Revision: 8726 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: legs option to cdr_csv doh Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:46:49 2008 @@ -172,7 +172,7 @@ const char *log_dir = NULL, *accountcode = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; - if (!((globals.legs && CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { + if (!((globals.legs & CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { if ((globals.legs && CDR_LEG_A)) { if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS;

1 0