December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6997 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: brian Date: Thu Dec 27 17:26:18 2007 New Revision: 6997 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: woops didn't mean to commit this Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 27 17:26:18 2007 @@ -113,10 +113,10 @@ <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> - <anti-action application="set" data="left_hanging_extension=5900"/> <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> +  <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/> <anti-action application="answer"/> <anti-action application="sleep" data="1000"/> @@ -184,7 +184,7 @@ <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> - <action application="reject" data="484 Address Incomplete"/> + <action application="transfer" data="$1 enum"/> </condition> </extension>

1 0

[commit] r6996 - freeswitch/trunk/src
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: anthm Date: Thu Dec 27 17:24:30 2007 New Revision: 6996 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: adj Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Dec 27 17:24:30 2007 @@ -236,7 +236,8 @@ { switch_channel_t *channel = NULL; switch_ivr_bridge_data_t *bd; - + switch_channel_state_t state; + channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); @@ -252,9 +253,11 @@ } switch_channel_clear_state_handler(channel, &audio_bridge_peer_state_handlers); - if (!switch_channel_test_flag(channel, CF_TRANSFER) && switch_channel_get_state(channel) == CS_LOOPBACK) { + state = switch_channel_get_state(channel); + + if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_RING) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - } + } return SWITCH_STATUS_FALSE; } @@ -328,6 +331,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM TRANSMIT\n", switch_channel_get_name(channel)); switch_channel_clear_state_handler(channel, NULL); + switch_channel_clear_flag(channel, CF_TRANSFER); if (!switch_channel_test_flag(channel, CF_ORIGINATOR)) { return SWITCH_STATUS_SUCCESS; @@ -553,7 +557,8 @@ switch_channel_t *caller_channel, *peer_channel; int stream_id = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; - + switch_channel_state_t state; + switch_assert(session != NULL); switch_assert(peer_session != NULL); @@ -565,6 +570,9 @@ peer_channel = switch_core_session_get_channel(peer_session); switch_assert(peer_channel != NULL); + switch_channel_clear_flag(caller_channel, CF_TRANSFER); + switch_channel_clear_flag(peer_channel, CF_TRANSFER); + a_leg = switch_core_session_alloc(session, sizeof(*a_leg)); b_leg = switch_core_session_alloc(peer_session, sizeof(*b_leg)); @@ -660,6 +668,7 @@ if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_LOOPBACK) { switch_channel_set_state(peer_channel, CS_RESET); } + while (switch_channel_get_state(peer_channel) == CS_LOOPBACK) { switch_yield(1000); } @@ -682,10 +691,12 @@ done: + state = switch_channel_get_state(caller_channel); + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER)) { - if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && - switch_channel_get_state(caller_channel) < CS_HANGUP && - switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { + if ((state != CS_EXECUTE && state != CS_PARK && state != CS_RING) || + (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && + switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); } }

1 0

