February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12346 - freeswitch/trunk/debian
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: mrene Date: Sat Feb 28 16:41:28 2009 New Revision: 12346 Log: Install mod_fifo.conf.xml in autoload_configs (debian) Modified: freeswitch/trunk/debian/freeswitch.install Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sat Feb 28 16:41:28 2009 @@ -119,5 +119,6 @@ opt/freeswitch/conf/autoload_configs/console.conf.xml opt/freeswitch/conf/autoload_configs/timezones.conf.xml opt/freeswitch/conf/autoload_configs/fax.conf.xml +opt/freeswitch/conf/autoload_configs/fifo.conf.xml opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml

1 0

[commit] r12345 - freeswitch/trunk/scripts
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: brian Date: Sat Feb 28 14:34:23 2009 New Revision: 12345 Log: When you're down in Transylvania And the night begins to fall You might get to feeling lonely If you do give me a call Just dial Transylvania 1, 2, 3, 4, 5 Transylvania 1, 2, 3, 4, 5 Transylvania 1, 2, 3, 4, 5 (oh and remove some stuff too) /b Removed: freeswitch/trunk/scripts/mklm freeswitch/trunk/scripts/quick_lm.pl

1 0

[commit] r12344 - freeswitch/trunk/libs/esl/perl
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: brian Date: Sat Feb 28 10:09:38 2009 New Revision: 12344 Log: example of using esl to get events for ASR Added: freeswitch/trunk/libs/esl/perl/server3.pl Added: freeswitch/trunk/libs/esl/perl/server3.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/perl/server3.pl Sat Feb 28 10:09:38 2009 @@ -0,0 +1,61 @@ +require ESL; +use IO::Socket::INET; + +#ESL::eslSetLogLevel(7); + +my $ip = "127.0.0.1"; +my $sock = new IO::Socket::INET ( LocalHost => $ip, LocalPort => '8040', Proto => 'tcp', Listen => 1, Reuse => 1 ); +die "Could not create socket: $!\n" unless $sock; + +for(;;) { + my $new_sock = $sock->accept(); + my $pid = fork(); + if ($pid) { + close($new_sock); + next; + } + + my $host = $new_sock->sockhost(); + my $fd = fileno($new_sock); + + my $con = new ESL::ESLconnection($fd); + my $info = $con->getInfo(); + + #print $info->serialize(); + my $uuid = $info->getHeader("unique-id"); + + printf "Connected call %s, from %s\n", $uuid, $info->getHeader("caller-caller-id-number"); + + $con->sendRecv("myevents"); + $con->execute("answer"); + $con->sendRecv("divert_events on"); + $con->execute("detect_speech", "pocketsphinx yes_no yes_no"); + $con->execute("playback", "/ram/swimp.raw"); + + while($con->connected()) { + #my $e = $con->recvEventTimed(100); + my $e = $con->recvEvent(); + + if ($e) { + my $name = $e->getHeader("event-name"); + print "EVENT [$name]\n"; + if ($name eq "DETECTED_SPEECH") { + print $e->serialize(); + my $type = $e->getHeader("speech-type"); + if ($type = "detected-speech") { + $con->execute("detect_speech", "resume"); + } + } + if ($name eq "DTMF") { + my $digit = $e->getHeader("dtmf-digit"); + my $duration = $e->getHeader("dtmf-duration"); + print "DTMF digit $digit ($duration)\n"; + } + } + } + + print "BYE\n"; + close($new_sock); +} + +

1 0

