December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10990 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: anthm Date: Mon Dec 29 13:40:40 2008 New Revision: 10990 Log: don't display console_clean logs Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Mon Dec 29 13:40:40 2008 @@ -86,17 +86,17 @@ int level = 0, tchannel = 0; const char *lname = esl_event_get_header(handle->last_event, "log-level"); const char *channel = esl_event_get_header(handle->last_event, "text-channel"); - const char *file = esl_event_get_header(handle->last_event, "log-file"); + //const char *file = esl_event_get_header(handle->last_event, "log-file"); if (channel) { tchannel = atoi(channel); } - + if (lname) { level = atoi(lname); } - - if (tchannel == 0 || (file && !strcmp(file, "switch_console.c"))) { + + if (tchannel == 0) { #ifdef WIN32 DWORD len = (DWORD) strlen(handle->last_event->body); DWORD outbytes = 0;

1 0

[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] r10983 - freeswitch/trunk/conf/directory/default
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: brian Date: Mon Dec 29 00:27:53 2008 New Revision: 10983 Log: use the address 192.0.2.0/24 from rfc3330 for examples Modified: freeswitch/trunk/conf/directory/default/brian.xml Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Dec 29 00:27:53 2008 @@ -1,7 +1,7 @@ <include>   - <user id="brian" mailbox="9999" cidr="1.2.3.4/24"> + <user id="brian" mailbox="9999" cidr="192.0.2.0/24">  <gateways>

1 0

[commit] r10982 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: brian Date: Sun Dec 28 23:34:37 2008 New Revision: 10982 Log: shut up gcc 4.3.2 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Sun Dec 28 23:34:37 2008 @@ -332,7 +332,7 @@ } if (var && strlen(var) > 1) { - switch_event_add_body(local_event, var); + switch_event_add_body(local_event, "%s", var); } switch_event_fire(&local_event);

1 0

[commit] r10981 - freeswitch/trunk/src
by FreeSWITCH SVN 28 Dec '08

28 Dec '08

Author: brian Date: Sun Dec 28 18:17:29 2008 New Revision: 10981 Log: fix acl parsing for cidr from recent changes to directory layout Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Dec 28 18:17:29 2008 @@ -881,7 +881,7 @@ if (domain) { switch_event_t *my_params = NULL; switch_xml_t x_domain, xml_root; - switch_xml_t ut; + switch_xml_t gt, gts, ut, uts; switch_event_create(&my_params, SWITCH_EVENT_GENERAL); switch_assert(my_params); @@ -914,6 +914,32 @@ free(token); } } + + for (gts = switch_xml_child(x_domain, "groups"); gts; gts = gts->next) { + for (gt = switch_xml_child(gts, "group"); gt; gt = gt->next) { + for (uts = switch_xml_child(gt, "users"); uts; uts = uts->next) { + for (ut = switch_xml_child(uts, "user"); ut; ut = ut->next) { + const char *user_cidr = switch_xml_attr(ut, "cidr"); + const char *id = switch_xml_attr(ut, "id"); + + if (id && user_cidr) { + char *token = switch_mprintf("%s@%s", id, domain); + switch_assert(token); + + if (switch_network_list_add_cidr_token(list, user_cidr, ok, token) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding %s (%s) [%s] to list %s\n", + user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Adding %s (%s) [%s] to list %s\n", + user_cidr, ok ? "allow" : "deny", switch_str_nil(token), name); + } + free(token); + } + } + } + } + } + switch_xml_free(xml_root); } else if (cidr) { if (switch_network_list_add_cidr(list, cidr, ok) == SWITCH_STATUS_SUCCESS) {

1 0