[commit] r6995 - in freeswitch/trunk: scripts/js_modules src/mod/languages/mod_spidermonkey
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: anthm Date: Thu Dec 27 15:45:26 2007 New Revision: 6995 Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: change callback prototype on js (will break all callback scripts) Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm ============================================================================== --- freeswitch/trunk/scripts/js_modules/SpeechTools.jm (original) +++ freeswitch/trunk/scripts/js_modules/SpeechTools.jm Thu Dec 27 15:45:26 2007 @@ -147,7 +147,7 @@ } /* Callback function for streaming,TTS or bridged calls */ - this.onInput = function(type, inputEvent, _this) { + this.onInput = function(s, type, inputEvent, _this) { if (type == "event") { var speech_type = inputEvent.getHeader("Speech-Type"); var rv = new Array(); 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 Thu Dec 27 15:45:26 2007 @@ -760,6 +760,111 @@ }; +/* Dtmf Object */ +/*********************************************************************************/ +static JSBool dtmf_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + if (argc > 0) { + switch_dtmf_t *dtmf; + int32_t duration = SWITCH_DEFAULT_DTMF_DURATION; + char *ename; + + if (argc > 0) { + ename = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + } else { + eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval); + return JS_FALSE; + } + + if (argc > 1) { + JS_ValueToInt32(cx, argv[1], &duration); + if (duration <= 0) { + duration = SWITCH_DEFAULT_DTMF_DURATION; + } + } + + if ((dtmf = malloc(sizeof(*dtmf)))) { + JS_SetPrivate(cx, obj, dtmf); + return JS_TRUE; + } + } + + return JS_FALSE; +} + +static void dtmf_destroy(JSContext * cx, JSObject * obj) +{ + switch_dtmf_t *dtmf = JS_GetPrivate(cx, obj); + + if (dtmf) { + switch_safe_free(dtmf); + JS_SetPrivate(cx, obj, NULL); + } +} + +enum dtmf_tinyid { + DTMF_DIGIT, DTMF_DURATION +}; + +static JSFunctionSpec dtmf_methods[] = { + {0} +}; + + +static JSPropertySpec dtmf_props[] = { + {"digit", DTMF_DIGIT, JSPROP_READONLY | JSPROP_PERMANENT}, + {"duration", DTMF_DURATION, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + + +static JSBool dtmf_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp) +{ + JSBool res = JS_TRUE; + switch_dtmf_t *dtmf = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + if (!dtmf) { + *vp = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + + name = JS_GetStringBytes(JS_ValueToString(cx, id)); + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } + + switch (param) { + case DTMF_DIGIT: + { + char tmp[2] = { dtmf->digit, '\0' }; + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, tmp)); + } + break; + + case DTMF_DURATION: + { + *vp = INT_TO_JSVAL((int)dtmf->duration); + } + break; + } + + return res; +} + +JSClass dtmf_class = { + "DTMF", JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, dtmf_getProperty, DEFAULT_SET_PROPERTY, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, dtmf_destroy, NULL, NULL, NULL, + dtmf_construct +}; + + static void js_error(JSContext * cx, const char *message, JSErrorReport * report) { const char *filename = __FILE__; @@ -977,11 +1082,29 @@ return Event; } + +JSObject *new_js_dtmf(switch_dtmf_t *dtmf, char *name, JSContext * cx, JSObject * obj) +{ + JSObject *DTMF = NULL; + switch_dtmf_t *ddtmf; + + if ((ddtmf = malloc(sizeof(*ddtmf)))) { + *ddtmf = *dtmf; + if ((DTMF = JS_DefineObject(cx, obj, name, &dtmf_class, NULL, 0))) { + JS_SetPrivate(cx, DTMF, ddtmf); + JS_DefineProperties(cx, DTMF, dtmf_props); + JS_DefineFunctions(cx, DTMF, dtmf_methods); + } else { + abort(); + } + } + return DTMF; +} + #define MAX_STACK_DEPTH 2 static switch_status_t js_common_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - char dtmf[2] = ""; switch_event_t *event = NULL; struct input_callback_state *cb_state = buf; struct js_session *jss = cb_state->session_state; @@ -997,6 +1120,15 @@ jss->stack_depth++; + + if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) { + argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_a); + } else if (cb_state->jss_b && cb_state->jss_b->session && cb_state->jss_b->session == session) { + argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_b); + } else { + argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state); + } + switch (itype) { case SWITCH_INPUT_TYPE_EVENT: if ((event = (switch_event_t *) input)) { @@ -1012,11 +1144,14 @@ break; case SWITCH_INPUT_TYPE_DTMF: { - switch_dtmf_t *_dtmf = (switch_dtmf_t *) input; - dtmf[0] = _dtmf->digit; - dtmf[1] = '\0'; - argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); - argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, dtmf)); + switch_dtmf_t *dtmf = (switch_dtmf_t *) input; + + if (dtmf) { + if ((Event = new_js_dtmf(dtmf, "_XX_DTMF_XX_", cb_state->cx, cb_state->obj))) { + argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); + argv[argc++] = OBJECT_TO_JSVAL(Event); + } + } } break; } @@ -1025,11 +1160,7 @@ argv[argc++] = cb_state->arg; } - if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) { - argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_a); - } else if (cb_state->jss_b && cb_state->jss_b->session && cb_state->jss_b->session == session) { - argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_b); - } + if (jss->stack_depth > MAX_STACK_DEPTH) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH); @@ -3247,6 +3378,8 @@ JS_InitClass(cx, javascript_object, NULL, &event_class, event_construct, 3, event_props, event_methods, event_props, event_methods); + JS_InitClass(cx, javascript_object, NULL, &dtmf_class, dtmf_construct, 3, dtmf_props, dtmf_methods, dtmf_props, dtmf_methods); + JS_InitClass(cx, javascript_object, NULL, &pcre_class, pcre_construct, 3, pcre_props, pcre_methods, pcre_props, pcre_methods); return 1;

1 0

[commit] r6994 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: brian Date: Thu Dec 27 14:06:02 2007 New Revision: 6994 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: woops Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 27 14:06:02 2007 @@ -176,7 +176,6 @@ <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/> - <action application="record" data=""/> <action application="playback" data="$${moh_uri}"/> </condition> </extension>

1 0

