- Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r10989 - in freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax: . configs
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: gmaruzz Date: Mon Dec 29 13:36:45 2008 New Revision: 10989 Log: skypiax: config and startup files, and make it compile on 64bit machines, let's hope it still compile on 32bit. I'll check it tomorrow Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 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 Mon Dec 29 13:36:45 2008 @@ -1,3 +1,6 @@ +# remember to add here the removing of all the installed snd-* modules, so you're sure only the snd-dummy driver will be around +rmmod snd_hda_intel + # 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) @@ -5,125 +8,125 @@ sleep 5 #start the fake X server on a given port -Xvfb :101 & +/usr/bin/Xvfb :101 & sleep 5 # start a Skype client instance that will connect to the X server above, and will login to the Skype network using the "username password" you send to it on stdin. Here xxx would be the password and skypiax1 the username -echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin & +echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :102 & +/usr/bin/Xvfb :102 & sleep 5 -echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype.static --pipelogin & +echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :103 & +/usr/bin/Xvfb :103 & sleep 5 -echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype.static --pipelogin & +echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :104 & +/usr/bin/Xvfb :104 & sleep 5 -echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype.static --pipelogin & +echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :105 & +/usr/bin/Xvfb :105 & sleep 5 -echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype.static --pipelogin & +echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :106 & +/usr/bin/Xvfb :106 & sleep 5 -echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype.static --pipelogin & +echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :107 & +/usr/bin/Xvfb :107 & sleep 5 -echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype.static --pipelogin & +echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :108 & +/usr/bin/Xvfb :108 & sleep 5 -echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype.static --pipelogin & +echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :109 & +/usr/bin/Xvfb :109 & sleep 5 -echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype.static --pipelogin & +echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :110 & +/usr/bin/Xvfb :110 & sleep 5 -echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype.static --pipelogin & +echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :111 & +/usr/bin/Xvfb :111 & sleep 5 -echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype.static --pipelogin & +echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :112 & +/usr/bin/Xvfb :112 & sleep 5 -echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype.static --pipelogin & +echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :113 & +/usr/bin/Xvfb :113 & sleep 5 -echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype.static --pipelogin & +echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :114 & +/usr/bin/Xvfb :114 & sleep 5 -echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype.static --pipelogin & +echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :115 & +/usr/bin/Xvfb :115 & sleep 5 -echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype.static --pipelogin & +echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :116 & +/usr/bin/Xvfb :116 & sleep 5 -echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype.static --pipelogin & +echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :117 & +/usr/bin/Xvfb :117 & sleep 5 -echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype.static --pipelogin & +echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :118 & +/usr/bin/Xvfb :118 & sleep 5 -echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype.static --pipelogin & +echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :119 & +/usr/bin/Xvfb :119 & sleep 5 -echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype.static --pipelogin & +echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype --pipelogin & sleep 10 -Xvfb :120 & +/usr/bin/Xvfb :120 & sleep 5 -echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype.static --pipelogin & +echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype --pipelogin & sleep 10 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 Mon Dec 29 13:36:45 2008 @@ -190,7 +190,7 @@ howmany = write(p->audiopipe[1], srv_in, howmany); #endif /* WIN32 */ p->audiobuf_is_loaded = 0; - WARNINGA("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, len, howmany); + WARNINGA("SRV PIPE WRITE=====> req=%lu recv=%d to sent=%d sent=%u\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, len, howmany); }else if (len == SAMPLES_PER_FRAME * sizeof(short) / 2) { #if 1 @@ -570,7 +570,7 @@ if (samples != SAMPLES_PER_FRAME * sizeof(short)) { if (samples) - ERRORA("SRV PIPE READ=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, + ERRORA("SRV PIPE READ=====> NOT GOOD samples=%u expected=%lu\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); //do nothing } else {

1 0

[commit] r10988 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: gmaruzz Date: Mon Dec 29 07:47:42 2008 New Revision: 10988 Log: skypiax: updated config and startup files Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh 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 Mon Dec 29 07:47:42 2008 @@ -1,9 +1,14 @@ +# 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) modprobe snd-dummy enable=1,1,1 +sleep 5 - +#start the fake X server on a given port Xvfb :101 & sleep 5 +# start a Skype client instance that will connect to the X server above, and will login to the Skype network using the "username password" you send to it on stdin. Here xxx would be the password and skypiax1 the username echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin & sleep 10

1 0

