- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11096 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: gmaruzz Date: Thu Jan 8 10:18:56 2009 New Revision: 11096 Log: skypiax: for win32, no more LaunchSkype, use startskype.bat for this. Wait for each interface to have its own API connection active Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Jan 8 10:18:56 2009 @@ -967,6 +967,9 @@ skypiax_skypeaudio_init(&globals.SKYPIAX_INTERFACES[interface_id]); + + while(globals.SKYPIAX_INTERFACES[interface_id].AsteriskHandlesAst.api_connected == 0) + switch_sleep(1000); NOTICA( "STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id); Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Thu Jan 8 10:18:56 2009 @@ -588,6 +588,7 @@ } #ifdef WIN32 +#if 0 int LaunchSkype(struct skypiax_interface *p) { LPTSTR pszMessage; @@ -613,6 +614,7 @@ return 1; } +#endif enum { SKYPECONTROLAPI_ATTACH_SUCCESS = 0, /* Client is successfully @@ -708,9 +710,7 @@ } break; case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: - WARNINGA - ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", - SKYPIAX_P_LOG); + //WARNINGA ("\n\n\tIf I do not (almost) immediately connect to Skype API,\n\tplease give the Skype client authorization to be connected \n\tby Asterisk and to not ask you again.\n\n", SKYPIAX_P_LOG); switch_sleep(5000); if (!p->AsteriskHandlesAst.api_connected) { SendMessage(HWND_BROADCAST, @@ -843,7 +843,7 @@ p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIDiscover = RegisterWindowMessage("SkypeControlAPIDiscover"); - LaunchSkype(p); + //LaunchSkype(p); switch_sleep(2000000); if (p->AsteriskHandlesAst.win32_uiGlobal_MsgID_SkypeControlAPIAttach != 0

1 0

[commit] r11095 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: gmaruzz Date: Thu Jan 8 08:49:45 2009 New Revision: 11095 Log: skypiax: added startskype.bat and wait.bat to configs dir Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/wait.bat Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.bat Thu Jan 8 08:49:45 2009 @@ -0,0 +1,45 @@ +echo off +REM you have to adjust MYPATH to where the Skype executable is +set MYPATH=%PATH%;C:\Program Files\Skype\Phone + +echo %MYPATH% + +start Skype.exe /secondary /username:skypiax1 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax2 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax3 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax4 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax5 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax6 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax7 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax8 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax9 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax10 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax11 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax12 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax13 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax14 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax15 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax16 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax17 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax18 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax19 /password:xxx +call wait 5 +start Skype.exe /secondary /username:skypiax20 /password:xxx Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/wait.bat ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/wait.bat Thu Jan 8 08:49:45 2009 @@ -0,0 +1,4 @@ +echo off +@ping 127.0.0.1 -n 2 -w 1000 > nul +@ping 127.0.0.1 -n %1% -w 1000> nul +

1 0