[commit] r6993 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: brian Date: Thu Dec 27 13:59:49 2007 New Revision: 6993 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: update for usage of export Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 27 13:59:49 2007 @@ -88,9 +88,8 @@ <extension name="extension-intercom"> <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> - <action application="set" data="sip_h_Call-Info=<sip:$${local_ip_v4}>;answer-after=0"/> - <action application="set" data="sip_auto_answer=true"/> - <action application="set" data="export_vars=sip_h_Call-Info,sip_auto_answer"/> + <action application="export" data="sip_h_Call-Info=<sip:$${domain}>;answer-after=0"/> + <action application="export" data="sip_auto_answer=true"/> <action application="bridge" data="user/${dialed_ext}@$${domain}"/> </condition> </extension> @@ -114,6 +113,7 @@ <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> + <anti-action application="set" data="left_hanging_extension=5900"/> <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> @@ -176,6 +176,7 @@ <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/> + <action application="record" data=""/> <action application="playback" data="$${moh_uri}"/> </condition> </extension> @@ -184,7 +185,7 @@ <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> - <action application="transfer" data="$1 enum"/> + <action application="reject" data="484 Address Incomplete"/> </condition> </extension>

1 0

[commit] r6992 - freeswitch/trunk/src/mod/applications/mod_soundtouch
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: anthm Date: Thu Dec 27 13:23:15 2007 New Revision: 6992 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Log: fix overlooked dtmf changed Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Thu Dec 27 13:23:15 2007 @@ -55,7 +55,7 @@ int literal; }; -static switch_status_t on_dtmf(switch_core_session_t *session, const char *dtmf) +static switch_status_t on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf) { switch_media_bug_t *bug; @@ -65,88 +65,81 @@ struct soundtouch_helper *sth = (struct soundtouch_helper *) switch_core_media_bug_get_user_data(bug); if (sth) { - const char *p; - if (sth->literal) { sth->literal = 0; return SWITCH_STATUS_SUCCESS; } - for (p = dtmf; p && *p; p++) { - if (sth->literal) { - sth->literal = 0; - return SWITCH_STATUS_SUCCESS; - } + + switch(dtmf->digit) { + case '*': + sth->literal++; + break; + case '3': + sth->semi += .5; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + break; + case '2': + sth->semi = 0; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + break; + case '1': + sth->semi -= .5; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + break; - switch(*p) { - case '*': - sth->literal++; - break; - case '3': - sth->semi += .5; - sth->st->setPitchSemiTones(sth->semi); - sth->st->flush(); - break; - case '2': - sth->semi = 0; - sth->st->setPitchSemiTones(sth->semi); - sth->st->flush(); - break; - case '1': - sth->semi -= .5; - sth->st->setPitchSemiTones(sth->semi); - sth->st->flush(); - break; - - case '6': - sth->pitch += .2; - sth->st->setPitch(sth->pitch); - sth->st->flush(); - break; - case '5': - sth->pitch = 1; - sth->st->setPitch(sth->pitch); - sth->st->flush(); - break; - case '4': - sth->pitch -= .2; - if (sth->pitch <= 0) { - sth->pitch = .2; - } - sth->st->setPitch(sth->pitch); - sth->st->flush(); - break; - - case '9': - sth->octaves += .2; - sth->st->setPitchOctaves(sth->octaves); - sth->st->flush(); - break; - case '8': - sth->octaves = 0; - sth->st->setPitchOctaves(sth->octaves); - sth->st->flush(); - break; - case '7': - sth->octaves -= .2; - sth->st->setPitchOctaves(sth->octaves); - sth->st->flush(); - break; - - - case '0': - sth->octaves = 0; - sth->st->setPitchOctaves(sth->octaves); - sth->pitch = 1; - sth->st->setPitch(sth->pitch); - sth->semi = 0; - sth->st->setPitchSemiTones(sth->semi); - sth->st->flush(); - + case '6': + sth->pitch += .2; + sth->st->setPitch(sth->pitch); + sth->st->flush(); + break; + case '5': + sth->pitch = 1; + sth->st->setPitch(sth->pitch); + sth->st->flush(); + break; + case '4': + sth->pitch -= .2; + if (sth->pitch <= 0) { + sth->pitch = .2; } + sth->st->setPitch(sth->pitch); + sth->st->flush(); + break; + case '9': + sth->octaves += .2; + sth->st->setPitchOctaves(sth->octaves); + sth->st->flush(); + break; + case '8': + sth->octaves = 0; + sth->st->setPitchOctaves(sth->octaves); + sth->st->flush(); + break; + case '7': + sth->octaves -= .2; + sth->st->setPitchOctaves(sth->octaves); + sth->st->flush(); + break; + + + case '0': + sth->octaves = 0; + sth->st->setPitchOctaves(sth->octaves); + sth->pitch = 1; + sth->st->setPitch(sth->pitch); + sth->semi = 0; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + } + } + return SWITCH_STATUS_FALSE; }

1 0

[commit] r6991 - freeswitch/trunk/conf/directory
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: brian Date: Thu Dec 27 01:06:05 2007 New Revision: 6991 Modified: freeswitch/trunk/conf/directory/default.xml Log: lets turn this on by default Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Thu Dec 27 01:06:05 2007 @@ -5,6 +5,10 @@ <param name="dial-string" value="{transfer_fallback_extension=${dialed_user}}sofia/${dialed_domain}/${dialed_user}"/> </params> + <variables> + <variable name="record_stereo" value="true"/> + </variables> + <X-PRE-PROCESS cmd="include" data="default/*.xml"/> </domain> </include>

1 0

[commit] r6990 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: trixter Date: Wed Dec 26 22:43:16 2007 New Revision: 6990 Added: freeswitch/trunk/scripts/contrib/trixter/jp.pl (contents, props changed) Log: test program, note that echo doesnt seem to work. in addition record with only a duration set doesnt cut off after the duration specified Added: freeswitch/trunk/scripts/contrib/trixter/jp.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/jp.pl Wed Dec 26 22:43:16 2007 @@ -0,0 +1,52 @@ +#!/usr/bin/perl +use FreeSWITCH::Client; +use Data::Dumper; + +my $fs = init FreeSWITCH::Client {} or die "Error $@"; +my $pid; + +for (;;) { + $fs->accept(); + + if (!($pid = fork)) { + last; + } +} + +my $data = $fs->call_data(); + +#print Dumper $data +print "Call: $data->{'caller-channel-name'} $data->{'unique-id'}\n"; + + +$o = $fs->call_command("answer"); +#to turn on events when in async mode +$o = $fs->raw_command("myevents"); +$o = $fs->call_command("playback","/sounds/you-have-reached-a-test-number.wav"); +$o = $fs->call_command("record","/tmp/recording.wav 5 300 5"); +$o = $fs->call_command("playback","/tmp/recording.wav"); +$o = $fs->call_command("echo"); + + +#comment exit in async mode +#exit; + +while(my $r = $fs->readhash(undef)) { + if ($r->{socketerror}) { + last; + } + + if ($r->{has_event}) { + print Dumper $r->{event}; + } + if ($r->{event}->{'event-name'} !~ /execute/i) { + printf "wtf $data->{'unique-id'}\n"; + $o = $fs->call_command("break"); + $o = $fs->call_command("hangup"); + } +} + +$fs->disconnect(); +print "done\n"; + +

1 0

[commit] r6989 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: brian Date: Wed Dec 26 20:50:29 2007 New Revision: 6989 Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Log: add snom cdr profile Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Wed Dec 26 20:50:29 2007 @@ -9,7 +9,8 @@ </settings> <templates> <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> - <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec},"${sip_user_agent}"</template> + <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}"</template> + <template name="snom">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec},"${sip_user_agent}","${call_clientcode}","${sip_rtp_rxstat}","${sip_rtp_txstat}"</template> <template name="asterisk">"${accountcode}","${caller_id_number}","${destination_number}","${context}","${caller_id}","${channel_name}","${bridge_channel}","${last_app}","${last_arg}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${amaflags}","${uuid}","${userfield}"</template> </templates> </configuration>

