- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6571 - freeswitch/trunk/conf/jingle_profiles
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: brian Date: Fri Dec 7 15:40:00 2007 New Revision: 6571 Added: freeswitch/trunk/conf/jingle_profiles/ Log:

1 0

[commit] r6570 - in freeswitch/trunk/conf/directory: . default
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: brian Date: Fri Dec 7 15:39:05 2007 New Revision: 6570 Added: freeswitch/trunk/conf/directory/default/ freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml freeswitch/trunk/conf/directory/default/default.xml Modified: freeswitch/trunk/conf/directory/default.xml Log: now this is interesting Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Fri Dec 7 15:39:05 2007 @@ -1,117 +1,6 @@ - -<domain name="$${domain}"> -  - <user id="default">  - <variables> -  -  - <variable name="numbering_plan" value="US"/> -  - </variables> - </user> - - <user id="brian" mailbox="1000">  -  - <gateways> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - </gateways> - <params> -  - <param name="password" value="1234"/> - <param name="vm-password" value="1234"/> -  -  -  -  -  -  -  - </params> - <variables> -  - <variable name="testing" value="this"/> - -  -  - -  -  - -  -  -  -  - -  -  -  - </variables> - - <vcard> -  - </vcard> - </user> - -  - <user id="1000" mailbox="1000"> - <params> - <param name="password" value="mypass"/> - <param name="vm-password" value="1234"/> -  -  - <param name="dial-string" value="sofia/${use_profile}/888(a)conference.freeswitch.org"/> - </params> - </user> - -  - <user id="1001"/> - <user id="1002"/> - <user id="1003"/> - <user id="1004"/> - <user id="1005"/> - <user id="1006"/> - <user id="1007"/> - <user id="1008"/> - <user id="1009"/> - <user id="1010"/> - <user id="1011"/> - <user id="1012"/> - <user id="1013"/> - <user id="1014"/> - <user id="1015"/> - <user id="1016"/> - <user id="1017"/> - <user id="1018"/> - <user id="1019"/> -</domain> +<include> +  + <domain name="$${domain}"> + <X-PRE-PROCESS cmd="include" data="*/*.xml"/> + </domain> +</include> Added: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1000.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,11 @@ +<include> + <user id="1000" mailbox="1000"> + <params> + <param name="password" value="mypass"/> + <param name="vm-password" value="1234"/> +  +  + <param name="dial-string" value="sofia/${use_profile}/888(a)conference.freeswitch.org"/> + </params> + </user> +</include> Added: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1001.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1001"/> +</include> Added: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1002.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1002"/> +</include> Added: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1003.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1003"/> +</include> Added: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1004.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1004"/> +</include> Added: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1005.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1005"/> +</include> Added: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1006.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1006"/> +</include> Added: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1007.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1007"/> +</include> Added: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1008.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1008"/> +</include> Added: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1009.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1009"/> +</include> Added: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1010.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1010"/> +</include> Added: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1011.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1011"/> +</include> Added: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1012.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1012"/> +</include> Added: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1013.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1013"/> +</include> Added: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1014.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1014"/> +</include> Added: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1015.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1015"/> +</include> Added: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1016.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1016"/> +</include> Added: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1017.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1017"/> +</include> Added: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1018.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1018"/> +</include> Added: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/1019.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,3 @@ +<include> + <user id="1019"/> +</include> Added: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/brian.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,74 @@ +<include> + <user id="brian" mailbox="9999">  +  + <gateways> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + </gateways> + <params> +  + <param name="password" value="1234"/> + <param name="vm-password" value="1234"/> +  +  +  +  +  +  +  + </params> + <variables> +  + <variable name="testing" value="this"/> + +  +  + +  +  + +  +  +  +  + +  +  +  + </variables> + + <vcard> +  + </vcard> + </user> +</include> Added: freeswitch/trunk/conf/directory/default/default.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/default.xml Fri Dec 7 15:39:05 2007 @@ -0,0 +1,10 @@ +<include> + <user id="default">  + <variables> +  +  + <variable name="numbering_plan" value="US"/> +  + </variables> + </user> +</include>

1 0

[commit] r6569 - freeswitch/trunk/conf
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: brian Date: Fri Dec 7 15:21:48 2007 New Revision: 6569 Modified: freeswitch/trunk/conf/vars.xml Log: fix default codecs Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Dec 7 15:21:48 2007 @@ -15,7 +15,7 @@ containing the "subscriptions" table. used by: dingaling.conf.xml enum.conf.xml --> - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU@20i"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722@20i,PCMU@20i,PCMA@20i"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/> <!-- bind_server_ip

1 0

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