[commit] r12343 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: gmaruzz Date: Sat Feb 28 05:38:35 2009 New Revision: 12343 Log: skypiax: fixed http://jira.freeswitch.org/browse/MODSKYPIAX-21 on linux too, and cosmetics Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Sat Feb 28 05:38:35 2009 @@ -940,7 +940,7 @@ skypiax_audio_init(&globals.SKYPIAX_INTERFACES[interface_id]); - NOTICA("WAITING max 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d. NB: on XP will wait for much much more! (Vista OK)\n", SKYPIAX_P_LOG, interface_id); + NOTICA("WAITING roughly 10/15 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d. NB: on XP will wait for much much more! (on Vista and Linux is OK)\n", SKYPIAX_P_LOG, interface_id); i = 0; while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 10000) { // 400 x 1000 is 6sec on windows XP but only 0.4 seconds on Vista FIXME //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i); @@ -948,7 +948,7 @@ i++; } if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected) { - NOTICA("Found a running Skype client, connected to its SKYPE API for interface_id=%d, waiting max 60 seconds for CURRENTUSERHANDLE==%s. NB: on XP will wait for much much more! (Vista OK)\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); + NOTICA("Found a running Skype client, connected to its SKYPE API for interface_id=%d, waiting roughly 60/90 seconds for CURRENTUSERHANDLE==%s. NB: on XP will wait for much much more! (on Vista and Linux is OK)\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); } else { ERRORA("Failed to connect to a SKYPE API for interface_id=%d, no SKYPE client running, please (re)start Skype client. Skypiax exiting\n", SKYPIAX_P_LOG, interface_id); running = 0;

1 0

[commit] r12342 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: gmaruzz Date: Sat Feb 28 04:39:50 2009 New Revision: 12342 Log: skypiax: switch_sleep is behaving differently on Vista and XPvi mod_skypiax.c! Let's set for Vista now, will handle this in the future Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Sat Feb 28 04:39:50 2009 @@ -916,7 +916,7 @@ DEBUGA_SKYPE ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].context=%s\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].context); - NOTICA("STARTING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + WARNINGA("STARTING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); switch_threadattr_create(&skypiax_api_thread_attr, skypiax_module_pool); switch_threadattr_stacksize_set(skypiax_api_thread_attr, SWITCH_THREAD_STACKSIZE); @@ -940,31 +940,31 @@ skypiax_audio_init(&globals.SKYPIAX_INTERFACES[interface_id]); - NOTICA("WAITING max 6 seconds to connect to SKYPE API for interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + NOTICA("WAITING max 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d. NB: on XP will wait for much much more! (Vista OK)\n", SKYPIAX_P_LOG, interface_id); i = 0; - while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 400) { // 6sec on windows (why ????) FIXME + while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 10000) { // 400 x 1000 is 6sec on windows XP but only 0.4 seconds on Vista FIXME //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i); switch_sleep(1000); i++; } if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected) { - NOTICA("SKYPE API connected for interface_id=%d, waiting max 60 seconds for CURRENTUSERHANDLE==%s\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); + NOTICA("Found a running Skype client, connected to its SKYPE API for interface_id=%d, waiting max 60 seconds for CURRENTUSERHANDLE==%s. NB: on XP will wait for much much more! (Vista OK)\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); } else { - ERRORA("SKYPE API FAILED to connect for interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + ERRORA("Failed to connect to a SKYPE API for interface_id=%d, no SKYPE client running, please (re)start Skype client. Skypiax exiting\n", SKYPIAX_P_LOG, interface_id); running = 0; return SWITCH_STATUS_FALSE; } i = 0; - while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 4000) { // 60sec on windows (why ????) FIXME + while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle == 0 && running && i < 60000) { // 4000 * 1000 is 60sec on windows XP but 4seconds on Vista FIXME //DEBUGA_SKYPE("interface_id=%d, times=%d\n", SKYPIAX_P_LOG, interface_id, i); switch_sleep(1000); i++; } if (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.currentuserhandle) { - NOTICA("CURRENTUSERHANDLE ok (%s), interface_id=%d STARTED\n", SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface_id); + WARNINGA("Interface_id=%d is now STARTED, the Skype client to which we are connected gave us the correct CURRENTUSERHANDLE (%s)\n", SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user); } else { - ERRORA("FAILED to find CURRENTUSERHANDLE=%s, FAILED to start interface_id=%d\n", SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface_id); + ERRORA("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypiax exiting now\n", SKYPIAX_P_LOG, globals.SKYPIAX_INTERFACES[interface_id].skype_user, interface_id, globals.SKYPIAX_INTERFACES[interface_id].skype_user, globals.SKYPIAX_INTERFACES[interface_id].skype_user); running = 0; return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Feb 28 04:39:50 2009 @@ -948,7 +948,7 @@ switch (ulParam) { case SKYPECONTROLAPI_ATTACH_SUCCESS: if (!tech_pvt->SkypiaxHandles.currentuserhandle) { - DEBUGA_SKYPE("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); + //DEBUGA_SKYPE("\n\n\tConnected to Skype API!\n", SKYPIAX_P_LOG); tech_pvt->SkypiaxHandles.api_connected = 1; tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = (HWND) uiParam; tech_pvt->SkypiaxHandles.win32_hGlobal_SkypeAPIWindowHandle = @@ -956,9 +956,7 @@ } break; case SKYPECONTROLAPI_ATTACH_PENDING_AUTHORIZATION: - DEBUGA_SKYPE - ("\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); + //DEBUGA_SKYPE ("\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); skypiax_sleep(5000); if (!tech_pvt->SkypiaxHandles.currentuserhandle) { SendMessage(HWND_BROADCAST,