[commit] r10987 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: gmaruzz Date: Mon Dec 29 07:36:06 2008 New Revision: 10987 Log: skypiax: updated config and startup files Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/startskype.sh - copied unchanged from r10986, /freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 Removed: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1

1 0

[commit] r10986 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: gmaruzz Date: Mon Dec 29 07:35:55 2008 New Revision: 10986 Log: skypiax: updated config and startup files Removed: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/default.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/modules.conf.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/openzap.conf.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/portaudio.conf.xml freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/zaptel.conf Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 Mon Dec 29 07:35:55 2008 @@ -1,3 +1,6 @@ +modprobe snd-dummy enable=1,1,1 + + Xvfb :101 & sleep 5

1 0

[commit] r10985 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: gmaruzz Date: Mon Dec 29 07:31:22 2008 New Revision: 10985 Log: skypiax: updated config and startup files Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command Mon Dec 29 07:31:22 2008 @@ -1,3 +1,5 @@ modprobe snd-dummy Xvfb :101 & +sleep 1 echo "skypiax1 xxxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin & +sleep 5 Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 Mon Dec 29 07:31:22 2008 @@ -1,121 +1,121 @@ Xvfb :101 & -sleep 1 +sleep 5 echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :102 & -sleep 1 +sleep 5 echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :103 & -sleep 1 +sleep 5 echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :104 & -sleep 1 +sleep 5 echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :105 & -sleep 1 +sleep 5 echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :106 & -sleep 1 +sleep 5 echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :107 & -sleep 1 +sleep 5 echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :108 & -sleep 1 +sleep 5 echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :109 & -sleep 1 +sleep 5 echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :110 & -sleep 1 +sleep 5 echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :111 & -sleep 1 +sleep 5 echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :112 & -sleep 1 +sleep 5 echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :113 & -sleep 1 +sleep 5 echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :114 & -sleep 1 +sleep 5 echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :115 & -sleep 1 +sleep 5 echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :116 & -sleep 1 +sleep 5 echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :117 & -sleep 1 +sleep 5 echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :118 & -sleep 1 +sleep 5 echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :119 & -sleep 1 +sleep 5 echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 Xvfb :120 & -sleep 1 +sleep 5 echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype.static --pipelogin & -sleep 5 +sleep 10 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 Mon Dec 29 07:31:22 2008 @@ -16,8 +16,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":101"/> - <param name="tcp_cli_port" value="5556"/> - <param name="tcp_srv_port" value="5557"/> + <param name="tcp_cli_port" value="15556"/> + <param name="tcp_srv_port" value="15557"/> <param name="skype_user" value="skypiax1"/> <param name="skype_password" value="xxxx"/> </interface> @@ -26,8 +26,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":102"/> - <param name="tcp_cli_port" value="5558"/> - <param name="tcp_srv_port" value="5559"/> + <param name="tcp_cli_port" value="15558"/> + <param name="tcp_srv_port" value="15559"/> <param name="skype_user" value="skypiax2"/> <param name="skype_password" value="xxxx"/> </interface> @@ -37,8 +37,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":103"/> - <param name="tcp_cli_port" value="5560"/> - <param name="tcp_srv_port" value="5561"/> + <param name="tcp_cli_port" value="15560"/> + <param name="tcp_srv_port" value="15561"/> <param name="skype_user" value="skypiax3"/> <param name="skype_password" value="xxxx"/> </interface> @@ -48,8 +48,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":104"/> - <param name="tcp_cli_port" value="5562"/> - <param name="tcp_srv_port" value="5563"/> + <param name="tcp_cli_port" value="15562"/> + <param name="tcp_srv_port" value="15563"/> <param name="skype_user" value="skypiax4"/> <param name="skype_password" value="xxxx"/> </interface> @@ -59,8 +59,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":105"/> - <param name="tcp_cli_port" value="5564"/> - <param name="tcp_srv_port" value="5565"/> + <param name="tcp_cli_port" value="15564"/> + <param name="tcp_srv_port" value="15565"/> <param name="skype_user" value="skypiax5"/> <param name="skype_password" value="xxxx"/> </interface> @@ -69,8 +69,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":106"/> - <param name="tcp_cli_port" value="5566"/> - <param name="tcp_srv_port" value="5567"/> + <param name="tcp_cli_port" value="15566"/> + <param name="tcp_srv_port" value="15567"/> <param name="skype_user" value="skypiax6"/> <param name="skype_password" value="xxxx"/> </interface> @@ -79,8 +79,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":107"/> - <param name="tcp_cli_port" value="5568"/> - <param name="tcp_srv_port" value="5569"/> + <param name="tcp_cli_port" value="15568"/> + <param name="tcp_srv_port" value="15569"/> <param name="skype_user" value="skypiax7"/> <param name="skype_password" value="xxxx"/> </interface> @@ -90,8 +90,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":108"/> - <param name="tcp_cli_port" value="5570"/> - <param name="tcp_srv_port" value="5571"/> + <param name="tcp_cli_port" value="15570"/> + <param name="tcp_srv_port" value="15571"/> <param name="skype_user" value="skypiax8"/> <param name="skype_password" value="xxxx"/> </interface> @@ -101,8 +101,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":109"/> - <param name="tcp_cli_port" value="5572"/> - <param name="tcp_srv_port" value="5573"/> + <param name="tcp_cli_port" value="15572"/> + <param name="tcp_srv_port" value="15573"/> <param name="skype_user" value="skypiax9"/> <param name="skype_password" value="xxxx"/> </interface> @@ -112,8 +112,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":110"/> - <param name="tcp_cli_port" value="5574"/> - <param name="tcp_srv_port" value="5575"/> + <param name="tcp_cli_port" value="15574"/> + <param name="tcp_srv_port" value="15575"/> <param name="skype_user" value="skypiax10"/> <param name="skype_password" value="xxxx"/> </interface> @@ -123,8 +123,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":111"/> - <param name="tcp_cli_port" value="5576"/> - <param name="tcp_srv_port" value="5577"/> + <param name="tcp_cli_port" value="15576"/> + <param name="tcp_srv_port" value="15577"/> <param name="skype_user" value="skypiax11"/> <param name="skype_password" value="xxxx"/> </interface> @@ -134,8 +134,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":112"/> - <param name="tcp_cli_port" value="5578"/> - <param name="tcp_srv_port" value="5579"/> + <param name="tcp_cli_port" value="15578"/> + <param name="tcp_srv_port" value="15579"/> <param name="skype_user" value="skypiax12"/> <param name="skype_password" value="xxxx"/> </interface> @@ -145,8 +145,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":113"/> - <param name="tcp_cli_port" value="5580"/> - <param name="tcp_srv_port" value="5581"/> + <param name="tcp_cli_port" value="15580"/> + <param name="tcp_srv_port" value="15581"/> <param name="skype_user" value="skypiax13"/> <param name="skype_password" value="xxxx"/> </interface> @@ -156,8 +156,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":114"/> - <param name="tcp_cli_port" value="5582"/> - <param name="tcp_srv_port" value="5583"/> + <param name="tcp_cli_port" value="15582"/> + <param name="tcp_srv_port" value="15583"/> <param name="skype_user" value="skypiax14"/> <param name="skype_password" value="xxxx"/> </interface> @@ -167,8 +167,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":115"/> - <param name="tcp_cli_port" value="5584"/> - <param name="tcp_srv_port" value="5585"/> + <param name="tcp_cli_port" value="15584"/> + <param name="tcp_srv_port" value="15585"/> <param name="skype_user" value="skypiax15"/> <param name="skype_password" value="xxxx"/> </interface> @@ -178,8 +178,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":116"/> - <param name="tcp_cli_port" value="5586"/> - <param name="tcp_srv_port" value="5587"/> + <param name="tcp_cli_port" value="15586"/> + <param name="tcp_srv_port" value="15587"/> <param name="skype_user" value="skypiax16"/> <param name="skype_password" value="xxxx"/> </interface> @@ -189,8 +189,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":117"/> - <param name="tcp_cli_port" value="5588"/> - <param name="tcp_srv_port" value="5589"/> + <param name="tcp_cli_port" value="15588"/> + <param name="tcp_srv_port" value="15589"/> <param name="skype_user" value="skypiax17"/> <param name="skype_password" value="xxxx"/> </interface> @@ -200,8 +200,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":118"/> - <param name="tcp_cli_port" value="5590"/> - <param name="tcp_srv_port" value="5591"/> + <param name="tcp_cli_port" value="15590"/> + <param name="tcp_srv_port" value="15591"/> <param name="skype_user" value="skypiax18"/> <param name="skype_password" value="xxxx"/> </interface> @@ -211,8 +211,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":119"/> - <param name="tcp_cli_port" value="5592"/> - <param name="tcp_srv_port" value="5593"/> + <param name="tcp_cli_port" value="15592"/> + <param name="tcp_srv_port" value="15593"/> <param name="skype_user" value="skypiax19"/> <param name="skype_password" value="xxxx"/> </interface> @@ -222,8 +222,8 @@ <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="X11-display" value=":120"/> - <param name="tcp_cli_port" value="5594"/> - <param name="tcp_srv_port" value="5595"/> + <param name="tcp_cli_port" value="15594"/> + <param name="tcp_srv_port" value="15595"/> <param name="skype_user" value="skypiax20"/> <param name="skype_password" value="xxxx"/> </interface>

