- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7055 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: brian Date: Tue Jan 1 23:04:25 2008 New Revision: 7055 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: more fun stuff tested and working Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 1 23:04:25 2008 @@ -164,8 +164,7 @@ <action application="ivr" data="demo"/> </condition> </extension> - - +  @@ -178,36 +177,38 @@  - <extension name="park"> + <extension name="unpark"> <condition field="destination_number" expression="^5901$"> - <action application="fifo" data="5900@$${domain} out undef"/> + <action application="fifo" data="5900@$${domain} out nowait"/> </condition> </extension>  -  <extension name="unpark"> <condition field="source" expression="mod_sofia" continue="on-true"/> <condition field="destination_number" expression="^parking$" continue="on-true"/> <condition field="${sip_to_params}" expression="fifo\=(\d+)"> <action application="answer"/> - <action application="gentones" data="%(1000, 0, 320)"/> - <action application="fifo" data="$1(a)10.0.1.250 out nowait"/> - <action application="hangup"/> + <action application="fifo" data="$1@$${domain} out undef"/> </condition> </extension> - --> + <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/>

1 0

[commit] r7054 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Tue Jan 1 22:39:29 2008 New Revision: 7054 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix breakage caused by new port allocator code. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Jan 1 22:39:29 2008 @@ -1710,7 +1710,7 @@ switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; tech_pvt->codec_index = -1; - if (!(tech_pvt->local_port = switch_rtp_request_port(tech_pvt->profile->ip))) { + if (!(tech_pvt->local_port = switch_rtp_request_port(mdl_profile->ip))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP port available!\n"); terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;

1 0

[commit] r7053 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Tue Jan 1 21:57:56 2008 New Revision: 7053 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix for MODAPP-66 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Jan 1 21:57:56 2008 @@ -688,7 +688,7 @@ tech_pvt = switch_core_session_get_private(*session); - if (tech_pvt->profile->ip && tech_pvt->local_port) { + if (tech_pvt && tech_pvt->profile && tech_pvt->profile->ip && tech_pvt->local_port) { switch_rtp_release_port(tech_pvt->profile->ip, tech_pvt->local_port); } @@ -697,7 +697,7 @@ return; } - if (switch_test_flag(tech_pvt, TFLAG_TERM)) { + if (!tech_pvt || switch_test_flag(tech_pvt, TFLAG_TERM)) { /*once is enough */ return; }

1 0

[commit] r7052 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 01 Jan '08

01 Jan '08

Author: brian Date: Tue Jan 1 18:55:09 2008 New Revision: 7052 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweaks Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 1 18:55:09 2008 @@ -50,7 +50,7 @@ <action application="set" data="refer_user=$1"/> <action application="set" data="refer_domain=$2"/> <action application="info"/> - <action application="bridge" data="sofia/outbound/${refer_user}@${refer_domain}"/> + <action application="bridge" data="sofia/${use_profile}/${refer_user}@${refer_domain}"/> </condition> </extension> --> @@ -188,6 +188,7 @@ This extension is used with snom phones. --> +  <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/>

1 0

[commit] r7051 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 01 Jan '08

01 Jan '08

Author: brian Date: Tue Jan 1 18:32:09 2008 New Revision: 7051 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: save this for now Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 1 18:32:09 2008 @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>  <include> <context name="default"> @@ -166,45 +167,45 @@  <extension name="park"> - <condition field="destination_number" expression="^(590[0-9])$"> - <action application="fifo" data="$1@$${domain} in undef $${moh_uri}"/> + <condition field="destination_number" expression="^5900$"> + <action application="fifo" data="5900@$${domain} in undef $${moh_uri}"/> </condition> </extension> +  - <extension name="unpark"> - <condition field="destination_number" expression="^\*{0,2}park\+(590[0-9])$"> - <action application="answer"/> - <action application="fifo" data="$1@$${domain} out nowait"/> + <extension name="park"> + <condition field="destination_number" expression="^5901$"> + <action application="fifo" data="5900@$${domain} out undef"/> </condition> - </extension> + </extension>  -  <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> @@ -217,6 +218,7 @@ <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> + <action application="answer"/> <action application="transfer" data="$1 enum"/> </condition> </extension>

1 0

[commit] r7050 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 01 Jan '08

01 Jan '08

Author: brian Date: Tue Jan 1 17:27:51 2008 New Revision: 7050 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: I did not need to remove these Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jan 1 17:27:51 2008 @@ -131,6 +131,7 @@ } else { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Idle"); } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", "unknown"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); @@ -138,6 +139,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", node->waiting_count > 0 ? "CS_RING" : "CS_HANGUP"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); }

1 0

[commit] r7049 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 01 Jan '08

01 Jan '08

Author: brian Date: Mon Dec 31 20:03:33 2007 New Revision: 7049 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 31 20:03:33 2007 @@ -697,40 +697,40 @@ if (strcasecmp(answer_state, "resubscribe")) { - if (!strcasecmp(state, "cs_hangup")) { - astate = "terminated"; - } else if (switch_strlen_zero(astate)) { - astate = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); - if (switch_strlen_zero(astate)) { - astate = dft_state; - } - } - - if (!strcasecmp(event_status, "hold")) { - astate = "early"; - } - - if (!strcasecmp(astate, "answered")) { - astate = "confirmed"; - } - - if (!strcasecmp(astate, "ringing")) { - if (!strcasecmp(direction, "recipient")) { + if (!strcasecmp(state, "cs_hangup")) { + astate = "terminated"; + } else if (switch_strlen_zero(astate)) { + astate = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); + if (switch_strlen_zero(astate)) { + astate = dft_state; + } + } + + if (!strcasecmp(event_status, "hold")) { astate = "early"; - } else { + } + + if (!strcasecmp(astate, "answered")) { astate = "confirmed"; } - } + + if (!strcasecmp(astate, "ringing")) { + if (!strcasecmp(direction, "recipient")) { + astate = "early"; + } else { + astate = "confirmed"; + } + } stream.write_function(&stream, "<dialog id=\"%s\" direction=\"%s\">\n", uuid, direction); stream.write_function(&stream, "<state>%s</state>\n", astate); - + if (!strcasecmp(astate, "early") | !strcasecmp(astate, "confirmed")) { const char *from_id = switch_str_nil(switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Number")); const char *to_user = switch_str_nil(switch_event_get_header(helper->event, "variable_sip_to_user")); const char *from_user = switch_str_nil(switch_event_get_header(helper->event, "variable_sip_from_user")); const char *clean_to_user; const char *clean_from_user; - + clean_to_user = switch_mprintf("%s", sub_to_user ? sub_to_user : to_user, host); clean_from_user = switch_mprintf("%s", from_id ? from_id : from_user, host); @@ -760,9 +760,7 @@ stream.write_function(&stream, "</remote>\n"); } } - stream.write_function(&stream, "</dialog>\n"); - } stream.write_function(&stream, "</dialog-info>\n"); @@ -773,7 +771,6 @@ if (astate && uuid && helper->stream.data) { stream.write_function(&helper->stream, "update sip_dialogs set state='%s' where uuid='%s';\n", astate, uuid); } - } else { pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n"

1 0

[commit] r7048 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 31 Dec '07

31 Dec '07

Author: brian Date: Mon Dec 31 17:29:18 2007 New Revision: 7048 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: normalize this event Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Dec 31 17:29:18 2007 @@ -131,7 +131,6 @@ } else { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Idle"); } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", "unknown"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); @@ -139,7 +138,6 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", node->waiting_count > 0 ? "CS_RING" : "CS_HANGUP"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); }

1 0

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

31 Dec '07

Author: brian Date: Mon Dec 31 17:14:09 2007 New Revision: 7047 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: revert this for now Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 31 17:14:09 2007 @@ -742,14 +742,21 @@ stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_from_user, clean_from_user, host); stream.write_function(&stream, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host); stream.write_function(&stream, "</remote>\n"); - } else if (!strcasecmp(proto, "park") | !strcasecmp(proto, "conf") | !strcasecmp(proto, "ext")) { - stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s;%s=%s</identity>\n", - proto, proto, host, proto, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); - stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", proto, host); - stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n</target>\n</local>\n", - !strcasecmp(proto, "park") ? "no" : "yes"); - stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", proto, uuid, host); - stream.write_function(&stream, "<target uri=\"sip:%s+%s@%s;%s=%s\"/>\n", proto, uuid, host, proto, uuid); + } else if (!strcasecmp(proto, "park")) { + stream.write_function(&stream, "<local>\n<identity display=\"parking\">sip:parking@%s;fifo=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:parking@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"parking\">sip:%s</identity>\n", uuid); + stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid); + stream.write_function(&stream, "</remote>\n"); + } else if (!strcasecmp(proto, "conf")) { + stream.write_function(&stream, "<local>\n<identity display=\"conference\">sip:conference@%s;conference=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:conference@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"yes\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"conference\">sip:%s@%s</identity>\n", uuid, host); + stream.write_function(&stream, "<target uri=\"sip:conf+%s@%s\"/>\n", uuid, host); stream.write_function(&stream, "</remote>\n"); } }

1 0

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

31 Dec '07

Author: brian Date: Mon Dec 31 15:41:35 2007 New Revision: 7046 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: park should not render but everything else should Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 31 15:41:35 2007 @@ -746,7 +746,8 @@ stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s;%s=%s</identity>\n", proto, proto, host, proto, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", proto, host); - stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n</target>\n</local>\n", + !strcasecmp(proto, "park") ? "no" : "yes"); stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", proto, uuid, host); stream.write_function(&stream, "<target uri=\"sip:%s+%s@%s;%s=%s\"/>\n", proto, uuid, host, proto, uuid); stream.write_function(&stream, "</remote>\n");

1 0