1 0

[commit] r12341 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: anthm Date: Fri Feb 27 21:56:38 2009 New Revision: 12341 Log: add indexes to mod_voicemail Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Feb 27 21:56:38 2009 @@ -234,6 +234,18 @@ " password VARCHAR(255)\n" ");\n"; +static char *vm_index_list[] = { + "create index voicemail_msgs_idx1 on voicemail_msgs(created_epoch)", + "create index voicemail_msgs_idx2 on voicemail_msgs(username)", + "create index voicemail_msgs_idx3 on voicemail_msgs(domain)", + "create index voicemail_msgs_idx4 on voicemail_msgs(uuid)", + "create index voicemail_msgs_idx5 on voicemail_msgs(in_folder)", + "create index voicemail_msgs_idx6 on voicemail_msgs(read_flags)", + "create index voicemail_prefs_idx1 on voicemail_prefs(username)", + "create index voicemail_prefs_idx2 on voicemail_prefs(domain)", + NULL +}; + static switch_status_t load_config(void) { char *cf = "voicemail.conf"; @@ -323,6 +335,7 @@ switch_core_db_t *db; uint32_t timeout = 10000, max_login_attempts = 3, max_record_len = 300, min_record_len = 3, max_retries = 3; + int x; db = NULL; @@ -671,6 +684,11 @@ } switch_odbc_handle_exec(profile->master_odbc, "drop table voicemail_data", NULL); } + + for (x = 0; vm_index_list[x]; x++) { + switch_odbc_handle_exec(profile->master_odbc, vm_index_list[x], NULL); + } + #endif } else { if ((db = switch_core_db_open_file(profile->dbname))) { @@ -705,6 +723,14 @@ switch_core_db_test_reactive(db, "select count(username) from voicemail_prefs", "drop table voicemail_prefs", vm_pref_sql); switch_core_db_test_reactive(db, "select count(password) from voicemail_prefs", NULL, "alter table voicemail_prefs add password varchar(255)"); + + for (x = 0; vm_index_list[x]; x++) { + errmsg = NULL; + switch_core_db_exec(db, vm_index_list[x], NULL, NULL, &errmsg); + switch_safe_free(errmsg); + } + + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); continue;

1 0

[commit] r12340 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 17:11:49 2009 New Revision: 12340 Log: Ok this is a stop gap for some people running 3.x polycom firmware. We smack down the ability to turn on SRTP. I'm currently working with Polycom to resolve this issue. (SR #: 1-31824511) Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Feb 27 17:11:49 2009 @@ -86,6 +86,16 @@   </condition> + +  + <condition field="${sip_secure_media}" expression="^true$" break="never"/> + <condition field="${sip_user_agent}" expression="^PolycomSound(Point|Station)IP-S(S|P)IP_\d{3,4}-UA\/((3).(\d).(\d).(\d{4}))$" break="never"> + <action application="set" data="sip_secure_media=false"/> + <action application="log" data="crit Your phone is a Polycom running 3.x firmware that is known broken for SRTP."/> + </condition> + <condition> <action application="hash" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/> <action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>

1 0