1 0

[commit] r10984 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: gmaruzz Date: Mon Dec 29 04:31:37 2008 New Revision: 10984 Log: updated configs and startx commands Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/skypiax.conf.xml Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command Mon Dec 29 04:31:37 2008 @@ -1,2 +1,3 @@ +modprobe snd-dummy Xvfb :101 & echo "skypiax1 xxxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin & Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command1 Mon Dec 29 04:31:37 2008 @@ -0,0 +1,121 @@ +Xvfb :101 & +sleep 1 + +echo "skypiax1 xxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :102 & +sleep 1 + +echo "skypiax2 xxx"| DISPLAY=:102 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :103 & +sleep 1 + +echo "skypiax3 xxx"| DISPLAY=:103 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :104 & +sleep 1 + +echo "skypiax4 xxx"| DISPLAY=:104 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :105 & +sleep 1 + +echo "skypiax5 xxx"| DISPLAY=:105 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :106 & +sleep 1 + +echo "skypiax6 xxx"| DISPLAY=:106 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :107 & +sleep 1 + +echo "skypiax7 xxx"| DISPLAY=:107 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :108 & +sleep 1 + +echo "skypiax8 xxx"| DISPLAY=:108 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :109 & +sleep 1 + +echo "skypiax9 xxx"| DISPLAY=:109 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :110 & +sleep 1 + +echo "skypiax10 xxx"| DISPLAY=:110 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :111 & +sleep 1 + +echo "skypiax11 xxx"| DISPLAY=:111 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :112 & +sleep 1 + +echo "skypiax12 xxx"| DISPLAY=:112 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :113 & +sleep 1 + +echo "skypiax13 xxx"| DISPLAY=:113 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :114 & +sleep 1 + +echo "skypiax14 xxx"| DISPLAY=:114 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :115 & +sleep 1 + +echo "skypiax15 xxx"| DISPLAY=:115 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :116 & +sleep 1 + +echo "skypiax16 xxx"| DISPLAY=:116 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :117 & +sleep 1 + +echo "skypiax17 xxx"| DISPLAY=:117 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :118 & +sleep 1 + +echo "skypiax18 xxx"| DISPLAY=:118 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :119 & +sleep 1 + +echo "skypiax19 xxx"| DISPLAY=:119 /usr/bin/skype.static --pipelogin & + +sleep 5 +Xvfb :120 & +sleep 1 + +echo "skypiax20 xxx"| DISPLAY=:120 /usr/bin/skype.static --pipelogin & + +sleep 5 + 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 Mon Dec 29 04:31:37 2008 @@ -64,6 +64,171 @@ <param name="skype_user" value="skypiax5"/> <param name="skype_password" value="xxxx"/> </interface> + <interface id="6" name="skypiax6"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":106"/> + <param name="tcp_cli_port" value="5566"/> + <param name="tcp_srv_port" value="5567"/> + <param name="skype_user" value="skypiax6"/> + <param name="skype_password" value="xxxx"/> + </interface> + <interface id="7" name="skypiax7"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":107"/> + <param name="tcp_cli_port" value="5568"/> + <param name="tcp_srv_port" value="5569"/> + <param name="skype_user" value="skypiax7"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="8" name="skypiax8"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":108"/> + <param name="tcp_cli_port" value="5570"/> + <param name="tcp_srv_port" value="5571"/> + <param name="skype_user" value="skypiax8"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="9" name="skypiax9"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":109"/> + <param name="tcp_cli_port" value="5572"/> + <param name="tcp_srv_port" value="5573"/> + <param name="skype_user" value="skypiax9"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="10" name="skypiax10"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":110"/> + <param name="tcp_cli_port" value="5574"/> + <param name="tcp_srv_port" value="5575"/> + <param name="skype_user" value="skypiax10"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="11" name="skypiax11"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":111"/> + <param name="tcp_cli_port" value="5576"/> + <param name="tcp_srv_port" value="5577"/> + <param name="skype_user" value="skypiax11"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="12" name="skypiax12"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":112"/> + <param name="tcp_cli_port" value="5578"/> + <param name="tcp_srv_port" value="5579"/> + <param name="skype_user" value="skypiax12"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="13" name="skypiax13"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":113"/> + <param name="tcp_cli_port" value="5580"/> + <param name="tcp_srv_port" value="5581"/> + <param name="skype_user" value="skypiax13"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="14" name="skypiax14"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":114"/> + <param name="tcp_cli_port" value="5582"/> + <param name="tcp_srv_port" value="5583"/> + <param name="skype_user" value="skypiax14"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="15" name="skypiax15"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":115"/> + <param name="tcp_cli_port" value="5584"/> + <param name="tcp_srv_port" value="5585"/> + <param name="skype_user" value="skypiax15"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="16" name="skypiax16"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":116"/> + <param name="tcp_cli_port" value="5586"/> + <param name="tcp_srv_port" value="5587"/> + <param name="skype_user" value="skypiax16"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="17" name="skypiax17"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":117"/> + <param name="tcp_cli_port" value="5588"/> + <param name="tcp_srv_port" value="5589"/> + <param name="skype_user" value="skypiax17"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="18" name="skypiax18"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":118"/> + <param name="tcp_cli_port" value="5590"/> + <param name="tcp_srv_port" value="5591"/> + <param name="skype_user" value="skypiax18"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="19" name="skypiax19"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":119"/> + <param name="tcp_cli_port" value="5592"/> + <param name="tcp_srv_port" value="5593"/> + <param name="skype_user" value="skypiax19"/> + <param name="skype_password" value="xxxx"/> + </interface> + + <interface id="20" name="skypiax20"> + <param name="hold-music" value="$${moh_uri}"/> + <param name="dialplan" value="XML"/> + <param name="context" value="default"/> + <param name="X11-display" value=":120"/> + <param name="tcp_cli_port" value="5594"/> + <param name="tcp_srv_port" value="5595"/> + <param name="skype_user" value="skypiax20"/> + <param name="skype_password" value="xxxx"/> + </interface> + +  <interface>