[commit] r11094 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: gmaruzz Date: Thu Jan 8 06:32:05 2009 New Revision: 11094 Log: skypiax: added conf/dialplan/public.xml to configs dir Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/public.xml (contents, props changed) Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/public.xml ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/public.xml Thu Jan 8 06:32:05 2009 @@ -0,0 +1,84 @@ + + + +<include> + <context name="public"> + + <extension name="unloop"> + <condition field="$${unroll_loops}" expression="^true$"/> + <condition field="${sip_looped_call}" expression="^true$"> + <action application="deflect" data="${destination_number}"/> + </condition> + </extension> +  + <extension name="outside_call" continue="true"> + <condition> + <action application="set" data="outside_call=true"/> + </condition> + </extension> + + <extension name="call_debug" continue="true"> + <condition field="$${call_debug}" expression="^true$" break="never"> + <action application="info"/> + </condition> + </extension> + +  + <extension name="set_domain" continue="true"> + <condition field="${domain_name}" expression="^$"/> + <condition field="source" expression="mod_sofia"/> + <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)"> +  + <action application="export" data="domain_name=$1"/> + <anti-action application="export" data="domain_name=${sip_req_host}"/> + </condition> + </extension> + + <extension name="public_extensions"> + <condition field="destination_number" expression="^(10[01][0-9])$"> + <action application="transfer" data="$1 XML default"/> + </condition> + </extension> + + <extension name="transfer_to_default"> + <condition> + <action application="transfer" data="5000 XML default"/> + </condition> + </extension> + +  + <X-PRE-PROCESS cmd="include" data="public/*.xml"/> +  +  + </context> +</include>

1 0

[commit] r11093 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: gmaruzz Date: Thu Jan 8 06:10:51 2009 New Revision: 11093 Log: skypiax: compiles on win32 Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Thu Jan 8 06:10:51 2009 @@ -91,12 +91,12 @@ #ifdef WIN32 unsigned int fdselect; #else + int received = 0; int fdselect; #endif /* WIN32 */ int rt; fd_set fs; struct timeval to; - int received = 0; if (!running) break; @@ -184,12 +184,12 @@ /****************************************************************/ if (len > 0) { if (len == SAMPLES_PER_FRAME * sizeof(short)) { - //unsigned int howmany; - //howmany = len; +#ifdef WIN32 + unsigned int howmany; + howmany = len; //WARNINGA("SRV recv %d\n", SKYPIAX_P_LOG, len); -#ifdef WIN32 switch_file_write(p->audiopipe[1], srv_in, &howmany); #else /* WIN32 */ len = write(p->audiopipe[1], srv_in, len);

1 0

[commit] r11092 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: gmaruzz Date: Thu Jan 8 05:29:20 2009 New Revision: 11092 Log: skypiax: into configs subdir, added default.xml example dialplan with skypiax usage at 2908 extension and at 'skype/' simil-URI Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/default.xml Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/default.xml ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/default.xml Thu Jan 8 05:29:20 2009 @@ -0,0 +1,617 @@ + + +<?xml version="1.0" encoding="utf-8"?> + +<include> + <context name="default"> + + <extension name="unloop"> + <condition field="$${unroll_loops}" expression="^true$"/> + <condition field="${sip_looped_call}" expression="^true$"> + <action application="deflect" data="${destination_number}"/> + </condition> + </extension> + +  + <extension name="set_domain" continue="true"> + <condition field="${domain_name}" expression="^$"/> + <condition field="source" expression="mod_sofia"/> + <condition field="${sip_auth_realm}" expression="^$"> + <action application="set" data="domain_name=$${domain}"/> + <anti-action application="set" data="domain_name=${sip_auth_realm}"/> + </condition> + </extension> + +  + <extension name="set_domain_openzap" continue="true"> + <condition field="${domain_name}" expression="^$"/> + <condition field="source" expression="mod_openzap"> + <action application="set" data="domain_name=$${domain}"/> + </condition> + </extension> + +  + <extension name="tod_example" continue="true"> +  + <condition field="${strftime(%w)}" expression="^([1-5])$"/> + <condition field="${strftime(%H%M)}" expression="^((09|1[0-7])[0-5][0-9]|1800)$"> + <action application="set" data="open=true"/> + </condition> + </extension> + + <extension name="global-intercept"> + <condition field="destination_number" expression="^886$"> + <action application="answer"/> + <action application="intercept" data="${db(select/${domain_name}-last_dial/global)}"/> + <action application="sleep" data="2000"/> + </condition> + </extension> + + <extension name="group-intercept"> + <condition field="destination_number" expression="^\*8$"> + <action application="answer"/> + <action application="intercept" data="${db(select/${domain_name}-last_dial/${callgroup})}"/> + <action application="sleep" data="2000"/> + </condition> + </extension> + + <extension name="intercept-ext"> + <condition field="destination_number" expression="^\*\*(\d+)$"> + <action application="answer"/> + <action application="intercept" data="${db(select/${domain_name}-last_dial_ext/$1)}"/> + <action application="sleep" data="2000"/> + </condition> + </extension> + + <extension name="redial"> + <condition field="destination_number" expression="^870$"> + <action application="transfer" data="${db(select/${domain_name}-last_dial/${caller_id_number})}"/> + </condition> + </extension> + + <extension name="global" continue="true"> + <condition field="${network_addr}" expression="^$" break="never"> + <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/> + <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/> + </condition> +  + <condition field="${numbering_plan}" expression="^$" break="never"> + <action application="set_user" data="default@${domain_name}"/> + </condition> + <condition field="${call_debug}" expression="^true$" break="never"> + <action application="info"/> + </condition> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> + <action application="set" data="sip_secure_media=true"/> +  +  + </condition> + <condition> + <action application="db" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/> + <action application="db" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/> + <action application="db" data="insert/${domain_name}-last_dial/global/${uuid}"/> + </condition> + </extension> + +  +  +  + + <extension name="snom-demo-2"> + <condition field="destination_number" expression="^9001$"> + <action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/> + <action application="transfer" data="3000"/> + </condition> + </extension> + + <extension name="snom-demo-1"> + <condition field="destination_number" expression="^9000$"> +  + <action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/> + <action application="playback" data="$${hold_music}"/> + </condition> + </extension> + + <extension name="eavesdrop"> + <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$"> + <action application="answer"/> + <action application="eavesdrop" data="${db(select/${domain_name}-spymap/$1)}"/> + </condition> + </extension> + + <extension name="eavesdrop"> + <condition field="destination_number" expression="^779$"> + <action application="answer"/> + <action application="set" data="eavesdrop_indicate_failed=tone_stream://%(500, 0, 320)"/> + <action application="set" data="eavesdrop_indicate_new=tone_stream://%(500, 0, 620)"/> + <action application="set" data="eavesdrop_indicate_idle=tone_stream://%(250, 0, 920)"/> + <action application="eavesdrop" data="all"/> + </condition> + </extension> + + <extension name="call_return"> + <condition field="destination_number" expression="^\*69$|^869$|^lcr$"> + <action application="transfer" data="${db(select/${domain_name}-call_return/${caller_id_number})}"/> + </condition> + </extension> + + <extension name="del-group"> + <condition field="destination_number" expression="^80(\d{2})$"> + <action application="answer"/> + <action application="group" data="delete:$1@${domain_name}:${sofia_contact(${sip_from_user}@${domain_name})}"/> + <action application="gentones" data="%(1000, 0, 320)"/> + </condition> + </extension> + + <extension name="add-group"> + <condition field="destination_number" expression="^81(\d{2})$"> + <action application="answer"/> + <action application="group" data="insert:$1@${domain_name}:${sofia_contact(${sip_from_user}@${domain_name})}"/> + <action application="gentones" data="%(1000, 0, 640)"/> + </condition> + </extension> + + <extension name="call-group-simo"> + <condition field="destination_number" expression="^82(\d{2})$"> + <action application="bridge" data="{ignore_early_media=true}${group(call:$1@${domain_name})}"/> + </condition> + </extension> + + <extension name="call-group-order"> + <condition field="destination_number" expression="^83(\d{2})$"> + <action application="set" data="call_timeout=10"/> + <action application="bridge" data="{ignore_early_media=true}${group(call:$1@${domain_name}:order)}"/> + </condition> + </extension> + + <extension name="extension-intercom"> +  + <condition field="destination_number" expression="^8(10[01][0-9])$"> + <action application="set" data="dialed_extension=$1"/> +  +  + <action application="export"><![CDATA[sip_h_Call-Info=<sip:${domain_name}>;answer-after=0]]></action> + <action application="export" data="sip_invite_params=intercom=true"/> + <action application="export" data="sip_auto_answer=true"/> + <action application="bridge" data="user/${dialed_extension}@${domain_name}"/> + </condition> + </extension> + +  + <extension name="Local_Extension"> + <condition field="destination_number" expression="^(10[01][0-9])$"> + <action application="set" data="dialed_extension=$1"/> + <action application="export" data="dialed_extension=$1"/> + </condition> + <condition field="destination_number" expression="^${caller_id_number}$"> + <action application="set" data="voicemail_authorized=${sip_authorized}"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="voicemail" data="check default ${domain_name} ${dialed_extension}"/> +  + <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> + <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <anti-action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/> + <anti-action application="set" data="ringback=${us-ring}"/> + <anti-action application="set" data="transfer_ringback=$${hold_music}"/> + <anti-action application="set" data="call_timeout=30"/> +  + <anti-action application="set" data="hangup_after_bridge=true"/> +  + <anti-action application="set" data="continue_on_fail=true"/> + <anti-action application="db" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/> + <anti-action application="db" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/> + <anti-action application="set" data="called_party_callgroup=${user_data(${dialed_extension}@${domain_name} var callgroup)}"/> +  + <anti-action application="db" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/> + <anti-action application="bridge" data="user/${dialed_extension}@${domain_name}"/> + <anti-action application="answer"/> + <anti-action application="sleep" data="1000"/> + <anti-action application="voicemail" data="default ${domain_name} ${dialed_extension}"/> + </condition> + </extension> + +  + <extension name="operator"> + <condition field="destination_number" expression="^operator$|^0$"> + <action application="set" data="transfer_ringback=$${hold_music}"/> + <action application="transfer" data="1000 XML features"/> + </condition> + </extension> + +  + <extension name="vmain"> + <condition field="destination_number" expression="^vmain|4000$"> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="voicemail" data="check default ${domain_name}"/> + </condition> + </extension> + +  + <extension name="sip_uri"> + <condition field="destination_number" expression="^sip:(.*)$"> + <action application="bridge" data="sofia/${use_profile}/$1"/> + </condition> + </extension> + +  + <extension name="skypiax"> + <condition field="destination_number" expression="^2908$"> + <action application="bridge" data="skypiax/skypiax19/echo123"/> + </condition> + </extension> +  + <extension name="skype_uri"> + <condition field="destination_number" expression="^skype/(.*)$"> + <action application="bridge" data="skypiax/skypiax11/$1"/> + </condition> + </extension> + + + +  + <extension name="nb_conferences"> + <condition field="destination_number" expression="^(30\d{2})$"> + <action application="answer"/> + <action application="conference" data="$1-${domain_name}@default"/> + </condition> + </extension> + + <extension name="wb_conferences"> + <condition field="destination_number" expression="^(31\d{2})$"> + <action application="answer"/> + <action application="conference" data="$1-${domain_name}@wideband"/> + </condition> + </extension> + + <extension name="uwb_conferences"> + <condition field="destination_number" expression="^(32\d{2})$"> + <action application="answer"/> + <action application="conference" data="$1-${domain_name}@ultrawideband"/> + </condition> + </extension> + +  + <extension name="freeswitch_public_conf_via_sip"> + <condition field="destination_number" expression="^9(888|1616)$"> + <action application="bridge" data="sofia/${use_profile}/$1(a)conference.freeswitch.org"/> + </condition> + </extension> + +  + <extension name="mad_boss"> + <condition field="destination_number" expression="^0911$"> + +  + <action application="set" data="conference_auto_outcall_caller_id_name=Mad Boss"/> + <action application="set" data="conference_auto_outcall_caller_id_number=0911"/> + <action application="set" data="conference_auto_outcall_timeout=60"/> + <action application="set" data="conference_auto_outcall_flags=none"/> +  + +  + <action application="conference_set_auto_outcall" data="sofia/gateway/$${default_provider}/19184238080"/> + <action application="conference_set_auto_outcall" data="sofia/default/888(a)conference.freeswitch.org"/> + + <action application="conference" data="cool@default"/> + </condition> + </extension> + +  + <extension name="ivr_demo"> + <condition field="destination_number" expression="^5000$"> + <action application="answer"/> + <action application="sleep" data="2000"/> + <action application="ivr" data="demo_ivr"/> + </condition> + </extension> + +  + <extension name="dyanmic conference"> + <condition field="destination_number" expression="^5001$"> + <action application="conference" data="bridge:mydynaconf:sofia/${use_profile}/1234@conference.freeswitch.org"/> + </condition> + </extension> + + <extension name="rtp_multicast_page"> + <condition field="destination_number" expression="^pagegroup$|^7243"> + <action application="answer"/> + <action application="esf_page_group"/> + </condition> + </extension> + +  + <extension name="park"> + <condition field="destination_number" expression="^5900$"> + <action application="set" data="fifo_music=$${hold_music}"/> + <action application="fifo" data="5900@${domain_name} in"/> + </condition> + </extension> + +  + <extension name="unpark"> + <condition field="destination_number" expression="^5901$"> + <action application="answer"/> + <action application="fifo" data="5900@${domain_name} out nowait"/> + </condition> + </extension> + +  + <extension name="park"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="park\+(\d+)"> + <action application="fifo" data="$1@${domain_name} in undef $${hold_music}"/> + </condition> + </extension> +  + <extension name="unpark"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="^parking$"/> + <condition field="${sip_to_params}" expression="fifo\=(\d+)"> + <action application="answer"/> + <action application="fifo" data="$1@${domain_name} out nowait"/> + </condition> + </extension> + +  + <extension name="park"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="callpark"/> + <condition field="${sip_refer_to}"> + <expression><![CDATA[<sip:callpark@${domain_name};orbit=(\d+)>]]></expression> + <action application="fifo" data="$1@${domain_name} in undef $${hold_music}"/> + </condition> + </extension> + +  + <extension name="unpark"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="pickup"/> + <condition field="${sip_to_params}" expression="orbit\=(\d+)"> + <action application="answer"/> + <action application="fifo" data="$1@${domain_name} out nowait"/> + </condition> + </extension> + +  + +  + <extension name="wait"> + <condition field="destination_number" expression="^wait$"> + <action application="pre_answer"/> + <action application="sleep" data="20000"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="playback" data="voicemail/vm-goodbye.wav"/> + <action application="hangup"/> + </condition> + </extension> + +  + <extension name="ringback_180"> + <condition field="destination_number" expression="^9980$"> + <action application="ring_ready"/> + <action application="sleep" data="20000"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="playback" data="voicemail/vm-goodbye.wav"/> + <action application="hangup"/> + </condition> + </extension> + +  + <extension name="ringback_183_uk_ring"> + <condition field="destination_number" expression="^9981$"> + <action application="set" data="ringback=$${uk-ring}"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_183_music_ring"> + <condition field="destination_number" expression="^9982$"> + <action application="set" data="ringback=$${hold_music}"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_post_answer_uk_ring"> + <condition field="destination_number" expression="^9983$"> + <action application="set" data="transfer_ringback=$${uk-ring}"/> + <action application="answer"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_post_answer_music"> + <condition field="destination_number" expression="^9984$"> + <action application="set" data="transfer_ringback=$${hold_music}"/> + <action application="answer"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + + <extension name="show_info"> + <condition field="destination_number" expression="^9992$"> + <action application="answer"/> + <action application="info"/> + <action application="sleep" data="250"/> + <action application="hangup"/> + </condition> + </extension> + + <extension name="video_record"> + <condition field="destination_number" expression="^9993$"> + <action application="answer"/> + <action application="record_fsv" data="/tmp/testrecord.fsv"/> + </condition> + </extension> + + <extension name="video_playback"> + <condition field="destination_number" expression="^9994$"> + <action application="answer"/> + <action application="play_fsv" data="/tmp/testrecord.fsv"/> + </condition> + </extension> + + <extension name="delay_echo"> + <condition field="destination_number" expression="^9995$"> + <action application="answer"/> + <action application="delay_echo" data="5000"/> + </condition> + </extension> + + <extension name="echo"> + <condition field="destination_number" expression="^9996$"> + <action application="answer"/> + <action application="echo"/> + </condition> + </extension> + + <extension name="milliwatt"> + <condition field="destination_number" expression="^9997$"> + <action application="answer"/> + <action application="playback" data="tone_stream://%(10000,0,1004);loops=-1"/> + </condition> + </extension> + + <extension name="tone_stream"> + <condition field="destination_number" expression="^9998$"> + <action application="answer"/> + <action application="playback" data="tone_stream://path=${base_dir}/conf/tetris.ttml;loops=10"/> + </condition> + </extension> + +  + + <extension name="hold_music"> + <condition field="destination_number" expression="^9999$"/> + <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$"> + <action application="answer"/> + <action application="execute_extension" data="is_secure XML features"/> + <action application="playback" data="$${hold_music}"/> + <anti-action application="answer"/> + <anti-action application="playback" data="$${hold_music}"/> + </condition> + </extension> + +  + <X-PRE-PROCESS cmd="include" data="default/*.xml"/> + +  + +  +  + +  + + </context> +</include> Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml Thu Jan 8 05:29:20 2009 @@ -4,7 +4,8 @@ <param name="port" value="4569"/> <param name="ip" value="127.0.0.1"/> <param name="codec-master" value="us"/> - <param name="dialplan" value="default"/> + <param name="dialplan" value="XML"/> + <param name="context" value="public"/> <param name="codec-prefs" value="gsm,ulaw"/> <param name="codec-rates" value="8000,16000"/> <param name="hold-music" value="$${moh_uri}"/> @@ -14,7 +15,7 @@ <interface id="1" name="skypiax1"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":101"/> <param name="tcp_cli_port" value="15556"/> <param name="tcp_srv_port" value="15557"/> @@ -24,7 +25,7 @@ <interface id="2" name="skypiax2"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":102"/> <param name="tcp_cli_port" value="15558"/> <param name="tcp_srv_port" value="15559"/> @@ -35,7 +36,7 @@ <interface id="3" name="skypiax3"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":103"/> <param name="tcp_cli_port" value="15560"/> <param name="tcp_srv_port" value="15561"/> @@ -46,7 +47,7 @@ <interface id="4" name="skypiax4"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":104"/> <param name="tcp_cli_port" value="15562"/> <param name="tcp_srv_port" value="15563"/> @@ -57,7 +58,7 @@ <interface id="5" name="skypiax5"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":105"/> <param name="tcp_cli_port" value="15564"/> <param name="tcp_srv_port" value="15565"/> @@ -67,7 +68,7 @@ <interface id="6" name="skypiax6"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":106"/> <param name="tcp_cli_port" value="15566"/> <param name="tcp_srv_port" value="15567"/> @@ -77,7 +78,7 @@ <interface id="7" name="skypiax7"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":107"/> <param name="tcp_cli_port" value="15568"/> <param name="tcp_srv_port" value="15569"/> @@ -88,7 +89,7 @@ <interface id="8" name="skypiax8"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":108"/> <param name="tcp_cli_port" value="15570"/> <param name="tcp_srv_port" value="15571"/> @@ -99,7 +100,7 @@ <interface id="9" name="skypiax9"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":109"/> <param name="tcp_cli_port" value="15572"/> <param name="tcp_srv_port" value="15573"/> @@ -110,7 +111,7 @@ <interface id="10" name="skypiax10"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":110"/> <param name="tcp_cli_port" value="15574"/> <param name="tcp_srv_port" value="15575"/> @@ -121,7 +122,7 @@ <interface id="11" name="skypiax11"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":111"/> <param name="tcp_cli_port" value="15576"/> <param name="tcp_srv_port" value="15577"/> @@ -132,7 +133,7 @@ <interface id="12" name="skypiax12"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":112"/> <param name="tcp_cli_port" value="15578"/> <param name="tcp_srv_port" value="15579"/> @@ -143,7 +144,7 @@ <interface id="13" name="skypiax13"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":113"/> <param name="tcp_cli_port" value="15580"/> <param name="tcp_srv_port" value="15581"/> @@ -154,7 +155,7 @@ <interface id="14" name="skypiax14"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":114"/> <param name="tcp_cli_port" value="15582"/> <param name="tcp_srv_port" value="15583"/> @@ -165,7 +166,7 @@ <interface id="15" name="skypiax15"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":115"/> <param name="tcp_cli_port" value="15584"/> <param name="tcp_srv_port" value="15585"/> @@ -176,7 +177,7 @@ <interface id="16" name="skypiax16"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":116"/> <param name="tcp_cli_port" value="15586"/> <param name="tcp_srv_port" value="15587"/> @@ -187,7 +188,7 @@ <interface id="17" name="skypiax17"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":117"/> <param name="tcp_cli_port" value="15588"/> <param name="tcp_srv_port" value="15589"/> @@ -198,7 +199,7 @@ <interface id="18" name="skypiax18"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":118"/> <param name="tcp_cli_port" value="15590"/> <param name="tcp_srv_port" value="15591"/> @@ -209,7 +210,7 @@ <interface id="19" name="skypiax19"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":119"/> <param name="tcp_cli_port" value="15592"/> <param name="tcp_srv_port" value="15593"/> @@ -220,7 +221,7 @@ <interface id="20" name="skypiax20"> <param name="hold-music" value="$${moh_uri}"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="X11-display" value=":120"/> <param name="tcp_cli_port" value="15594"/> <param name="tcp_srv_port" value="15595"/> @@ -237,7 +238,7 @@ <param name="digit-timeout" value="2000"/> <param name="max-digits" value="11"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> @@ -249,7 +250,7 @@ <param name="digit-timeout" value="2000"/> <param name="max-digits" value="11"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> @@ -260,7 +261,7 @@ <param name="digit-timeout" value="2000"/> <param name="max-digits" value="11"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> @@ -272,7 +273,7 @@ <param name="digit-timeout" value="2000"/> <param name="max-digits" value="11"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> @@ -284,7 +285,7 @@ <param name="digit-timeout" value="2000"/> <param name="max-digits" value="11"/> <param name="dialplan" value="XML"/> - <param name="context" value="default"/> + <param name="context" value="public"/> <param name="enable-callerid" value="true"/> <param name="dial-regex" value="9996"/> <param name="dial-regex-fail" value="9996"/> Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh Thu Jan 8 05:29:20 2009 @@ -3,7 +3,7 @@ # you need three dummy soundcard for 20 Skype client instances, because each dummy soundcard can handle a max of 8 Skype instances # the enable= module parameter tells how many cards to start. For each additional card, add a comma and a 1 -# configure the first 8 Skype client instances to use the hw:Dummy_0, the next 8 instances to use hw:Dummy_1, etc for all three devices (Play, Capture, Ring) +# manually configure the first 8 Skype client instances to use the hw:Dummy_0, the next 8 instances to use hw:Dummy_1, etc for all three devices (Play, Capture, Ring) modprobe snd-dummy enable=1,1,1 sleep 5

1 0

[commit] r11091 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: gmaruzz Date: Thu Jan 8 05:08:21 2009 New Revision: 11091 Log: skypiax: no more global_session, sends DTMFs. mod_skypiax is now virtually finished ;-) Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Jan 8 05:08:21 2009 @@ -31,7 +31,7 @@ switch_endpoint_interface_t *skypiax_endpoint_interface; switch_memory_pool_t *skypiax_module_pool = NULL; int running = 1; -switch_core_session_t *global_session = NULL; +//switch_core_session_t *global_session = NULL; /*************************************************/ /*************************************************/ /*************************************************/ @@ -286,9 +286,16 @@ static switch_status_t channel_send_dtmf(switch_core_session_t * session, const switch_dtmf_t * dtmf) { + skypiax_interface_t *p = NULL; private_t *tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); + p = tech_pvt->p; + + NOTICA( "DTMF: %c\n", SKYPIAX_P_LOG, dtmf->digit); + +skypiax_skype_senddigit(p, dtmf->digit); + return SWITCH_STATUS_SUCCESS; } @@ -658,7 +665,7 @@ ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG); } p->interface_state = SKYPIAX_STATE_DOWN; - global_session = NULL; //FIXME + tech_pvt->session = NULL; //FIXME } } Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Thu Jan 8 05:08:21 2009 @@ -249,3 +249,4 @@ int skypiax_skype_call(struct skypiax_interface *p, char *idest, int timeout, switch_core_session_t * session); +int skypiax_skype_senddigit(struct skypiax_interface *p, char digit); Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Thu Jan 8 05:08:21 2009 @@ -10,7 +10,7 @@ /**********************************************************/ /**********************************************************/ -extern switch_core_session_t *global_session; +//extern switch_core_session_t *global_session; #ifdef WIN32 #else /* NOT WIN32 */ @@ -1231,6 +1231,10 @@ fd_set fs; struct timeval to; #endif /* WIN32 */ + private_t *tech_pvt = NULL; + + tech_pvt = p->tech_pvt; + if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -1623,7 +1627,7 @@ //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); - if (!global_session) { //FIXME FIXME FIXME + if (!p->tech_pvt || !tech_pvt->session) { //FIXME FIXME FIXME switch_core_session_t *session = NULL; private_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -1680,8 +1684,8 @@ switch_channel_t *channel = NULL; tech_pvt = p->tech_pvt; - //session = tech_pvt->session; - session = global_session; + session = tech_pvt->session; + //session = global_session; channel = switch_core_session_get_channel(session); //DEBUGA_SKYPE("skype_call: %s, answered\n", SKYPIAX_P_LOG, id); switch_channel_mark_answered(channel); @@ -1714,11 +1718,33 @@ return 0; } +int skypiax_skype_senddigit(struct skypiax_interface *p, char digit) +{ + char msg_to_skype[1024]; + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } + + NOTICA("DIGIT received: %c\n", SKYPIAX_P_LOG, digit); + + sprintf(msg_to_skype, "SET CALL %s DTMF %c", p->skype_call_id, digit); + + skypiax_skype_write(p, msg_to_skype); + + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return 0; +} + int skypiax_skype_call(struct skypiax_interface *p, char *idest, int timeout, switch_core_session_t * session) { char *rdest; char msg_to_skype[1024]; + private_t *tech_pvt; + + tech_pvt = p->tech_pvt; if (option_debug > 10) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -1745,7 +1771,7 @@ } return -1; } - global_session = session; + tech_pvt->session = session; //FIXME ast_queue_control(p->owner, SKYPIAX_CONTROL_RINGING); return 0;

1 0

[commit] r11090 - in freeswitch/trunk/src: . mod/formats/mod_sndfile
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: anthm Date: Wed Jan 7 19:42:09 2009 New Revision: 11090 Log: fix resampling issues (add to 1.0 branch) Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Wed Jan 7 19:42:09 2009 @@ -237,7 +237,7 @@ handle->sample_count += *len; - return SWITCH_STATUS_SUCCESS; + return *len ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; } static switch_status_t sndfile_file_write(switch_file_handle_t *handle, void *data, size_t *len) Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed Jan 7 19:42:09 2009 @@ -125,21 +125,27 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, void *data, switch_size_t *len) { switch_status_t status; - switch_size_t orig_len = *len; + switch_size_t want, got, orig_len = *len; switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); - if (fh->buffer && switch_buffer_inuse(fh->buffer)) { + if (fh->buffer && switch_buffer_inuse(fh->buffer) >= *len * 2) { *len = switch_buffer_read(fh->buffer, data, orig_len * 2) / 2; return SWITCH_STATUS_SUCCESS; } - if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS) { + want = *len; + + more: + + if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS || !*len) { *len = 0; goto done; } + got = *len; + if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { if (!fh->resampler) { if (switch_resample_create(&fh->resampler, @@ -153,9 +159,9 @@ fh->resampler->to_len = switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); - if (fh->resampler->to_len > orig_len) { + if (fh->resampler->to_len < want || fh->resampler->to_len > orig_len) { if (!fh->buffer) { - switch_buffer_create_dynamic(&fh->buffer, fh->resampler->to_len * 2, fh->resampler->to_len * 4, fh->resampler->to_len * 8); + switch_buffer_create_dynamic(&fh->buffer, fh->resampler->to_len * 4, fh->resampler->to_len * 8, fh->resampler->to_len * 32); switch_assert(fh->buffer); } if (!fh->dbuf) { @@ -163,17 +169,23 @@ fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen); - + switch_float_to_short(fh->resampler->to, (int16_t *) fh->dbuf, fh->resampler->to_len); switch_buffer_write(fh->buffer, fh->dbuf, fh->resampler->to_len * 2); + + if (switch_buffer_inuse(fh->buffer) < want * 2) { + *len = want - fh->resampler->to_len; + goto more; + } *len = switch_buffer_read(fh->buffer, data, orig_len * 2) / 2; } else { switch_float_to_short(fh->resampler->to, data, fh->resampler->to_len); *len = fh->resampler->to_len; } + } - + done: return status;

1 0

[commit] r11089 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 07 Jan '09

07 Jan '09

Author: gmaruzz Date: Wed Jan 7 13:21:35 2009 New Revision: 11089 Log: skypiax: skypiax_call now takes the interface name from outbound_profile Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Wed Jan 7 13:21:35 2009 @@ -520,10 +520,50 @@ skypiax_interface_t *p = NULL; switch_core_session_add_stream(*new_session, NULL); + + if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { - tech_pvt->p = &globals.SKYPIAX_INTERFACES[19]; //FIXME - globals.SKYPIAX_INTERFACES[19].tech_pvt = tech_pvt; //FIXME + int found=0; + char interface_name[256]; + + + if (strlen(outbound_profile->destination_number)) { + int i; + char *slash; + + strncpy(interface_name, outbound_profile->destination_number, 255); + slash=strchr(interface_name, '/'); + *slash='\0'; + + + for(i=0; i< SKYPIAX_MAX_INTERFACES; i++){ + + if( strlen(globals.SKYPIAX_INTERFACES[i].name) && (strncmp(globals.SKYPIAX_INTERFACES[i].name, interface_name, strlen(interface_name)) == 0 )) { + + DEBUGA_SKYPE( "globals.SKYPIAX_INTERFACES[%d].name=|||%s|||?\n", SKYPIAX_P_LOG, i, globals.SKYPIAX_INTERFACES[i].name); + tech_pvt->p = &globals.SKYPIAX_INTERFACES[i]; //FIXME + globals.SKYPIAX_INTERFACES[i].tech_pvt = tech_pvt; //FIXME + found=1; + break; + } + + } + + } else { + ERRORA( "Doh! no destination number?\n", SKYPIAX_P_LOG); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + if(!found){ + ERRORA( "Doh! no matching interface for |||%s|||?\n", SKYPIAX_P_LOG, interface_name); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + + } + //tech_pvt->p = &globals.SKYPIAX_INTERFACES[19]; //FIXME + //globals.SKYPIAX_INTERFACES[19].tech_pvt = tech_pvt; //FIXME channel = switch_core_session_get_channel(*new_session); skypiax_tech_init(tech_pvt, *new_session, NULL); } else { @@ -538,6 +578,10 @@ snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number); switch_channel_set_name(channel, name); + //NOTICA( "outbound_profile->destination_number=|||%s|||\n", SKYPIAX_P_LOG, outbound_profile->destination_number); + //NOTICA( "outbound_profile->username=|||%s|||\n", SKYPIAX_P_LOG, outbound_profile->username); + //NOTICA( "outbound_profile->caller_id_name=|||%s|||\n", SKYPIAX_P_LOG, outbound_profile->caller_id_name); + //NOTICA( "outbound_profile->caller_id_number=|||%s|||\n", SKYPIAX_P_LOG, outbound_profile->caller_id_number); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); switch_channel_set_caller_profile(channel, caller_profile);

1 0

[commit] r11088 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 Jan '09

07 Jan '09

Author: anthm Date: Wed Jan 7 12:09:55 2009 New Revision: 11088 Log: issue from http://track.sipfoundry.org/browse/XECS-2079 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Jan 7 12:09:55 2009 @@ -2754,7 +2754,8 @@ SIPTAG_CONTACT_STR(tech_pvt->profile->url), 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()); + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF((profile->pflags & PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_END()); } else if(profile->pflags & PFLAG_3PCC_PROXY){ //3PCC proxy mode delays the 200 OK until the call is answered switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); @@ -2839,7 +2840,8 @@ 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()); + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF((profile->pflags & PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_END()); launch_media_on_hold(session); switch_core_session_rwunlock(other_session); @@ -2905,7 +2907,8 @@ 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()); + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF((profile->pflags & PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_END()); } else { nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); }

1 0

[commit] r11087 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 07 Jan '09

07 Jan '09

Author: gmaruzz Date: Wed Jan 7 10:20:06 2009 New Revision: 11087 Log: actually the one before was: Merge of trunk revisions 10915:11086 into gmaruzz branch Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Wed Jan 7 10:20:06 2009 @@ -1,5 +1,6 @@ #include "skypiax.h" + SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown); SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL); //mod_skypiax_runtime);

1 0