[commit] r12339 - in freeswitch/trunk/libs/esl: php ruby
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 16:59:44 2009 New Revision: 12339 Log: hrm why Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Fri Feb 27 16:59:44 2009 @@ -1091,7 +1091,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1159,7 +1159,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ convert_to_long_ex(args[1]); arg2 = (int) Z_LVAL_PP(args[1]); /*@SWIG@*/; @@ -1213,13 +1213,13 @@ WRONG_PARAM_COUNT; - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[0]); arg1 = (char *) Z_STRVAL_PP(args[0]); /*@SWIG@*/; if(arg_count > 1) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1254,7 +1254,7 @@ } } if(arg_count > 1) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ convert_to_long_ex(args[1]); arg2 = (int) Z_LVAL_PP(args[1]); /*@SWIG@*/; @@ -1384,7 +1384,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); if(arg_count > 1) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1460,7 +1460,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1557,7 +1557,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1591,13 +1591,13 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; @@ -1630,7 +1630,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1658,19 +1658,19 @@ } - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[0]); arg1 = (char *) Z_STRVAL_PP(args[0]); /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; @@ -1696,7 +1696,7 @@ } - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ convert_to_long_ex(args[0]); arg1 = (int) Z_LVAL_PP(args[0]); /*@SWIG@*/; @@ -1831,7 +1831,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1864,7 +1864,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -1900,13 +1900,13 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; if(arg_count > 2) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; @@ -1943,13 +1943,13 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; if(arg_count > 2) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; @@ -2041,7 +2041,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ convert_to_long_ex(args[1]); arg2 = (int) Z_LVAL_PP(args[1]); /*@SWIG@*/; @@ -2075,13 +2075,13 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; @@ -2115,13 +2115,13 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; @@ -2158,20 +2158,20 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; if(arg_count > 2) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[2]); arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; } if(arg_count > 3) { - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[3]); arg4 = (char *) Z_STRVAL_PP(args[3]); /*@SWIG@*/; @@ -2205,7 +2205,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -2238,7 +2238,7 @@ } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ convert_to_string_ex(args[1]); arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; @@ -2263,7 +2263,7 @@ } - /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ + /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/ convert_to_long_ex(args[0]); arg1 = (int) Z_LVAL_PP(args[0]); /*@SWIG@*/; Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Fri Feb 27 16:59:44 2009 @@ -1902,7 +1902,7 @@ } -/*@SWIG:/usr/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/ +/*@SWIG:/usr/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0];

1 0

[commit] r12338 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 16:59:10 2009 New Revision: 12338 Log: ESL-2 Added: freeswitch/trunk/libs/esl/python/_ESL.py Removed: freeswitch/trunk/libs/esl/python/ESL.py Modified: freeswitch/trunk/libs/esl/python/Makefile freeswitch/trunk/libs/esl/python/esl_wrap.cpp Modified: freeswitch/trunk/libs/esl/python/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/python/Makefile (original) +++ freeswitch/trunk/libs/esl/python/Makefile Fri Feb 27 16:59:10 2009 @@ -4,7 +4,7 @@ all: _ESL.so esl_wrap.cpp: - swig -module ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i + swig -module _ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i esl_wrap.o: esl_wrap.cpp $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o Added: freeswitch/trunk/libs/esl/python/_ESL.py ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/python/_ESL.py Fri Feb 27 16:59:10 2009 @@ -0,0 +1,97 @@ +# This file was automatically generated by SWIG (http://www.swig.org) +# Version 1.3.35 +# +# Don't modify this file, modify the SWIG interface instead. +# This file is compatible with both classic and new-style classes. + +import __ESL +import new +new_instancemethod = new.instancemethod +def _swig_setattr_nondynamic(self,class_type,name,value,static=1): + if (name == "thisown"): return self.this.own(value) + if (name == "this"): + if type(value).__name__ == 'PySwigObject': + self.__dict__[name] = value + return + method = class_type.__swig_setmethods__.get(name,None) + if method: return method(self,value) + if (not static) or hasattr(self,name): + self.__dict__[name] = value + else: + raise AttributeError("You cannot add attributes to %s" % self) + +def _swig_setattr(self,class_type,name,value): + return _swig_setattr_nondynamic(self,class_type,name,value,0) + +def _swig_getattr(self,class_type,name): + if (name == "thisown"): return self.this.own() + method = class_type.__swig_getmethods__.get(name,None) + if method: return method(self) + raise AttributeError,name + +def _swig_repr(self): + try: strthis = "proxy of " + self.this.__repr__() + except: strthis = "" + return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) + +class ESLevent: + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, ESLevent, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, ESLevent, name) + __repr__ = _swig_repr + __swig_setmethods__["event"] = __ESL.ESLevent_event_set + __swig_getmethods__["event"] = __ESL.ESLevent_event_get + __swig_setmethods__["serialized_string"] = __ESL.ESLevent_serialized_string_set + __swig_getmethods__["serialized_string"] = __ESL.ESLevent_serialized_string_get + __swig_setmethods__["mine"] = __ESL.ESLevent_mine_set + __swig_getmethods__["mine"] = __ESL.ESLevent_mine_get + def __init__(self, *args): + this = apply(__ESL.new_ESLevent, args) + try: self.this.append(this) + except: self.this = this + __swig_destroy__ = __ESL.delete_ESLevent + __del__ = lambda self : None; + def serialize(*args): return apply(__ESL.ESLevent_serialize, args) + def setPriority(*args): return apply(__ESL.ESLevent_setPriority, args) + def getHeader(*args): return apply(__ESL.ESLevent_getHeader, args) + def getBody(*args): return apply(__ESL.ESLevent_getBody, args) + def getType(*args): return apply(__ESL.ESLevent_getType, args) + def addBody(*args): return apply(__ESL.ESLevent_addBody, args) + def addHeader(*args): return apply(__ESL.ESLevent_addHeader, args) + def delHeader(*args): return apply(__ESL.ESLevent_delHeader, args) +ESLevent_swigregister = __ESL.ESLevent_swigregister +ESLevent_swigregister(ESLevent) + +class ESLconnection: + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, ESLconnection, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, ESLconnection, name) + __repr__ = _swig_repr + def __init__(self, *args): + this = apply(__ESL.new_ESLconnection, args) + try: self.this.append(this) + except: self.this = this + __swig_destroy__ = __ESL.delete_ESLconnection + __del__ = lambda self : None; + def connected(*args): return apply(__ESL.ESLconnection_connected, args) + def getInfo(*args): return apply(__ESL.ESLconnection_getInfo, args) + def send(*args): return apply(__ESL.ESLconnection_send, args) + def sendRecv(*args): return apply(__ESL.ESLconnection_sendRecv, args) + def api(*args): return apply(__ESL.ESLconnection_api, args) + def bgapi(*args): return apply(__ESL.ESLconnection_bgapi, args) + def sendEvent(*args): return apply(__ESL.ESLconnection_sendEvent, args) + def recvEvent(*args): return apply(__ESL.ESLconnection_recvEvent, args) + def recvEventTimed(*args): return apply(__ESL.ESLconnection_recvEventTimed, args) + def filter(*args): return apply(__ESL.ESLconnection_filter, args) + def events(*args): return apply(__ESL.ESLconnection_events, args) + def execute(*args): return apply(__ESL.ESLconnection_execute, args) + def setBlockingExecute(*args): return apply(__ESL.ESLconnection_setBlockingExecute, args) + def setEventLock(*args): return apply(__ESL.ESLconnection_setEventLock, args) +ESLconnection_swigregister = __ESL.ESLconnection_swigregister +ESLconnection_swigregister(ESLconnection) + +eslSetLogLevel = __ESL.eslSetLogLevel + + Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Fri Feb 27 16:59:10 2009 @@ -2515,11 +2515,11 @@ #endif /*----------------------------------------------- - @(target):= _ESL.so + @(target):= __ESL.so ------------------------------------------------*/ -#define SWIG_init init_ESL +#define SWIG_init init__ESL -#define SWIG_name "_ESL" +#define SWIG_name "__ESL" #define SWIGVERSION 0x010335 #define SWIG_VERSION SWIGVERSION

1 0

[commit] r12337 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 16:56:30 2009 New Revision: 12337 Log: ESL-1 Modified: freeswitch/trunk/libs/esl/python/events.py Modified: freeswitch/trunk/libs/esl/python/events.py ============================================================================== --- freeswitch/trunk/libs/esl/python/events.py (original) +++ freeswitch/trunk/libs/esl/python/events.py Fri Feb 27 16:56:30 2009 @@ -2,7 +2,6 @@ import string import sys -import pickle from ESL import *

1 0