1 0

[commit] r10980 - freeswitch/branches/gmaruzz
by FreeSWITCH SVN 28 Dec '08

28 Dec '08

Author: gmaruzz Date: Sun Dec 28 09:52:39 2008 New Revision: 10980 Log: updated modules.conf without mod_fax Modified: freeswitch/branches/gmaruzz/modules.conf Modified: freeswitch/branches/gmaruzz/modules.conf ============================================================================== --- freeswitch/branches/gmaruzz/modules.conf (original) +++ freeswitch/branches/gmaruzz/modules.conf Sun Dec 28 09:52:39 2008 @@ -6,7 +6,7 @@ applications/mod_dptools applications/mod_enum applications/mod_fifo -applications/mod_fax +#applications/mod_fax applications/mod_voicemail applications/mod_limit applications/mod_expr

1 0

[commit] r10979 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs
by FreeSWITCH SVN 28 Dec '08

28 Dec '08

Author: gmaruzz Date: Sun Dec 28 09:51:09 2008 New Revision: 10979 Log: skypiax: added 'command' to configs, eg. to start Xvfb and skype on linux Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command Added: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command ============================================================================== --- (empty file) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/configs/command Sun Dec 28 09:51:09 2008 @@ -0,0 +1,2 @@ +Xvfb :101 & +echo "skypiax1 xxxx"| DISPLAY=:101 /usr/bin/skype.static --pipelogin &