1 0

[commit] r6988 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Dec '07

26 Dec '07

Author: brian Date: Wed Dec 26 17:41:40 2007 New Revision: 6988 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: collect info from bye and so we can get it in cdr Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Dec 26 17:41:40 2007 @@ -106,6 +106,33 @@ return; } +void sofia_handle_sip_i_bye(switch_core_session_t *session, int status, + char const *phrase, + nua_t *nua, + sofia_profile_t *profile, + nua_handle_t *nh, + sofia_private_t *sofia_private, + sip_t const *sip, + tagi_t tags[]) +{ + switch_channel_t *channel = NULL; + const char *rtp_txstat_header; + const char *rtp_rxstat_header; + if (session) { + channel = switch_core_session_get_channel(session); + if (sip->sip_user_agent && !switch_strlen_zero(sip->sip_user_agent->g_string)){ + switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string); + } + if ((rtp_txstat_header = sofia_glue_get_unknown_header(sip, "rtp-txstat"))) { + switch_channel_set_variable(channel, "sip_rtp_txstat", rtp_txstat_header); + } + if ((rtp_rxstat_header = sofia_glue_get_unknown_header(sip, "rtp-rxstat"))) { + switch_channel_set_variable(channel, "sip_rtp_rxstat", rtp_rxstat_header); + } + + } + return; +} void sofia_event_callback(nua_event_t event, int status, @@ -222,7 +249,10 @@ case nua_i_fork: case nua_r_info: case nua_r_bye: + break; case nua_i_bye: + sofia_handle_sip_i_bye(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); + break; case nua_r_unsubscribe: case nua_r_publish: case nua_i_cancel:

1 0