07 Dec '07

Author: anthm Date: Fri Dec 7 12:26:15 2007 New Revision: 6568 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Dec 7 12:26:15 2007 @@ -650,8 +650,10 @@ switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(peer_channel)); switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(peer_session)); + switch_channel_set_variable(caller_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(peer_session)); switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(caller_channel)); switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(session)); + switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session)); switch_channel_set_private(peer_channel, "_bridge_", b_leg); switch_channel_set_state(peer_channel, CS_LOOPBACK); @@ -725,8 +727,10 @@ switch_channel_set_variable(originator_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(originatee_channel)); switch_channel_set_variable(originator_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(originatee_session)); + switch_channel_set_variable(originator_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(originatee_session)); switch_channel_set_variable(originatee_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(originator_channel)); switch_channel_set_variable(originatee_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(originator_session)); + switch_channel_set_variable(originatee_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(originator_session)); switch_channel_set_flag(originator_channel, CF_BREAK); switch_channel_set_flag(originatee_channel, CF_BREAK);

1 0

[commit] r6567 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: anthm Date: Fri Dec 7 11:58:19 2007 New Revision: 6567 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: update Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Fri Dec 7 11:58:19 2007 @@ -183,6 +183,19 @@ box = switch_xml_attr_soft(x_user, "mailbox"); + for (x_param = switch_xml_child(x_domain, "param"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr_soft(x_param, "name"); + const char *val = switch_xml_attr_soft(x_param, "value"); + + if (!strcasecmp(var, "password")) { + mypass1 = val; + } else if (!strcasecmp(var, "vm-password")) { + mypass2 = val; + } else if (!strncasecmp(var, "http-", 5)) { + ResponseAddField(r, (char *)var, (char *)val); + } + } + if (!(x_params = switch_xml_child(x_user, "params"))) { goto authed; }

1 0

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

07 Dec '07

Author: anthm Date: Fri Dec 7 11:14:09 2007 New Revision: 6566 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: don't hangup when transfering Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Dec 7 11:14:09 2007 @@ -464,13 +464,14 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - if (switch_channel_test_flag(other_channel, CF_ANSWERED) && - switch_channel_get_state(other_channel) < CS_HANGUP && - !switch_channel_test_flag(other_channel, CF_TRANSFER) && - switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { - switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); - } else { - switch_channel_set_state(other_channel, CS_EXECUTE); + if (!switch_channel_test_flag(other_channel, CF_TRANSFER)) { + if (switch_channel_test_flag(other_channel, CF_ANSWERED) && + switch_channel_get_state(other_channel) < CS_HANGUP && + switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { + switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + } else { + switch_channel_set_state(other_channel, CS_EXECUTE); + } } switch_core_session_rwunlock(other_session); } @@ -684,11 +685,12 @@ done: - if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && - switch_channel_get_state(caller_channel) < CS_HANGUP && - !switch_channel_test_flag(caller_channel, CF_TRANSFER) && - switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { - switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_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))) { + switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); + } } return status;

1 0

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

07 Dec '07

Author: anthm Date: Fri Dec 7 11:11:50 2007 New Revision: 6565 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: don't hangup when transfering Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Dec 7 11:11:50 2007 @@ -464,8 +464,10 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - if (switch_channel_test_flag(other_channel, CF_ANSWERED) && switch_channel_get_state(other_channel) < CS_HANGUP - && switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { + if (switch_channel_test_flag(other_channel, CF_ANSWERED) && + switch_channel_get_state(other_channel) < CS_HANGUP && + !switch_channel_test_flag(other_channel, CF_TRANSFER) && + switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); } else { switch_channel_set_state(other_channel, CS_EXECUTE); @@ -684,6 +686,7 @@ if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && switch_channel_get_state(caller_channel) < CS_HANGUP && + !switch_channel_test_flag(caller_channel, CF_TRANSFER) && 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] r6564 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: anthm Date: Fri Dec 7 10:10:24 2007 New Revision: 6564 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: update 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 Fri Dec 7 10:10:24 2007 @@ -39,7 +39,7 @@ const char *default_template = "\"${caller_id_name}\",\"${caller_id_number}\",\"${destination_number}\",\"${context}\",\"${start_stamp}\"," - "\"${answer_stamp}\",\"${end_stamp}\",\"${duration}\",\"${billsec}\",\"${hangup_cause}\",\"${uuid}\",\"${bleg_uuid}\", \"${accountcode}\""; + "\"${answer_stamp}\",\"${end_stamp}\",\"${duration}\",\"${billsec}\",\"${hangup_cause}\",\"${uuid}\",\"${bleg_uuid}\", \"${accountcode}\"\n"; static struct { switch_memory_pool_t *pool; @@ -157,7 +157,7 @@ { switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; - const char *log_dir = NULL, *accountcode = NULL, *cid_buf = NULL, *template = NULL, *template_str = NULL; + const char *log_dir = NULL, *accountcode = NULL, *cid_buf = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; switch_caller_profile_t *caller_profile, *ocp; @@ -194,7 +194,7 @@ last_app = ap->app; last_arg = ap->arg; } - + if (caller_profile->times) { switch_time_exp_t tm; switch_size_t retsize; @@ -234,63 +234,41 @@ snprintf(tmp, sizeof(tmp), "%d", billsec); switch_channel_set_variable(channel, "billsec", tmp); - - if (!(template = switch_channel_get_variable(channel, "cdr_template"))) { - template = globals.default_template; - } - - if (!(template_str = (const char *) switch_core_hash_find(globals.template_hash, template))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error finding template %s substituting default\n", template); - template_str = (const char *) switch_core_hash_find(globals.template_hash, globals.default_template); + g_template_str = (const char *) switch_core_hash_find(globals.template_hash, globals.default_template); + + if ((accountcode = switch_channel_get_variable(channel, "ACCOUNTCODE"))) { + a_template_str = (const char *) switch_core_hash_find(globals.template_hash, accountcode); } - - - log_line = switch_channel_expand_variables(channel, template_str); -#if 0 - log_line = switch_core_session_sprintf(session, - "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"," - "\"%s\",\"%s\",\"%d\",\"%d\",\"%s\",\"%s\",\"%s\",\"%s\"\n", - switch_str_nil(accountcode), - switch_str_nil(caller_profile->caller_id_number), - switch_str_nil(caller_profile->destination_number), - switch_str_nil(caller_profile->context), - cid_buf, - switch_channel_get_name(channel), - switch_str_nil(switch_channel_get_variable(channel, SWITCH_BRIDGE_CHANNEL_VARIABLE)), - switch_str_nil(last_app), - switch_str_nil(last_arg), - start, - answer, - end, - duration, - billsec, - switch_str_nil(switch_channel_cause2str(switch_channel_get_cause(channel))), - switch_str_nil(switch_channel_get_variable(channel, "AMAFLAGS")), - switch_str_nil(caller_profile->uuid), - switch_str_nil(switch_channel_get_variable(channel, "USERFIELD")) - ); - -#endif - + if (!a_template_str) { + a_template_str = g_template_str; + } - - + log_line = switch_channel_expand_variables(channel, a_template_str); - if ((accountcode = switch_channel_get_variable(channel, "ACCOUNTCODE"))) { + if (accountcode) { path = switch_mprintf("%s%s%s.csv", log_dir, SWITCH_PATH_SEPARATOR, accountcode); assert(path); write_cdr(path, log_line); free(path); } - + + if (g_template_str != a_template_str) { + if (log_line && log_line != a_template_str) { + switch_safe_free(log_line); + } + log_line = switch_channel_expand_variables(channel, g_template_str); + } + + + path = switch_mprintf("%s%sMaster.csv", log_dir, SWITCH_PATH_SEPARATOR); assert(path); write_cdr(path, log_line); free(path); - if (log_line && log_line != template_str) { + if (log_line && log_line != g_template_str) { free(log_line); }

1 0

[commit] r6563 - freeswitch/trunk/debian
by Freeswitch SVN 07 Dec '07

07 Dec '07

Author: cypromis Date: Fri Dec 7 09:56:42 2007 New Revision: 6563 Modified: freeswitch/trunk/debian/dirs Log: added db path to list of created directories Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Fri Dec 7 09:56:42 2007 @@ -1,5 +1,6 @@ opt/freeswitch opt/freeswitch/log +opt/freeswitch/db etc/opt etc/monit etc/default

1 0

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

07 Dec '07

Author: mikej Date: Fri Dec 7 09:31:48 2007 New Revision: 6562 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add info responses (MODENDP-56) 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 Fri Dec 7 09:31:48 2007 @@ -1755,6 +1755,8 @@ from->a_display ? " " : "", URL_PRINT_ARGS(from->a_url), sip->sip_payload->pl_data); + /* Send 415 Unsupported Media response */ + nua_respond(nh, SIP_415_UNSUPPORTED_MEDIA, NUTAG_WITH_THIS(nua), TAG_END()); return; } @@ -1782,6 +1784,9 @@ /* print debug info */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INFO DTMF(%s)\n", dtmf_digit); + /* Send 200 OK response */ + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + return; }

1 0