1 0

[commit] r10978 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 28 Dec '08

28 Dec '08

Author: gmaruzz Date: Sun Dec 28 07:01:22 2008 New Revision: 10978 Log: skypiax: using real pipes on linux 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 Sun Dec 28 07:01:22 2008 @@ -1,5 +1,5 @@ #include "skypiax.h" -#include <netinet/tcp.h> +//#include <netinet/tcp.h> extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug;

1 0

[commit] r10977 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 28 Dec '08

28 Dec '08

Author: gmaruzz Date: Sun Dec 28 06:25:01 2008 New Revision: 10977 Log: skypiax: using real pipes on linux 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 Sun Dec 28 06:25:01 2008 @@ -393,9 +393,16 @@ sent = frame->datalen; //DEBUGA_SKYPE("CLI PIPE to write %d\n", SKYPIAX_P_LOG, sent); +#ifdef WIN32 switch_file_write(p->audioskypepipe[1], frame->data, &sent); - if(sent != frame->datalen) +#else /* WIN32 */ + sent = write(p->audioskypepipe[1], frame->data, sent); +#endif /* WIN32 */ + if(sent != frame->datalen){ ERRORA("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); + }else{ + //NOTICA("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); + } return SWITCH_STATUS_SUCCESS; @@ -958,7 +965,11 @@ p = &globals.SKYPIAX_INTERFACES[interface_id]; if(globals.SKYPIAX_INTERFACES[interface_id].skypiax_do_controldev_thread_thread){ +#ifdef WIN32 switch_file_write(p->AsteriskHandlesAst.fdesc[1], "sciutati", &howmany); // let's the controldev_thread die +#else /* WIN32 */ + write(p->AsteriskHandlesAst.fdesc[1], "sciutati", howmany); +#endif /* WIN32 */ } if(globals.SKYPIAX_INTERFACES[interface_id].skypiax_do_skype_thread_thread){ 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 Sun Dec 28 06:25:01 2008 @@ -137,7 +137,7 @@ Display *disp; Window win; int api_connected; - switch_file_t *fdesc[2]; + int fdesc[2]; }; #else //WIN32 @@ -192,8 +192,13 @@ int skype_callflow; /*!< \brief 'callflow' of the skype interface (as opposed to phone interface) */ int skype; /*!< \brief config flag, bool, Skype support on this interface (0 if false, -1 if true) */ int control_to_send; +#ifdef WIN32 switch_file_t *audiopipe[2]; switch_file_t *audioskypepipe[2]; +#else /* WIN32 */ + int audiopipe[2]; + int audioskypepipe[2]; +#endif /* WIN32 */ switch_thread_t *tcp_srv_thread; switch_thread_t *tcp_cli_thread; switch_thread_t *skypiax_do_controldev_thread_thread; 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 Sun Dec 28 06:25:01 2008 @@ -1,4 +1,5 @@ #include "skypiax.h" +#include <netinet/tcp.h> extern switch_memory_pool_t *skypiax_module_pool; extern int option_debug; @@ -53,6 +54,8 @@ int exit = 0; unsigned int kill_cli_size; short kill_cli_buff[SAMPLES_PER_FRAME]; + short totalbuf[SAMPLES_PER_FRAME]; + //int one = 1; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -70,6 +73,8 @@ return NULL; } + //setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)); + if (bind(s, (struct sockaddr *) &my_addr, sizeof(struct sockaddr)) < 0) { ERRORA("bind Error\n", SKYPIAX_P_LOG); if (option_debug > 10) { @@ -78,7 +83,6 @@ return NULL; } DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG); - ERRORA("sizeof(short)=%d, sizeof(char)=%d\n", SKYPIAX_P_LOG, sizeof(short), sizeof(char)); listen(s, 6); @@ -107,7 +111,7 @@ fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 50000; + to.tv_usec = 2000000; //20 msec to.tv_sec = 0; rt = select(fdselect + 1, &fs, NULL, NULL, &to); @@ -138,7 +142,6 @@ p->audiobuf_is_loaded = 1; } else { unsigned int howmany; - short totalbuf[SAMPLES_PER_FRAME]; howmany = len / 2 / 2; for (i = 0; i < howmany; i++) @@ -152,7 +155,11 @@ howmany = len; +#ifdef WIN32 switch_file_write(p->audiopipe[1], totalbuf, &howmany); +#else /* WIN32 */ + howmany = write(p->audiopipe[1], totalbuf, howmany); +#endif /* WIN32 */ p->audiobuf_is_loaded = 0; //DEBUGA_SKYPE("read=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, (len*sizeof(short))/2, howmany); } @@ -177,7 +184,11 @@ WARNINGA("SRV recv %d\n", SKYPIAX_P_LOG, len); +#ifdef WIN32 switch_file_write(p->audiopipe[1], srv_in, &howmany); +#else /* WIN32 */ + howmany = write(p->audiopipe[1], srv_in, howmany); +#endif /* WIN32 */ p->audiobuf_is_loaded = 0; WARNINGA("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, len, howmany); }else if (len == SAMPLES_PER_FRAME * sizeof(short) / 2) { @@ -192,7 +203,7 @@ p->audiobuf_is_loaded = 1; } else { unsigned int howmany = SAMPLES_PER_FRAME * sizeof(short); - short totalbuf[SAMPLES_PER_FRAME]; + //short totalbuf[SAMPLES_PER_FRAME]; for (i = 0; i < (len / sizeof(short)); i++) totalbuf[i] = p->audiobuf[i]; @@ -201,7 +212,11 @@ i++; } +#ifdef WIN32 switch_file_write(p->audiopipe[1], totalbuf, &howmany); +#else /* WIN32 */ + howmany = write(p->audiopipe[1], totalbuf, howmany); +#endif /* WIN32 */ p->audiobuf_is_loaded = 0; //NOTICA("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, SAMPLES_PER_FRAME * sizeof(short), howmany); } @@ -235,10 +250,13 @@ } } else { - ERRORA("SRV rt=%d\n", SKYPIAX_P_LOG, rt); + if(rt) + ERRORA("SRV rt=%d\n", SKYPIAX_P_LOG, rt); + switch_sleep(10000); } } +#ifdef WIN32 kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audiopipe[1], kill_cli_buff, &kill_cli_size); kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); @@ -248,6 +266,17 @@ switch_file_write(p->audiopipe[1], kill_cli_buff, &kill_cli_size); kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audioskypepipe[1], kill_cli_buff, &kill_cli_size); +#else /* WIN32 */ + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + write(p->audiopipe[1], kill_cli_buff, kill_cli_size); + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + write(p->audioskypepipe[1], kill_cli_buff, kill_cli_size); + p->interface_state = SKYPIAX_STATE_DOWN; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + write(p->audiopipe[1], kill_cli_buff, kill_cli_size); + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); + write(p->audioskypepipe[1], kill_cli_buff, kill_cli_size); +#endif /* WIN32 */ DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); @@ -297,6 +326,7 @@ short cli_out[SAMPLES_PER_FRAME * 2]; short cli_in[SAMPLES_PER_FRAME]; #endif /* WIN32 */ + //int one = 1; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -314,6 +344,8 @@ return NULL; } + //setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)); + if (bind(s, (struct sockaddr *) &my_addr, sizeof(struct sockaddr)) < 0) { ERRORA("bind Error\n", SKYPIAX_P_LOG); if (option_debug > 10) { @@ -349,21 +381,33 @@ if (!running) break; - fdselect = fd; +#ifdef WIN32 + fdselect = fd; //cannot select on audioskypepipe, let's select on socket write +#else /* WIN32 */ + fdselect = p->audioskypepipe[0]; +#endif /* WIN32 */ FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 50000; //50msec + to.tv_usec = 2000000; //20 msec to.tv_sec = 0; - rt = select(fdselect + 1, NULL, &fs, NULL, &to); +#ifdef WIN32 + rt = select(fdselect + 1, NULL, &fs, NULL, &to);//cannot select on audioskypepipe, let's select on socket write +#else /* WIN32 */ + rt = select(fdselect + 1, &fs, NULL, NULL, &to); +#endif /* WIN32 */ //switch_sleep(1000);//FIXME - memset(cli_in, '\0', sizeof(cli_in)); - //rt = 1; + //memset(cli_in, '\0', sizeof(cli_in)); + //rt = 0; if (rt > 0) { /*********************************************/ if ((SAMPLERATE_SKYPIAX - 8000) == 0) { got = SAMPLES_PER_FRAME * sizeof(short); +#ifdef WIN32 switch_file_read(p->audioskypepipe[0], cli_in, &got); +#else /* WIN32 */ + got = read(p->audioskypepipe[0], cli_in, got); +#endif /* WIN32 */ if (got > 0) { //DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); @@ -396,7 +440,11 @@ /*********************************************/ else if (SAMPLERATE_SKYPIAX == 16000) { got = SAMPLES_PER_FRAME * sizeof(short); +#ifdef WIN32 switch_file_read(p->audioskypepipe[0], cli_in, &got); +#else /* WIN32 */ + got = read(p->audioskypepipe[0], cli_in, got); +#endif /* WIN32 */ if (got > 0) { if(got != SAMPLES_PER_FRAME * sizeof(short) ) @@ -422,7 +470,11 @@ } /*********************************************/ - } + } else { + switch_sleep(1000); + if(rt) + ERRORA("select give us: %u\n", SKYPIAX_P_LOG, rt); + } } DEBUGA_SKYPE("Skype server GONE\n", SKYPIAX_P_LOG); @@ -449,17 +501,26 @@ int skypiax_skypeaudio_init(struct skypiax_interface *p) { - switch_status_t rv; +#ifdef WIN32 + switch_status_t rv; rv = switch_file_pipe_create(&p->audiopipe[0], &p->audiopipe[1], skypiax_module_pool); + rv = + switch_file_pipe_create(&p->audioskypepipe[0], &p->audioskypepipe[1], skypiax_module_pool); +#else /* WIN32 */ + pipe(p->audiopipe); + fcntl(p->audiopipe[0], F_SETFL, O_NONBLOCK); + fcntl(p->audiopipe[1], F_SETFL, O_NONBLOCK); + pipe(p->audioskypepipe); + fcntl(p->audioskypepipe[0], F_SETFL, O_NONBLOCK); + fcntl(p->audioskypepipe[1], F_SETFL, O_NONBLOCK); +#endif /* WIN32 */ //rv = switch_file_pipe_timeout_set(p->audiopipe[0], 100); /* the pipe is our audio fd for pbx to poll on */ - p->skypiax_sound_capt_fd = p->audiopipe[0]; + //p->skypiax_sound_capt_fd = p->audiopipe[0]; - rv = - switch_file_pipe_create(&p->audioskypepipe[0], &p->audioskypepipe[1], skypiax_module_pool); //rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 20000); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); @@ -472,18 +533,40 @@ struct skypiax_interface *p; unsigned int samples; int rt; +#ifndef WIN32 + int fdselect; + fd_set fs; + struct timeval to; +#endif /* WIN32 */ + p = tech_pvt->p; //DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); - +#ifdef WIN32 rt = 1; +#else /* WIN32 */ + + fdselect = p->audiopipe[0]; + FD_ZERO(&fs); + FD_SET(fdselect, &fs); + to.tv_usec = 2000000; //20 msec + to.tv_sec = 0; + rt = select(fdselect + 1, &fs, NULL, NULL, &to); +#endif /* WIN32 */ + if (rt > 0) { samples = SAMPLES_PER_FRAME * sizeof(short); +#ifdef WIN32 switch_file_read(p->audiopipe[0], tech_pvt->read_frame.data, &samples); +#else /* WIN32 */ + + //samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short)); + samples = read(p->audiopipe[0], tech_pvt->read_frame.data, samples); +#endif /* WIN32 */ if (samples != SAMPLES_PER_FRAME * sizeof(short)) { if (samples) @@ -496,7 +579,8 @@ /* A real frame */ } } else { - DEBUGA_SKYPE("select returned %d\n", SKYPIAX_P_LOG, rt); + if(rt) + DEBUGA_SKYPE("select returned %d\n", SKYPIAX_P_LOG, rt); } @@ -943,7 +1027,10 @@ p = obj; DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); - switch_file_pipe_create(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], skypiax_module_pool); + //switch_file_pipe_create(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], skypiax_module_pool); + pipe(p->AsteriskHandlesAst.fdesc); + fcntl(p->AsteriskHandlesAst.fdesc[0], F_SETFL, O_NONBLOCK); + fcntl(p->AsteriskHandlesAst.fdesc[1], F_SETFL, O_NONBLOCK); //switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100); AsteriskHandlesAst = &p->AsteriskHandlesAst; @@ -1037,7 +1124,8 @@ howmany = strlen(b) + 1; - switch_file_write(AsteriskHandlesAst->fdesc[1], b, &howmany); + //switch_file_write(AsteriskHandlesAst->fdesc[1], b, &howmany); + write(AsteriskHandlesAst->fdesc[1], b, howmany); //write(AsteriskHandlesAst->fdesc[1], "\0", 1); //FIXME DEBUGA_SKYPE("SKYPE pipewrite: |||%s|||len=%d serial=%ld\n\n\n", SKYPIAX_P_LOG, b, strlen(b) + 1, an_event.xclient.serial); //switch_sleep(1000); @@ -1135,13 +1223,15 @@ char messaggio_2[4096]; char *buf, obj[512] = "", id[512] = "", prop[512] = "", value[512] = "", *where; char **stringp = NULL; - //int fd; int rt; - //fd_set fs; - //struct timeval to; int a; unsigned int howmany; unsigned int i; +#ifndef WIN32 + int fdselect; + fd_set fs; + struct timeval to; +#endif /* WIN32 */ if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -1151,11 +1241,27 @@ memset(messaggio, 0, 4096); memset(messaggio_2, 0, 4096); +#ifdef WIN32 rt = 1; - //if (rt > 0) { +#else /* WIN32 */ + + fdselect = p->AsteriskHandlesAst.fdesc[0]; + FD_ZERO(&fs); + FD_SET(fdselect, &fs); + to.tv_usec = 2000000; //500 msec + to.tv_sec = 0; + rt = select(fdselect + 1, &fs, NULL, NULL, &to); +#endif /* WIN32 */ + + if (rt > 0) { if (p->AsteriskHandlesAst.fdesc[0]) { howmany = sizeof(read_from_pipe); +#ifdef WIN32 switch_file_read(p->AsteriskHandlesAst.fdesc[0], read_from_pipe, &howmany); +#else /* WIN32 */ + howmany = + read(p->AsteriskHandlesAst.fdesc[0], read_from_pipe, sizeof(read_from_pipe)); +#endif /* WIN32 */ a = 0; for (i = 0; i < howmany; i++) { @@ -1592,6 +1698,7 @@ } //read_from_pipe } + } if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);

1 0