September 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2563 - freeswitch/trunk/src
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: mikej Date: Thu Sep 7 18:39:40 2006 New Revision: 2563 Modified: freeswitch/trunk/src/switch_channel.c Log: Changed SWITCH_EVENT_CHANNEL_STATE to SWITCH_EVENT_CHANNEL_HANGUP on the hangup state change, add Hangup-Cause event header. Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Sep 7 18:39:40 2006 @@ -859,7 +859,8 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause)); - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_STATE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Hangup-Cause", switch_channel_cause2str(channel->hangup_cause)); switch_channel_event_set_data(channel, event); switch_event_fire(&event); }

1 0

[commit] r2562 - freeswitch/trunk/src/mod/languages/mod_php
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: anthm Date: Thu Sep 7 17:51:10 2006 New Revision: 2562 Modified: freeswitch/trunk/src/mod/languages/mod_php/mod_php.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_php/mod_php.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/mod_php.c (original) +++ freeswitch/trunk/src/mod/languages/mod_php/mod_php.c Thu Sep 7 17:51:10 2006 @@ -235,8 +235,6 @@ static void freeswitch_request_ctor(switch_php_obj_t *request_context TSRMLS_DC) { -/* ast_register_string_constant("JELLO", "FISH"); */ - zend_error_cb = freeswitch_error_handler; SG(request_info).argc = request_context->argc; @@ -278,8 +276,7 @@ uint32_t len = strlen((char *) data) + ulen + 2; char *mydata = switch_core_session_alloc(session, len); - switch_copy_string(mydata, uuid, len); - snprintf(mydata + ulen, len - ulen, " %s", data); + snprintf(mydata, len, "-q %s %s", data, uuid); TSRMLS_FETCH();

1 0

[commit] r2559 - freeswitch/trunk/src/mod/languages/mod_php
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: anthm Date: Thu Sep 7 16:26:35 2006 New Revision: 2559 Modified: freeswitch/trunk/src/mod/languages/mod_php/Makefile freeswitch/trunk/src/mod/languages/mod_php/mod_php.c Log: it builds but what else could it do? Modified: freeswitch/trunk/src/mod/languages/mod_php/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_php/Makefile Thu Sep 7 16:26:35 2006 @@ -1,10 +1,11 @@ -CFLAGS += -I/usr/local/include/php/TSRM -I/usr/local/include/php/main/ -I/usr/local/include/php/Zend/ -I/usr/local/include/php/ +CFLAGS += -I$(PREFIX)/include/php/TSRM -I$(PREFIX)/include/php/main/ -I$(PREFIX)/include/php/Zend/ -I$(PREFIX)/include/php/ PHPMOD=freeswitch +LDFLAGS += -lphp4 all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN) depends: - + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-4.4.4.tar.gz --prefix=$(PREFIX) --enable-embed %.o: %.c $(CC) -fPIC $(CFLAGS) -c $< -o $@ Modified: freeswitch/trunk/src/mod/languages/mod_php/mod_php.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/mod_php.c (original) +++ freeswitch/trunk/src/mod/languages/mod_php/mod_php.c Thu Sep 7 16:26:35 2006 @@ -226,7 +226,7 @@ Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len); Z_STRLEN_P(tmp) = buffer_len; Z_TYPE_P(tmp) = IS_STRING; - zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL); + zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), &tmp, sizeof(pval *), NULL); } efree(buffer); } @@ -339,7 +339,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = &php_module_interface; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r2558 - freeswitch/trunk/src/mod/languages/mod_php
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: anthm Date: Thu Sep 7 16:00:23 2006 New Revision: 2558 Added: freeswitch/trunk/src/mod/languages/mod_php/ freeswitch/trunk/src/mod/languages/mod_php/Makefile freeswitch/trunk/src/mod/languages/mod_php/fix.diff freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php freeswitch/trunk/src/mod/languages/mod_php/mod_php.c freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c freeswitch/trunk/src/mod/languages/mod_php/switch_swig.i freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c freeswitch/trunk/src/mod/languages/mod_php/test.php Log: initial checkin of mod_php (don't get too excited) Added: freeswitch/trunk/src/mod/languages/mod_php/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/Makefile Thu Sep 7 16:00:23 2006 @@ -0,0 +1,31 @@ +CFLAGS += -I/usr/local/include/php/TSRM -I/usr/local/include/php/main/ -I/usr/local/include/php/Zend/ -I/usr/local/include/php/ +PHPMOD=freeswitch + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN) + +depends: + +%.o: %.c + $(CC) -fPIC $(CFLAGS) -c $< -o $@ + +reswig: + rm -f switch_swig_wrap.c config.m4 CREDITS *$(PHPMOD)* + swig -lswitch_swig.i -ignoremissing -DMULTIPLICITY -php -module $(PHPMOD) switch_swig.c + patch -p0 -i fix.diff + +switch_swig_wrap.o: switch_swig_wrap.c + $(CC) -w $(CFLAGS) -c $< -o $@ + + +$(PHPMOD).$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o + $(CC) $(SOLINK) -o php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) + + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) + $(CC) -fPIC $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/trunk/src/mod/languages/mod_php/fix.diff ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/fix.diff Thu Sep 7 16:00:23 2006 @@ -0,0 +1,10 @@ +--- switch_swig_wrap.c 2006-09-07 14:16:42.000000000 -0400 ++++ fix.c 2006-09-07 14:16:29.000000000 -0400 +@@ -284,6 +284,7 @@ + + + #include <string.h> ++#include "switch.h" + + #ifdef __cplusplus + extern "C" { Added: freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php Thu Sep 7 16:00:23 2006 @@ -0,0 +1,24 @@ +<?php + +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.29 + * + * This file is not intended to be easily readable and contains a number of + * coding conventions designed to improve portability and efficiency. Do not make + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. + * ----------------------------------------------------------------------------- */ + +global $FREESWITCH_LOADED__; +if ($FREESWITCH_LOADED__) return; +$FREESWITCH_LOADED__ = true; + +/* if our extension has not been loaded, do what we can */ +if (!extension_loaded("php_freeswitch")) { + if (!dl("php_freeswitch.so")) return; +} + + + +?> Added: freeswitch/trunk/src/mod/languages/mod_php/mod_php.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/mod_php.c Thu Sep 7 16:00:23 2006 @@ -0,0 +1,362 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Alex Leigh <php (at) postfin (dot) com> + * + * + * mod_php.c -- PHP Module + * + */ +#include <switch.h> +#include "php.h" +#include "php_variables.h" +#include "ext/standard/info.h" +#include "php_ini.h" +#include "php_globals.h" +#include "SAPI.h" +#include "php_main.h" +#include "php_version.h" +#include "TSRM.h" +#include "ext/standard/php_standard.h" + +const char modname[] = "mod_php"; + +static int php_freeswitch_startup(sapi_module_struct *sapi_module) +{ + return SUCCESS; +} + +static int sapi_freeswitch_ub_write(const char *str, unsigned int str_length TSRMLS_DC) +{ + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, (char *)str); + return str_length; +} + + +/* + * sapi_freeswitch_header_handler: Add/update response headers with those provided by the PHP engine. + */ +static int sapi_freeswitch_header_handler(sapi_header_struct * sapi_header, sapi_headers_struct * sapi_headers TSRMLS_DC) +{ + return 0; +} + +/* + * sapi_freeswitch_send_headers: Transmit the headers to the client. This has the + * effect of starting the response under freeswitch. + */ +static int sapi_freeswitch_send_headers(sapi_headers_struct * sapi_headers TSRMLS_DC) +{ + return SAPI_HEADER_SENT_SUCCESSFULLY; +} + +static int sapi_freeswitch_read_post(char *buffer, uint count_bytes TSRMLS_DC) +{ + return 0; +} + +/* + * sapi_freeswitch_read_cookies: Return cookie information into PHP. + */ +static char *sapi_freeswitch_read_cookies(TSRMLS_D) +{ + return NULL; +} + +static void sapi_freeswitch_register_server_variables(zval * track_vars_array TSRMLS_DC) +{ +} + +static void freeswitch_log_message(char *message) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, message); +} + + +sapi_module_struct fs_sapi_module = { + "freeswitch", /* name */ + "FreeSWITCH", /* pretty name */ + + php_freeswitch_startup, /* startup */ + php_module_shutdown_wrapper, /* shutdown */ + + NULL, /* activate */ + NULL, /* deactivate */ + + sapi_freeswitch_ub_write, /* unbuffered write */ + NULL, /* flush */ + NULL, /* get uid */ + NULL, /* getenv */ + + php_error, /* error handler */ + + sapi_freeswitch_header_handler, /* header handler */ + sapi_freeswitch_send_headers, /* send headers handler */ + NULL, /* send header handler */ + + sapi_freeswitch_read_post, /* read POST data */ + sapi_freeswitch_read_cookies, /* read Cookies */ + + sapi_freeswitch_register_server_variables, /* register server variables */ + freeswitch_log_message, /* Log message */ + NULL, /* Get request time */ + + NULL, /* Block interruptions */ + NULL, /* Unblock interruptions */ + + STANDARD_SAPI_MODULE_PROPERTIES +}; + + + +typedef struct switch_php_obj { + switch_core_session_t *session; + int argc; + char *argv[129]; +} switch_php_obj_t; + + + +void freeswitch_error_handler(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) +{ + char *buffer; + int buffer_len; + TSRMLS_FETCH(); + + buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args); + + /* display/log the error if necessary */ + if((EG(error_reporting) & type || (type & E_CORE)) && (PG(log_errors) || PG(display_errors))) { + char *error_type_str; + + switch (type) { + case E_ERROR: + case E_CORE_ERROR: + case E_COMPILE_ERROR: + case E_USER_ERROR: + error_type_str = "Fatal error"; + break; + case E_WARNING: + case E_CORE_WARNING: + case E_COMPILE_WARNING: + case E_USER_WARNING: + error_type_str = "Warning"; + break; + case E_PARSE: + error_type_str = "Parse error"; + break; + case E_NOTICE: + case E_USER_NOTICE: + error_type_str = "Notice"; + break; + default: + error_type_str = "Unknown error"; + break; + } + + if(PG(log_errors)) { + char *log_buffer; +#ifdef PHP_WIN32 + if(type == E_CORE_ERROR || type == E_CORE_WARNING) { + MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE); + } +#endif + spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); + php_log_err(log_buffer TSRMLS_CC); + efree(log_buffer); + } + + if(PG(display_errors)) { + //char *prepend_string = INI_STR("error_prepend_string"); + char *append_string = INI_STR("error_append_string"); + //char *error_format = "%s\n%s: %s in %s on line %d\n%s"; + switch_log_printf(SWITCH_CHANNEL_ID_LOG_CLEAN, (char *) error_filename, buffer, error_lineno, SWITCH_LOG_DEBUG, STR_PRINT(append_string)); + } + } + + /* Bail out if we can't recover */ + switch(type) { + case E_CORE_ERROR: + case E_ERROR: + /*case E_PARSE: the parser would return 1 (failure), we can bail out nicely */ + case E_COMPILE_ERROR: + case E_USER_ERROR: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nPHP: %s exiting\n", error_filename); + EG(exit_status) = 255; +#if MEMORY_LIMIT + /* restore memory limit */ + AG(memory_limit) = PG(memory_limit); +#endif + efree(buffer); + zend_bailout(); + return; + break; + } + + /* Log if necessary */ + if(PG(track_errors) && EG(active_symbol_table)) { + pval *tmp; + + ALLOC_ZVAL(tmp); + INIT_PZVAL(tmp); + Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len); + Z_STRLEN_P(tmp) = buffer_len; + Z_TYPE_P(tmp) = IS_STRING; + zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL); + } + efree(buffer); +} + + + +static void freeswitch_request_ctor(switch_php_obj_t *request_context TSRMLS_DC) +{ +/* ast_register_string_constant("JELLO", "FISH"); */ + + zend_error_cb = freeswitch_error_handler; + + SG(request_info).argc = request_context->argc; + SG(request_info).argv = request_context->argv; + + SG(request_info).path_translated = estrdup(request_context->argv[0]); +} + +static void freeswitch_request_dtor(switch_php_obj_t *request_context TSRMLS_DC) +{ + efree(SG(request_info).path_translated); +} + +int freeswitch_module_main(switch_php_obj_t *request_context TSRMLS_DC) +{ + int retval; + zend_file_handle file_handle; + + if(php_request_startup(TSRMLS_C) == FAILURE) { + return FAILURE; + } + + file_handle.type = ZEND_HANDLE_FILENAME; + file_handle.filename = SG(request_info).path_translated; + file_handle.free_filename = 0; + file_handle.opened_path = NULL; + + retval = php_execute_script(&file_handle TSRMLS_CC); + php_request_shutdown(NULL); + + return retval; +} + +static void php_function(switch_core_session_t *session, char *data) +{ + char *uuid = switch_core_session_get_uuid(session); + switch_php_obj_t *request_context; + uint32_t ulen = strlen(uuid); + uint32_t len = strlen((char *) data) + ulen + 2; + char *mydata = switch_core_session_alloc(session, len); + + switch_copy_string(mydata, uuid, len); + snprintf(mydata + ulen, len - ulen, " %s", data); + + TSRMLS_FETCH(); + + request_context = (switch_php_obj_t *) switch_core_session_alloc(session, sizeof(*request_context)); + + request_context->session = session; + + if(switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid Params\n"); + return; + } + + request_context->argc = switch_separate_string(mydata, ' ', + request_context->argv, + (sizeof(request_context->argv) / sizeof(request_context->argv[0]))); + + + SG(server_context) = request_context; + + freeswitch_request_ctor(request_context TSRMLS_CC); + freeswitch_module_main(request_context TSRMLS_CC); + freeswitch_request_dtor(request_context TSRMLS_CC); + + /* + * This call is ostensibly provided to free the memory from PHP/TSRM when + * the thread terminated, but, it leaks a structure in some hash list + * according to the developers. Not calling this will leak the entire + * interpreter, around 100k, but calling it and then terminating the + * thread will leak the struct (around a k). The only answer with the + * current TSRM implementation is to reuse the threads that allocate TSRM + * resources. + */ + /* ts_free_thread(); */ + +} + +static const switch_application_interface_t php_application_interface = { + /*.interface_name */ "php", + /*.application_function */ php_function +}; + +static switch_loadable_module_interface_t php_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ &php_application_interface, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &php_module_interface; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + Called when the system shuts down + SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) + { + return SWITCH_STATUS_SUCCESS; + } +*/ + +/* + If it exists, this is called in it's own thread when the module-load completes + SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) + { + return SWITCH_STATUS_SUCCESS; + } +*/ Added: freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h Thu Sep 7 16:00:23 2006 @@ -0,0 +1,69 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.29 + * + * This file is not intended to be easily readable and contains a number of + * coding conventions designed to improve portability and efficiency. Do not make + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. + * ----------------------------------------------------------------------------- */ + +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license(a)php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: | + | | + +----------------------------------------------------------------------+ + */ + + +#ifndef PHP_FREESWITCH_H +#define PHP_FREESWITCH_H + +extern zend_module_entry freeswitch_module_entry; +#define phpext_freeswitch_ptr &freeswitch_module_entry + +#ifdef PHP_WIN32 +# define PHP_FREESWITCH_API __declspec(dllexport) +#else +# define PHP_FREESWITCH_API +#endif + +#ifdef ZTS +#include "TSRM.h" +#endif + +PHP_MINIT_FUNCTION(freeswitch); +PHP_MSHUTDOWN_FUNCTION(freeswitch); +PHP_RINIT_FUNCTION(freeswitch); +PHP_RSHUTDOWN_FUNCTION(freeswitch); +PHP_MINFO_FUNCTION(freeswitch); + +ZEND_NAMED_FUNCTION(_wrap_fs_core_set_globals); +ZEND_NAMED_FUNCTION(_wrap_fs_core_init); +ZEND_NAMED_FUNCTION(_wrap_fs_core_destroy); +ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_init); +ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_shutdown); +ZEND_NAMED_FUNCTION(_wrap_fs_console_loop); +ZEND_NAMED_FUNCTION(_wrap_fs_console_log); +ZEND_NAMED_FUNCTION(_wrap_fs_console_clean); +ZEND_NAMED_FUNCTION(_wrap_fs_core_session_locate); +ZEND_NAMED_FUNCTION(_wrap_fs_channel_answer); +ZEND_NAMED_FUNCTION(_wrap_fs_channel_pre_answer); +ZEND_NAMED_FUNCTION(_wrap_fs_channel_hangup); +ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_variable); +ZEND_NAMED_FUNCTION(_wrap_fs_channel_get_variable); +ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state); +ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file); +#endif /* PHP_FREESWITCH_H */ Added: freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c Thu Sep 7 16:00:23 2006 @@ -0,0 +1,128 @@ +#include <switch.h> +#ifdef __ICC +#pragma warning (disable:1418) +#endif + + + +#ifdef _MSC_VER +#include <php.h> +#pragma comment(lib, PHP_LIB) +#endif + +void fs_core_set_globals(void) +{ + switch_core_set_globals(); +} + +int fs_core_init(char *path) +{ + switch_status_t status; + const char *err = NULL; + + if (switch_strlen_zero(path)) { + path = NULL; + } + + status = switch_core_init(path, &err); + + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +int fs_core_destroy(void) +{ + switch_status_t status; + + status = switch_core_destroy(); + + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +int fs_loadable_module_init(void) +{ + return switch_loadable_module_init() == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + +int fs_loadable_module_shutdown(void) +{ + switch_loadable_module_shutdown(); + return 1; +} + +int fs_console_loop(void) +{ + switch_console_loop(); + return 0; +} + +void fs_console_log(char *msg) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, msg); +} + +void fs_console_clean(char *msg) +{ + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg); +} + +switch_core_session_t *fs_core_session_locate(char *uuid) +{ + return switch_core_session_locate(uuid); +} + +void fs_channel_answer(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_answer(channel); +} + +void fs_channel_pre_answer(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_pre_answer(channel); +} + +void fs_channel_hangup(switch_core_session_t *session, char *cause) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_hangup(channel, switch_channel_str2cause(cause)); +} + +void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_variable(channel, var, val); +} + +void fs_channel_get_variable(switch_core_session_t *session, char *var) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_get_variable(channel, var); +} + +void fs_channel_set_state(switch_core_session_t *session, char *state) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_state_t fs_state = switch_channel_get_state(channel); + + if ((fs_state = switch_channel_name_state(state)) < CS_HANGUP) { + switch_channel_set_state(channel, fs_state); + } +} + +int fs_ivr_play_file(switch_core_session_t *session, + char *file, + char *timer_name, + switch_input_callback_function_t dtmf_callback, + void *buf, + unsigned int buflen) +{ + switch_status_t status; + if (switch_strlen_zero(timer_name)) { + timer_name = NULL; + } + + status = switch_ivr_play_file(session, NULL, file, timer_name, NULL, NULL, 0); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +} + Added: freeswitch/trunk/src/mod/languages/mod_php/switch_swig.i ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig.i Thu Sep 7 16:00:23 2006 @@ -0,0 +1,7 @@ +%module fs_elmoscript +%{ +#include "switch.h" +%} + +%include "/usr/local/freeswitch/include/switch.h" + Added: freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c Thu Sep 7 16:00:23 2006 @@ -0,0 +1,1737 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.29 + * + * This file is not intended to be easily readable and contains a number of + * coding conventions designed to improve portability and efficiency. Do not make + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. + * ----------------------------------------------------------------------------- */ + +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ + +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif + +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif + +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif +#endif + +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic CAPI SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "2" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) +#else +# define SWIG_TYPE_TABLE_NAME +#endif + +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. + + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif + +/* Flags for pointer conversions */ +#define SWIG_POINTER_DISOWN 0x1 + +/* Flags for new pointer objects */ +#define SWIG_POINTER_OWN 0x1 + + +/* + Flags/methods for returning states. + + The swig conversion methods, as ConvertPtr, return and integer + that tells if the conversion was successful or not. And if not, + an error code can be returned (see swigerrors.swg for the codes). + + Use the following macros/flags to set or process the returning + states. + + In old swig versions, you usually write code as: + + if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { + // success code + } else { + //fail code + } + + Now you can be more explicit as: + + int res = SWIG_ConvertPtr(obj,vptr,ty.flags); + if (SWIG_IsOK(res)) { + // success code + } else { + // fail code + } + + that seems to be the same, but now you can also do + + Type *ptr; + int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); + if (SWIG_IsOK(res)) { + // success code + if (SWIG_IsNewObj(res) { + ... + delete *ptr; + } else { + ... + } + } else { + // fail code + } + + I.e., now SWIG_ConvertPtr can return new objects and you can + identify the case and take care of the deallocation. Of course that + requires also to SWIG_ConvertPtr to return new result values, as + + int SWIG_ConvertPtr(obj, ptr,...) { + if (<obj is ok>) { + if (<need new object>) { + *ptr = <ptr to new allocated object>; + return SWIG_NEWOBJ; + } else { + *ptr = <ptr to old object>; + return SWIG_OLDOBJ; + } + } else { + return SWIG_BADOBJ; + } + } + + Of course, returning the plain '0(success)/-1(fail)' still works, but you can be + more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the + swig errors code. + + Finally, if the SWIG_CASTRANK_MODE is enabled, the result code + allows to return the 'cast rank', for example, if you have this + + int food(double) + int fooi(int); + + and you call + + food(1) // cast rank '1' (1 -> 1.0) + fooi(1) // cast rank '0' + + just use the SWIG_AddCast()/SWIG_CheckState() + + + */ +#define SWIG_OK (0) +#define SWIG_ERROR (-1) +#define SWIG_IsOK(r) (r >= 0) +#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) + +/* The CastRankLimit says how many bits are used for the cast rank */ +#define SWIG_CASTRANKLIMIT (1 << 8) +/* The NewMask denotes the object was created (using new/malloc) */ +#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1) +/* The TmpMask is for in/out typemaps that use temporal objects */ +#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1) +/* Simple returning values */ +#define SWIG_BADOBJ (SWIG_ERROR) +#define SWIG_OLDOBJ (SWIG_OK) +#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) +#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) +/* Check, add and del mask methods */ +#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) +#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) +#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) +#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r) +#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) +#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) + + +/* Cast-Rank Mode */ +#if defined(SWIG_CASTRANK_MODE) +# ifndef SWIG_TypeRank +# define SWIG_TypeRank unsigned long +# endif +# ifndef SWIG_MAXCASTRANK /* Default cast allowed */ +# define SWIG_MAXCASTRANK (2) +# endif +# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) +# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) +SWIGINTERNINLINE int SWIG_AddCast(int r) { + return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; +} +SWIGINTERNINLINE int SWIG_CheckState(int r) { + return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; +} +#else /* no cast-rank mode */ +# define SWIG_AddCast +# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) +#endif + + + + +#include <string.h> +#include "switch.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *(*swig_converter_func)(void *); +typedef struct swig_type_info *(*swig_dycast_func)(void **); + +/* Structure to store inforomation on one type */ +typedef struct swig_type_info { + const char *name; /* mangled name of this type */ + const char *str; /* human readable name of this type */ + swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ + struct swig_cast_info *cast; /* linked list of types that can cast into this type */ + void *clientdata; /* language specific type data */ + int owndata; /* flag if the structure owns the clientdata */ +} swig_type_info; + +/* Structure to store a type and conversion function used for casting */ +typedef struct swig_cast_info { + swig_type_info *type; /* pointer to type that is equivalent to this type */ + swig_converter_func converter; /* function to cast the void pointers */ + struct swig_cast_info *next; /* pointer to next cast in linked list */ + struct swig_cast_info *prev; /* pointer to the previous cast */ +} swig_cast_info; + +/* Structure used to store module information + * Each module generates one structure like this, and the runtime collects + * all of these structures and stores them in a circularly linked list.*/ +typedef struct swig_module_info { + swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ + size_t size; /* Number of types in this module */ + struct swig_module_info *next; /* Pointer to next element in circularly linked list */ + swig_type_info **type_initial; /* Array of initially generated type structures */ + swig_cast_info **cast_initial; /* Array of initially generated casting structures */ + void *clientdata; /* Language specific module data */ +} swig_module_info; + +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class<int>" == "Class<int >", etc. + + Return 0 when the two name types are equivalent, as in + strncmp, but skipping ' '. +*/ +SWIGRUNTIME int +SWIG_TypeNameComp(const char *f1, const char *l1, + const char *f2, const char *l2) { + for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { + while ((*f1 == ' ') && (f1 != l1)) ++f1; + while ((*f2 == ' ') && (f2 != l2)) ++f2; + if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; + } + return (l1 - f1) - (l2 - f2); +} + +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if not equal, 1 if equal +*/ +SWIGRUNTIME int +SWIG_TypeEquiv(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; +} + +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if equal, -1 if nb < tb, 1 if nb > tb +*/ +SWIGRUNTIME int +SWIG_TypeCompare(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; +} + + +/* think of this as a c++ template<> or a scheme macro */ +#define SWIG_TypeCheck_Template(comparison, ty) \ + if (ty) { \ + swig_cast_info *iter = ty->cast; \ + while (iter) { \ + if (comparison) { \ + if (iter == ty->cast) return iter; \ + /* Move iter to the top of the linked list */ \ + iter->prev->next = iter->next; \ + if (iter->next) \ + iter->next->prev = iter->prev; \ + iter->next = ty->cast; \ + iter->prev = 0; \ + if (ty->cast) ty->cast->prev = iter; \ + ty->cast = iter; \ + return iter; \ + } \ + iter = iter->next; \ + } \ + } \ + return 0 + +/* + Check the typename +*/ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheck(const char *c, swig_type_info *ty) { + SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); +} + +/* Same as previous function, except strcmp is replaced with a pointer comparison */ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { + SWIG_TypeCheck_Template(iter->type == from, into); +} + +/* + Cast a pointer up an inheritance hierarchy +*/ +SWIGRUNTIMEINLINE void * +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); +} + +/* + Dynamic pointer casting. Down an inheritance hierarchy +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { + swig_type_info *lastty = ty; + if (!ty || !ty->dcast) return ty; + while (ty && (ty->dcast)) { + ty = (*ty->dcast)(ptr); + if (ty) lastty = ty; + } + return lastty; +} + +/* + Return the name associated with this type +*/ +SWIGRUNTIMEINLINE const char * +SWIG_TypeName(const swig_type_info *ty) { + return ty->name; +} + +/* + Return the pretty name associated with this type, + that is an unmangled type name in a form presentable to the user. +*/ +SWIGRUNTIME const char * +SWIG_TypePrettyName(const swig_type_info *type) { + /* The "str" field contains the equivalent pretty names of the + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ + if (!type) return NULL; + if (type->str != NULL) { + const char *last_name = type->str; + const char *s; + for (s = type->str; *s; s++) + if (*s == '|') last_name = s+1; + return last_name; + } + else + return type->name; +} + +/* + Set the clientdata field for a type +*/ +SWIGRUNTIME void +SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { + swig_cast_info *cast = ti->cast; + /* if (ti->clientdata == clientdata) return; */ + ti->clientdata = clientdata; + + while (cast) { + if (!cast->converter) { + swig_type_info *tc = cast->type; + if (!tc->clientdata) { + SWIG_TypeClientData(tc, clientdata); + } + } + cast = cast->next; + } +} +SWIGRUNTIME void +SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { + SWIG_TypeClientData(ti, clientdata); + ti->owndata = 1; +} + +/* + Search for a swig_type_info structure only by mangled name + Search is a O(log #types) + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + swig_module_info *iter = start; + do { + if (iter->size) { + register size_t l = 0; + register size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ + register size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { + register int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { + if (i) { + r = i - 1; + } else { + break; + } + } else if (compare > 0) { + l = i + 1; + } + } else { + break; /* should never happen */ + } + } while (l <= r); + } + iter = iter->next; + } while (iter != end); + return 0; +} + +/* + Search for a swig_type_info structure for either a mangled name or a human readable name. + It first searches the mangled names of the types, which is a O(log #types) + If a type is not found it then searches the human readable names, which is O(#types). + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + /* STEP 1: Search the name field using binary search */ + swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); + if (ret) { + return ret; + } else { + /* STEP 2: If the type hasn't been found, do a complete search + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { + register size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; + } + iter = iter->next; + } while (iter != end); + } + + /* neither found a match */ + return 0; +} + +/* + Pack binary data into a string +*/ +SWIGRUNTIME char * +SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; + register const unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register unsigned char uu = *u; + *(c++) = hex[(uu & 0xf0) >> 4]; + *(c++) = hex[uu & 0xf]; + } + return c; +} + +/* + Unpack binary data from a string +*/ +SWIGRUNTIME const char * +SWIG_UnpackData(const char *c, void *ptr, size_t sz) { + register unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register char d = *(c++); + register unsigned char uu; + if ((d >= '0') && (d <= '9')) + uu = ((d - '0') << 4); + else if ((d >= 'a') && (d <= 'f')) + uu = ((d - ('a'-10)) << 4); + else + return (char *) 0; + d = *(c++); + if ((d >= '0') && (d <= '9')) + uu |= (d - '0'); + else if ((d >= 'a') && (d <= 'f')) + uu |= (d - ('a'-10)); + else + return (char *) 0; + *u = uu; + } + return c; +} + +/* + Pack 'void *' into a string buffer. +*/ +SWIGRUNTIME char * +SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { + char *r = buff; + if ((2*sizeof(void *) + 2) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + if (strlen(name) + 1 > (bsz - (r - buff))) return 0; + strcpy(r,name); + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + *ptr = (void *) 0; + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sizeof(void *)); +} + +SWIGRUNTIME char * +SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { + char *r = buff; + size_t lname = (name ? strlen(name) : 0); + if ((2*sz + 2 + lname) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + if (lname) { + strncpy(r,name,lname+1); + } else { + *r = 0; + } + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + memset(ptr,0,sz); + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sz); +} + +#ifdef __cplusplus +} +#endif + +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * php4run.swg + * + * PHP4 runtime library + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#endif +#include "zend.h" +#include "zend_API.h" +#include "php.h" + +/* These TSRMLS_ stuff should already be defined now, but with older php under + redhat are not... */ +#ifndef TSRMLS_D +#define TSRMLS_D +#endif +#ifndef TSRMLS_DC +#define TSRMLS_DC +#endif +#ifndef TSRMLS_C +#define TSRMLS_C +#endif +#ifndef TSRMLS_CC +#define TSRMLS_CC +#endif + +#ifdef __cplusplus +} +#endif + +/* But in fact SWIG_ConvertPtr is the native interface for getting typed + pointer values out of zvals. We need the TSRMLS_ macros for when we + make PHP type calls later as we handle php resources */ +#define SWIG_ConvertPtr(obj,pp,type,flags) SWIG_ZTS_ConvertPtr(obj,pp,type,flags TSRMLS_CC) + + +#define SWIG_fail goto fail + +static char *default_error_msg = "Unknown error occurred"; +static int default_error_code = E_ERROR; + +#define SWIG_PHP_Arg_Error_Msg(argnum,extramsg) "Error in argument " #argnum " "#extramsg + +#define SWIG_PHP_Error(code,msg) ErrorCode() = code; ErrorMsg() = msg; SWIG_fail; + +#define SWIG_contract_assert(expr,msg) \ + if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else + +/* Standard SWIG API */ +#define SWIG_GetModule(clientdata) SWIG_Php4_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Php4_SetModule(pointer) + +/* used to wrap returned objects in so we know whether they are newobject + and need freeing, or not */ +typedef struct _swig_object_wrapper { + void * ptr; + int newobject; +} swig_object_wrapper; + +/* empty zend destructor for types without one */ +static ZEND_RSRC_DTOR_FUNC(SWIG_landfill) {}; + +#define SWIG_SetPointerZval(a,b,c,d) SWIG_ZTS_SetPointerZval(a,b,c,d, SWIG_module_entry TSRMLS_CC) + +static void +SWIG_ZTS_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject, zend_module_entry* module_entry TSRMLS_DC) { + swig_object_wrapper *value=NULL; + /* + * First test for Null pointers. Return those as PHP native NULL + */ + if (!ptr ) { + ZVAL_NULL(z); + return; + } + if (type->clientdata) { + if (! (*(int *)(type->clientdata))) + zend_error(E_ERROR, "Type: %s failed to register with zend",type->name); + value=(swig_object_wrapper *)emalloc(sizeof(swig_object_wrapper)); + value->ptr=ptr; + value->newobject=newobject; + ZEND_REGISTER_RESOURCE(z, value, *(int *)(type->clientdata)); + return; + } else { /* have to deal with old fashioned string pointer? + but this should not get this far */ + zend_error(E_ERROR, "Type: %s not registered with zend",type->name); + } +} + +/* This is a new pointer conversion routine + Taking the native pointer p (which would have been converted from the old + string pointer) and it's php type id, and it's type name (which also would + have come from the old string pointer) it converts it to ptr calling + appropriate casting functions according to ty + Sadly PHP has no API to find a type name from a type id, only from an instance + of a resource of the type id, so we have to pass type_name as well. + The two functions which might call this are: + SWIG_ZTS_ConvertResourcePtr which gets the type name from the resource + and the registered zend destructors for which we have one per type each + with the type name hard wired in. */ +static int +SWIG_ZTS_ConvertResourceData(void * p, int type, const char *type_name, void **ptr, swig_type_info *ty TSRMLS_DC) { + swig_cast_info *tc; + + if (ty) { + if (! type_name) { + /* can't convert p to ptr type ty if we don't know what type p is */ + return -1; + } else { + /* convert and cast p from type_name to ptr as ty + Need to sort out const-ness, can SWIG_TypeCast really not take a const? */ + tc = SWIG_TypeCheck((char *)type_name,ty); + if (!tc) return -1; + *ptr = SWIG_TypeCast(tc, (void*)p); + } + } else { + /* They don't care about the target type, so just pass on the pointer! */ + *ptr = (void *) p; + } + return 0; +} + +/* This function fills ptr with a pointer of type ty by extracting the pointer + and type info from the resource in z. z must be a resource + It uses SWIG_ZTS_ConvertResourceData to do the real work. */ +static int +SWIG_ZTS_ConvertResourcePtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) { + swig_object_wrapper *value; + void *p; + int type; + char *type_name; + + value = (swig_object_wrapper *) zend_list_find(z->value.lval,&type); + if ( flags && SWIG_POINTER_DISOWN ) { + value->newobject = 0; + } + p = value->ptr; + if (type==-1) return -1; + + type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC); + + return SWIG_ZTS_ConvertResourceData(p,type,type_name,ptr,ty TSRMLS_CC); +} + +/* We allow passing of a STRING or RESOURCE pointing to the object + or an OBJECT whose _cPtr is a string or resource pointing to the object + STRING pointers are very depracated */ +static int +SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) { + char *c; + zval *val; + + if(z == NULL) { + *ptr = 0; + return 0; + } + + if (z->type==IS_OBJECT) { + zval ** _cPtr; + if (zend_hash_find(HASH_OF(z),"_cPtr",sizeof("_cPtr"),(void**)&_cPtr)==SUCCESS) { + /* Don't co-erce to string if it isn't */ + if ((*_cPtr)->type==IS_STRING) c = Z_STRVAL_PP(_cPtr); + else if ((*_cPtr)->type==IS_RESOURCE) { + return SWIG_ZTS_ConvertResourcePtr(*_cPtr,ptr,ty, flags TSRMLS_CC); + } else goto type_error; /* _cPtr was not string or resource property */ + } else goto type_error; /* can't find property _cPtr */ + } else if (z->type==IS_RESOURCE) { + return SWIG_ZTS_ConvertResourcePtr(z,ptr,ty, flags TSRMLS_CC); + } if (z->type==IS_NULL ) { + *ptr = 0; + return 0; + } else goto type_error; + +type_error: + + return -1; +} + +static char const_name[] = "swig_runtime_data_type_pointer"; +static swig_module_info *SWIG_Php4_GetModule() { + zval *pointer; + swig_module_info *ret = 0; + + MAKE_STD_ZVAL(pointer); + + TSRMLS_FETCH(); + + if (zend_get_constant(const_name, sizeof(const_name), pointer TSRMLS_CC)) { + if (pointer->type == IS_LONG) { + ret = (swig_module_info *) pointer->value.lval; + } + } + FREE_ZVAL(pointer); + return ret; +} + +static void SWIG_Php4_SetModule(swig_module_info *pointer) { + TSRMLS_FETCH(); + REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, 0); +} + + +/* -------- TYPES TABLE (BEGIN) -------- */ + +#define SWIGTYPE_p_p_void swig_types[0] +#define SWIGTYPE_p_switch_core_session_t swig_types[1] +#define SWIGTYPE_p_switch_input_callback_function_t swig_types[2] +static swig_type_info *swig_types[4]; +static swig_module_info swig_module = {swig_types, 3, 0, 0, 0, 0}; +#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) +#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) + +/* -------- TYPES TABLE (END) -------- */ + +/* header section */ +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license(a)php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: | + | | + +----------------------------------------------------------------------+ + */ +ZEND_BEGIN_MODULE_GLOBALS(freeswitch) +char *error_msg; +int error_code; +ZEND_END_MODULE_GLOBALS(freeswitch) +ZEND_DECLARE_MODULE_GLOBALS(freeswitch) +#ifdef ZTS +#define ErrorMsg() TSRMG(freeswitch_globals_id, zend_freeswitch_globals *, error_msg ) +#define ErrorCode() TSRMG(freeswitch_globals_id, zend_freeswitch_globals *, error_code ) +#else +#define ErrorMsg() (freeswitch_globals.error_msg) +#define ErrorCode() (freeswitch_globals.error_code) +#endif + +static void freeswitch_init_globals(zend_freeswitch_globals *freeswitch_globals ) { + freeswitch_globals->error_msg = default_error_msg; + freeswitch_globals->error_code = default_error_code; +} +static void freeswitch_destroy_globals(zend_freeswitch_globals *freeswitch_globals) { } + +void SWIG_ResetError() { + TSRMLS_FETCH(); + ErrorMsg() = default_error_msg; + ErrorCode() = default_error_code; +} +#define SWIG_name "freeswitch" +#ifdef __cplusplus +extern "C" { +#endif +#include "php.h" +#include "php_ini.h" +#include "ext/standard/info.h" +#include "php_freeswitch.h" +#ifdef __cplusplus +} +#endif + + +#include "switch.h" + +/* class entry subsection */ + + +/* entry subsection */ +/* Every non-class user visible function must have an entry here */ +function_entry freeswitch_functions[] = { + ZEND_NAMED_FE(fs_core_set_globals,_wrap_fs_core_set_globals, NULL) + ZEND_NAMED_FE(fs_core_init,_wrap_fs_core_init, NULL) + ZEND_NAMED_FE(fs_core_destroy,_wrap_fs_core_destroy, NULL) + ZEND_NAMED_FE(fs_loadable_module_init,_wrap_fs_loadable_module_init, NULL) + ZEND_NAMED_FE(fs_loadable_module_shutdown,_wrap_fs_loadable_module_shutdown, NULL) + ZEND_NAMED_FE(fs_console_loop,_wrap_fs_console_loop, NULL) + ZEND_NAMED_FE(fs_console_log,_wrap_fs_console_log, NULL) + ZEND_NAMED_FE(fs_console_clean,_wrap_fs_console_clean, NULL) + ZEND_NAMED_FE(fs_core_session_locate,_wrap_fs_core_session_locate, NULL) + ZEND_NAMED_FE(fs_channel_answer,_wrap_fs_channel_answer, NULL) + ZEND_NAMED_FE(fs_channel_pre_answer,_wrap_fs_channel_pre_answer, NULL) + ZEND_NAMED_FE(fs_channel_hangup,_wrap_fs_channel_hangup, NULL) + ZEND_NAMED_FE(fs_channel_set_variable,_wrap_fs_channel_set_variable, NULL) + ZEND_NAMED_FE(fs_channel_get_variable,_wrap_fs_channel_get_variable, NULL) + ZEND_NAMED_FE(fs_channel_set_state,_wrap_fs_channel_set_state, NULL) + ZEND_NAMED_FE(fs_ivr_play_file,_wrap_fs_ivr_play_file, NULL) + {NULL, NULL, NULL} +}; + +zend_module_entry freeswitch_module_entry = { +#if ZEND_MODULE_API_NO > 20010900 + STANDARD_MODULE_HEADER, +#endif + "freeswitch", + freeswitch_functions, + PHP_MINIT(freeswitch), + PHP_MSHUTDOWN(freeswitch), + PHP_RINIT(freeswitch), + PHP_RSHUTDOWN(freeswitch), + PHP_MINFO(freeswitch), +#if ZEND_MODULE_API_NO > 20010900 + NO_VERSION_YET, +#endif + STANDARD_MODULE_PROPERTIES +}; +zend_module_entry* SWIG_module_entry = &freeswitch_module_entry; + + +/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ + +static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_core_session_t = {"_p_switch_core_session_t", "switch_core_session_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_input_callback_function_t = {"_p_switch_input_callback_function_t", "switch_input_callback_function_t *", 0, 0, (void*)0, 0}; + +static swig_type_info *swig_type_initial[] = { + &_swigt__p_p_void, + &_swigt__p_switch_core_session_t, + &_swigt__p_switch_input_callback_function_t, +}; + +static swig_cast_info _swigc__p_p_void[] = { {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_core_session_t[] = { {&_swigt__p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_input_callback_function_t[] = { {&_swigt__p_switch_input_callback_function_t, 0, 0, 0},{0, 0, 0, 0}}; + +static swig_cast_info *swig_cast_initial[] = { + _swigc__p_p_void, + _swigc__p_switch_core_session_t, + _swigc__p_switch_input_callback_function_t, +}; + + +/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ + +/* end header section */ +/* vdecl subsection */ +static int le_swig__p_switch_core_session_t=0; /* handle for */ +static int le_swig__p_p_void=0; /* handle for */ +static int le_swig__p_switch_input_callback_function_t=0; /* handle for */ +/* end vdecl subsection */ +/* wrapper section */ +ZEND_NAMED_FUNCTION(_wrap_fs_core_set_globals) { + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + fs_core_set_globals(); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_core_init) { + char *arg1 = (char *) 0 ; + int result; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + result = (int)fs_core_init(arg1); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_core_destroy) { + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_core_destroy(); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_init) { + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_loadable_module_init(); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_shutdown) { + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_loadable_module_shutdown(); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_console_loop) { + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_console_loop(); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_console_log) { + char *arg1 = (char *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + fs_console_log(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_console_clean) { + char *arg1 = (char *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + fs_console_clean(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_core_session_locate) { + char *arg1 = (char *) 0 ; + switch_core_session_t *result = 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + result = (switch_core_session_t *)fs_core_session_locate(arg1); + { + SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_switch_core_session_t, 0); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_answer) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_channel_answer. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + fs_channel_answer(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_pre_answer) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_channel_pre_answer. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + fs_channel_pre_answer(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_hangup) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_channel_hangup. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_hangup(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_variable) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + zval **args[3]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 3) || (zend_get_parameters_array_ex(3, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_channel_set_variable. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + fs_channel_set_variable(arg1,arg2,arg3); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_get_variable) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_channel_get_variable. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_get_variable(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + zval **args[2]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 2) || (zend_get_parameters_array_ex(2, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_channel_set_state. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_set_state(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + switch_input_callback_function_t arg4 ; + void *arg5 = (void *) 0 ; + unsigned int arg6 ; + int result; + switch_input_callback_function_t *tmp4 ; + zval **args[6]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 6) || (zend_get_parameters_array_ex(6, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /* typemap(in) SWIGTYPE * */ + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_ivr_play_file. Expected SWIGTYPE_p_switch_core_session_t"); + } + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + { + if(SWIG_ConvertPtr(*args[3], (void **) &tmp4, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 4 of fs_ivr_play_file. Expected SWIGTYPE_p_switch_input_callback_function_t"); + } + arg4 = *tmp4; + } + { + if(SWIG_ConvertPtr(*args[4], (void **) &arg5, 0, 0) < 0) { + /* Allow NULL from php for void* */ + if ((*args[4])->type==IS_NULL) arg5=0; + else + SWIG_PHP_Error(E_ERROR, "Type error in argument 5 of fs_ivr_play_file. Expected SWIGTYPE_p_p_void"); + } + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[5]); + arg6 = (unsigned int) Z_LVAL_PP(args[5]); + /*@SWIG@*/; + } + result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); +} + + +/* NEW Destructor style */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_core_session_t) { + /* bah! No destructor for this simple type!! */ +} +/* NEW Destructor style */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_p_void) { + /* bah! No destructor for this simple type!! */ +} +/* NEW Destructor style */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_input_callback_function_t) { + /* bah! No destructor for this simple type!! */ +} +/* end wrapper section */ +/* init section */ +#ifdef __cplusplus +extern "C" { +#endif +ZEND_GET_MODULE(freeswitch) +#ifdef __cplusplus +} +#endif + +#define SWIG_php_minit PHP_MINIT_FUNCTION(freeswitch) +/* ----------------------------------------------------------------------------- + * Type initialization: + * This problem is tough by the requirement that no dynamic + * memory is used. Also, since swig_type_info structures store pointers to + * swig_cast_info structures and swig_cast_info structures store pointers back + * to swig_type_info structures, we need some lookup code at initialization. + * The idea is that swig generates all the structures that are needed. + * The runtime then collects these partially filled structures. + * The SWIG_InitializeModule function takes these initial arrays out of + * swig_module, and does all the lookup, filling in the swig_module.types + * array with the correct data and linking the correct swig_cast_info + * structures together. + * + * The generated swig_type_info structures are assigned staticly to an initial + * array. We just loop though that array, and handle each type individually. + * First we lookup if this type has been already loaded, and if so, use the + * loaded structure instead of the generated one. Then we have to fill in the + * cast linked list. The cast data is initially stored in something like a + * two-dimensional array. Each row corresponds to a type (there are the same + * number of rows as there are in the swig_type_initial array). Each entry in + * a column is one of the swig_cast_info structures for that type. + * The cast_initial array is actually an array of arrays, because each row has + * a variable number of columns. So to actually build the cast linked list, + * we find the array of casts associated with the type, and loop through it + * adding the casts to the list. The one last trick we need to do is making + * sure the type pointer in the swig_cast_info struct is correct. + * + * First off, we lookup the cast->type name to see if it is already loaded. + * There are three cases to handle: + * 1) If the cast->type has already been loaded AND the type we are adding + * casting info to has not been loaded (it is in this module), THEN we + * replace the cast->type pointer with the type pointer that has already + * been loaded. + * 2) If BOTH types (the one we are adding casting info to, and the + * cast->type) are loaded, THEN the cast info has already been loaded by + * the previous module so we just ignore it. + * 3) Finally, if cast->type has not already been loaded, then we add that + * swig_cast_info to the linked list (because the cast->type) pointer will + * be correct. + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#if 0 +} /* c-mode */ +#endif +#endif + +#if 0 +#define SWIGRUNTIME_DEBUG +#endif + +SWIGRUNTIME void +SWIG_InitializeModule(void *clientdata) { + size_t i; + swig_module_info *module_head; + static int init_run = 0; + + clientdata = clientdata; + + if (init_run) return; + init_run = 1; + + /* Initialize the swig_module */ + swig_module.type_initial = swig_type_initial; + swig_module.cast_initial = swig_cast_initial; + + /* Try and load any already created modules */ + module_head = SWIG_GetModule(clientdata); + if (module_head) { + swig_module.next = module_head->next; + module_head->next = &swig_module; + } else { + /* This is the first module loaded */ + swig_module.next = &swig_module; + SWIG_SetModule(clientdata, &swig_module); + } + + /* Now work on filling in swig_module.types */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: size %d\n", swig_module.size); +#endif + for (i = 0; i < swig_module.size; ++i) { + swig_type_info *type = 0; + swig_type_info *ret; + swig_cast_info *cast; + +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); +#endif + + /* if there is another module already loaded */ + if (swig_module.next != &swig_module) { + type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); + } + if (type) { + /* Overwrite clientdata field */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found type %s\n", type->name); +#endif + if (swig_module.type_initial[i]->clientdata) { + type->clientdata = swig_module.type_initial[i]->clientdata; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name); +#endif + } + } else { + type = swig_module.type_initial[i]; + } + + /* Insert casting types */ + cast = swig_module.cast_initial[i]; + while (cast->type) { + + /* Don't need to add information already in the list */ + ret = 0; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: look cast %s\n", cast->type->name); +#endif + if (swig_module.next != &swig_module) { + ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); +#ifdef SWIGRUNTIME_DEBUG + if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name); +#endif + } + if (ret) { + if (type == swig_module.type_initial[i]) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: skip old type %s\n", ret->name); +#endif + cast->type = ret; + ret = 0; + } else { + /* Check for casting already in the list */ + swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type); +#ifdef SWIGRUNTIME_DEBUG + if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name); +#endif + if (!ocast) ret = 0; + } + } + + if (!ret) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name); +#endif + if (type->cast) { + type->cast->prev = cast; + cast->next = type->cast; + } + type->cast = cast; + } + cast++; + } + /* Set entry in modules->types array equal to the type */ + swig_module.types[i] = type; + } + swig_module.types[i] = 0; + +#ifdef SWIGRUNTIME_DEBUG + printf("**** SWIG_InitializeModule: Cast List ******\n"); + for (i = 0; i < swig_module.size; ++i) { + int j = 0; + swig_cast_info *cast = swig_module.cast_initial[i]; + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); + while (cast->type) { + printf("SWIG_InitializeModule: cast type %s\n", cast->type->name); + cast++; + ++j; + } + printf("---- Total casts: %d\n",j); + } + printf("**** SWIG_InitializeModule: Cast List ******\n"); +#endif +} + +/* This function will propagate the clientdata field of type to +* any new swig_type_info structures that have been added into the list +* of equivalent types. It is like calling +* SWIG_TypeClientData(type, clientdata) a second time. +*/ +SWIGRUNTIME void +SWIG_PropagateClientData(void) { + size_t i; + swig_cast_info *equiv; + static int init_run = 0; + + if (init_run) return; + init_run = 1; + + for (i = 0; i < swig_module.size; i++) { + if (swig_module.types[i]->clientdata) { + equiv = swig_module.types[i]->cast; + while (equiv) { + if (!equiv->converter) { + if (equiv->type && !equiv->type->clientdata) + SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); + } + equiv = equiv->next; + } + } + } +} + +#ifdef __cplusplus +#if 0 +{ /* c-mode */ +#endif +} +#endif + + + SWIG_php_minit { + SWIG_InitializeModule(0); + +/* oinit subsection */ +ZEND_INIT_MODULE_GLOBALS(freeswitch, freeswitch_init_globals, freeswitch_destroy_globals); + +/* Register resource destructors for pointer types */ +le_swig__p_switch_core_session_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_core_session_t,NULL,(char *)(SWIGTYPE_p_switch_core_session_t->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_switch_core_session_t,&le_swig__p_switch_core_session_t); +le_swig__p_p_void=zend_register_list_destructors_ex(_wrap_destroy_p_p_void,NULL,(char *)(SWIGTYPE_p_p_void->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_p_void,&le_swig__p_p_void); +le_swig__p_switch_input_callback_function_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_input_callback_function_t,NULL,(char *)(SWIGTYPE_p_switch_input_callback_function_t->name),module_number); +SWIG_TypeClientData(SWIGTYPE_p_switch_input_callback_function_t,&le_swig__p_switch_input_callback_function_t); +CG(active_class_entry) = NULL; +/* end oinit subsection */ + + return SUCCESS; +} +PHP_RINIT_FUNCTION(freeswitch) +{ +/* rinit section */ + +/* cinit subsection */ +/* end cinit subsection */ + +/* vinit subsection */ +/* end vinit subsection */ + + return SUCCESS; +} +PHP_MSHUTDOWN_FUNCTION(freeswitch) +{ +/* shutdown section */ + + return SUCCESS; +} +PHP_RSHUTDOWN_FUNCTION(freeswitch) +{ +/* rshutdown section */ + + return SUCCESS; +} +PHP_MINFO_FUNCTION(freeswitch) +{ +} +/* end init section */ Added: freeswitch/trunk/src/mod/languages/mod_php/test.php ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_php/test.php Thu Sep 7 16:00:23 2006 @@ -0,0 +1,10 @@ +<? + +include("freeswitch.php"); + +fs_core_set_globals(); +fs_core_init(""); +fs_loadable_module_init(); +fs_console_loop(); +fs_core_destroy(); +?> \ No newline at end of file

1 0

[commit] r2555 - freeswitch/trunk/src/include
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: anthm Date: Thu Sep 7 11:15:39 2006 New Revision: 2555 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_sqlite.h freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/include/switch_xml.h Log: what comes up must come down Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Thu Sep 7 11:15:39 2006 @@ -37,10 +37,10 @@ #ifdef __cplusplus #define SWITCH_BEGIN_EXTERN_C extern "C" { -#define END_EXTERN_C } +#define SWITCH_END_EXTERN_C } #else #define SWITCH_BEGIN_EXTERN_C -#define END_EXTERN_C +#define SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Thu Sep 7 11:15:39 2006 @@ -1433,6 +1433,6 @@ /** @} */ /** @} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Thu Sep 7 11:15:39 2006 @@ -278,5 +278,5 @@ } ///\} -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Thu Sep 7 11:15:39 2006 @@ -109,6 +109,6 @@ SWITCH_DECLARE(void) switch_buffer_zero(switch_buffer_t *buffer); /** @} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Thu Sep 7 11:15:39 2006 @@ -195,7 +195,7 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event); -END_EXTERN_C +SWITCH_END_EXTERN_C /** @} */ Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Sep 7 11:15:39 2006 @@ -393,6 +393,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_get_raw_mode (switch_channel_t *channel, int *freq, int *bits, int *channels, int *ms, int *kbps); /** @} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Thu Sep 7 11:15:39 2006 @@ -104,7 +104,7 @@ */ SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t *cfg, char **var, char **val); -END_EXTERN_C +SWITCH_END_EXTERN_C /** @} */ Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Thu Sep 7 11:15:39 2006 @@ -68,6 +68,6 @@ \brief A method akin to printf for dealing with api streams */ SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...); -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Sep 7 11:15:39 2006 @@ -1170,6 +1170,6 @@ \} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Thu Sep 7 11:15:39 2006 @@ -310,6 +310,6 @@ #define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, data) ///\} -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Thu Sep 7 11:15:39 2006 @@ -68,6 +68,6 @@ switch_frame_flag_t flags; }; -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Sep 7 11:15:39 2006 @@ -216,7 +216,7 @@ /** @} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Sep 7 11:15:39 2006 @@ -230,6 +230,6 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void); ///\} -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Thu Sep 7 11:15:39 2006 @@ -117,6 +117,6 @@ SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str); ///\} -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Sep 7 11:15:39 2006 @@ -536,6 +536,6 @@ const struct switch_api_interface *next; }; -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Sep 7 11:15:39 2006 @@ -141,6 +141,6 @@ #define DoxyDefine(x) #endif -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Thu Sep 7 11:15:39 2006 @@ -156,7 +156,7 @@ ///\} -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Sep 7 11:15:39 2006 @@ -373,6 +373,6 @@ \} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_sqlite.h ============================================================================== --- freeswitch/trunk/src/include/switch_sqlite.h (original) +++ freeswitch/trunk/src/include/switch_sqlite.h Thu Sep 7 11:15:39 2006 @@ -1804,6 +1804,6 @@ /** @} */ /** @} */ -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Thu Sep 7 11:15:39 2006 @@ -240,6 +240,6 @@ #define switch_stun_packet_length(packet) ntohs(packet->header.length) + sizeof(switch_stun_packet_header_t) ///\} -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Sep 7 11:15:39 2006 @@ -783,6 +783,6 @@ /*! \brief A core session representing a call and all of it's resources */ struct switch_core_session; -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Sep 7 11:15:39 2006 @@ -210,6 +210,6 @@ #define SWITCH_READ_ACCEPTABLE(status) status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len); SWITCH_DECLARE(char *) switch_url_decode(char *s); -END_EXTERN_C +SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Sep 7 11:15:39 2006 @@ -331,7 +331,7 @@ ///\return the section mask SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str); -END_EXTERN_C +SWITCH_END_EXTERN_C ///\}

1 0

[commit] r2554 - in freeswitch/trunk: libs/codec/lpc10 src src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_exosip src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: anthm Date: Thu Sep 7 11:08:40 2006 New Revision: 2554 Modified: freeswitch/trunk/libs/codec/lpc10/Makefile.am freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: update Modified: freeswitch/trunk/libs/codec/lpc10/Makefile.am ============================================================================== --- freeswitch/trunk/libs/codec/lpc10/Makefile.am (original) +++ freeswitch/trunk/libs/codec/lpc10/Makefile.am Thu Sep 7 11:08:40 2006 @@ -2,24 +2,20 @@ SUBDIRS = AUTOMAKE_OPTS= gnu MAKE=gmake -NAME=liblpc10 +NAME=libg7xx AM_CC=gcc AM_CFLAGS = -Wall -O3 -funroll-loops AM_CPPFLAGS = $(AM_CFLAGS) -lib_LTLIBRARIES = liblpc10.la -liblpc10_la_SOURCES = analys.c dcbias.c difmag.c energy.c hp100.c ivfilt.c lpcini.c mload.c placea.c prepro.c synths.c vparms.c \ -bsynz.c decode.c dyptrk.c f2clib.c invert.c lpcdec.c lpfilt.c onset.c placev.c random.c tbdm.c \ -chanwr.c deemp.c encode.c ham84.c irc2pc.c lpcenc.c median.c pitsyn.c preemp.c rcchk.c voicin.c +lib_LTLIBRARIES = libg7xx.la +libg7xx_la_SOURCES = g711.c g722_deode.c g722_encode.c g726.c +libg7xx_la_CFLAGS = $(AM_CFLAGS) +libg7xx_la_LDFLAGS = - -liblpc10_la_CFLAGS = $(AM_CFLAGS) -liblpc10_la_LDFLAGS = - -library_includedir = $(prefix)/include/lpc10 -library_include_HEADERS = f2c.h lpc10.h +library_includedir = $(prefix)/include/g7xx +library_include_HEADERS = g726.h g711.h g722.h Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Sep 7 11:08:40 2006 @@ -283,17 +283,13 @@ { switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); const char *err; - int ms = 20; + int ms = 0; switch_rtp_flag_t flags; if (switch_rtp_ready(tech_pvt->rtp_session)) { return 1; } - if (!strncasecmp(tech_pvt->codec_name, "ilbc", 4)) { - ms = 30; - } - if (switch_core_codec_init(&tech_pvt->read_codec, tech_pvt->codec_name, tech_pvt->codec_rate, @@ -1693,6 +1689,7 @@ if (!strncasecmp(name, "ilbc", 4)) { name = "ilbc"; } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d to %s %d\n", payloads[x].name, payloads[x].id, name, tech_pvt->codecs[y]->ianacode); if (tech_pvt->codecs[y]->ianacode > 96) { match = strcasecmp(name, payloads[x].name) ? 0 : 1; } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Thu Sep 7 11:08:40 2006 @@ -1439,17 +1439,13 @@ { int rate = atoi(drate); - int ms = globals.codec_ms; + int ms = 0; //globals.codec_ms; if (imp) { ms = imp->microseconds_per_frame / 1000; } - if (!strcasecmp(dname, "ilbc")) { - ms = 30; - } - if (switch_core_codec_init(&tech_pvt->read_codec, dname, rate, @@ -1938,12 +1934,8 @@ if (!switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) { int rate = atoi(drate); - int ms = globals.codec_ms; + int ms = 0; //globals.codec_ms; - if (!strcasecmp(dname, "ilbc")) { - ms = 30; - } - if (imp) { ms = imp->microseconds_per_frame / 1000; } @@ -2273,7 +2265,7 @@ } if (!globals.codec_ms) { - globals.codec_ms = 20; + globals.codec_ms = 0; } if (!globals.port) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Sep 7 11:08:40 2006 @@ -1661,6 +1661,8 @@ profile->name = switch_core_strdup(profile->pool, xprofilename); profile->dtmf_duration = 100; + profile->codec_ms = 20; + for (param = switch_xml_child(xprofile, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -1738,10 +1740,6 @@ profile->rtpip = switch_core_strdup(profile->pool, "127.0.0.1"); } - if (!profile->codec_ms) { - profile->codec_ms = 20; - } - if (!profile->sip_port) { profile->sip_port = 5060; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Sep 7 11:08:40 2006 @@ -502,8 +502,10 @@ return SWITCH_STATUS_SUCCESS; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec %s Exists but not at the desired implementation.\n", - codec_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec %s Exists but not at the desired implementation. %dhz %dms\n", + codec_name, + rate, + ms); } return SWITCH_STATUS_NOTIMPL;

1 0

[commit] r2548 - freeswitch/trunk/src/include
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: anthm Date: Thu Sep 7 10:23:31 2006 New Revision: 2548 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_sqlite.h freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/include/switch_xml.h Log: fix namespace Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Thu Sep 7 10:23:31 2006 @@ -36,10 +36,10 @@ #define SWITCH_H #ifdef __cplusplus -#define BEGIN_EXTERN_C extern "C" { +#define SWITCH_BEGIN_EXTERN_C extern "C" { #define END_EXTERN_C } #else -#define BEGIN_EXTERN_C +#define SWITCH_BEGIN_EXTERN_C #define END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Thu Sep 7 10:23:31 2006 @@ -63,7 +63,7 @@ #include <apr_want.h> #include <apr_env.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /* The pieces of apr we allow ppl to pass around between modules we typedef into our namespace and wrap all the functions Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Thu Sep 7 10:23:31 2006 @@ -35,7 +35,7 @@ */ #ifndef SWITCH_BITPACK_H #define SWITCH_BITPACK_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include <switch.h> Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /** * @defgroup switch_buffer Buffer Routines Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Thu Sep 7 10:23:31 2006 @@ -55,7 +55,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief Call Specific Data */ Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C struct switch_channel_timetable { switch_time_t created; Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Thu Sep 7 10:23:31 2006 @@ -58,7 +58,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief A simple file handle representing an open configuration file **/ struct switch_config { Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Thu Sep 7 10:23:31 2006 @@ -41,7 +41,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_CMD_CHUNK_LEN 1024 #define SWITCH_STANDARD_STREAM(s) if ((s.data = (char *)malloc(SWITCH_CMD_CHUNK_LEN))) { \ memset(s.data, 0, SWITCH_CMD_CHUNK_LEN); \ Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_MAX_CORE_THREAD_SESSION_OBJS 128 #define SWITCH_MAX_STREAMS 128 Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Thu Sep 7 10:23:31 2006 @@ -60,7 +60,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief An event Header */ struct switch_event_header{ Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Thu Sep 7 10:23:31 2006 @@ -38,7 +38,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief An abstraction of a data frame */ struct switch_frame { Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C static const switch_state_handler_table_t noop_state_handler = {0}; Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Sep 7 10:23:31 2006 @@ -43,7 +43,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \defgroup mods Loadable Module Functions Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C ///\defgroup log Logger Routines ///\ingroup core1 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Sep 7 10:23:31 2006 @@ -41,7 +41,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C /*! \brief A table of functions to execute at various states */ Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Sep 7 10:23:31 2006 @@ -34,7 +34,7 @@ #ifndef SWITCH_PLATFORM_H #define SWITCH_PLATFORM_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #ifdef __ICC #pragma warning (disable:810 869 981 279 1469 188) Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Thu Sep 7 10:23:31 2006 @@ -43,7 +43,7 @@ #define SWITCH_RESAMPLE_H #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include <stdlib.h> /*! Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Sep 7 10:23:31 2006 @@ -38,7 +38,7 @@ #ifndef SWITCH_RTP_H #define SWITCH_RTP_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_RTP_MAX_BUF_LEN 16384 Modified: freeswitch/trunk/src/include/switch_sqlite.h ============================================================================== --- freeswitch/trunk/src/include/switch_sqlite.h (original) +++ freeswitch/trunk/src/include/switch_sqlite.h Thu Sep 7 10:23:31 2006 @@ -35,7 +35,7 @@ #ifndef SWITCH_SQLITE_H #define SWITCH_SQLITE_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #include <sqlite3.h> Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Thu Sep 7 10:23:31 2006 @@ -37,7 +37,7 @@ #ifndef _SWITCH_STUN_PARSER_H #define _SWITCH_STUN_PARSER_H -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_STUN_DEFAULT_PORT 3478 #define SWITCH_STUN_PACKET_MIN_LEN 20 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Sep 7 10:23:31 2006 @@ -36,7 +36,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #ifdef WIN32 #define SWITCH_PATH_SEPARATOR "\\" Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Sep 7 10:23:31 2006 @@ -40,7 +40,7 @@ #include <switch.h> -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #ifndef snprintf #define snprintf apr_snprintf Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Sep 7 10:23:31 2006 @@ -65,7 +65,7 @@ ///\defgroup xml1 XML Library Functions ///\ingroup core1 ///\{ -BEGIN_EXTERN_C +SWITCH_BEGIN_EXTERN_C #define SWITCH_XML_BUFSIZE 1024 // size of internal memory buffers

1 0

[commit] r2543 - in freeswitch/trunk: . src/mod/applications/mod_park
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: mikej Date: Thu Sep 7 01:35:29 2006 New Revision: 2543 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj Log: add mod_park to the windows build. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Thu Sep 7 01:35:29 2006 @@ -530,7 +530,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" ProjectSection(ProjectDependencies) = postProject + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_park", "src\mod\applications\mod_park\mod_park.vcproj", "{2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}" + ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} @@ -881,6 +889,10 @@ {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.Build.0 = Debug|Win32 {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.ActiveCfg = Release|Win32 {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.Build.0 = Release|Win32 + {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Debug|Win32.ActiveCfg = Debug|Win32 + {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Debug|Win32.Build.0 = Debug|Win32 + {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.ActiveCfg = Release|Win32 + {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -909,6 +921,7 @@ {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} Modified: freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj Thu Sep 7 01:35:29 2006 @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="mod_park" - ProjectGUID="{0E2C6395-13B9-46E5-9264-8859D346018D}" + ProjectGUID="{2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}" RootNamespace="mod_park" Keyword="Win32Proj" >

1 0

[commit] r2542 - in freeswitch/trunk/src: . include
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: mikej Date: Thu Sep 7 01:35:08 2006 New Revision: 2542 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_core.c Log: update build on windows from latest core changes. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Sep 7 01:35:08 2006 @@ -119,7 +119,7 @@ \param new pointer for the return value \return SWITCH_STATUS_SUCCESS if the operation was a success */ -SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint32_t inc, switch_core_port_allocator_t **new); +SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint8_t inc, switch_core_port_allocator_t **new_allocator); /*! \brief Get a port from the port allocator Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Sep 7 01:35:08 2006 @@ -42,7 +42,7 @@ BEGIN_EXTERN_C -static const switch_state_handler_table_t noop_state_handler = {}; +static const switch_state_handler_table_t noop_state_handler = {0}; /** * @defgroup switch_ivr IVR Library Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Sep 7 01:35:08 2006 @@ -141,12 +141,12 @@ switch_port_t start; switch_port_t end; switch_port_t next; - uint32_t inc; + uint8_t inc; switch_mutex_t *mutex; switch_memory_pool_t *pool; }; -SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint32_t inc, switch_core_port_allocator_t **new) +SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, switch_port_t end, uint8_t inc, switch_core_port_allocator_t **new_allocator) { switch_status_t status; switch_memory_pool_t *pool; @@ -169,7 +169,7 @@ } switch_mutex_init(&alloc->mutex, SWITCH_MUTEX_NESTED, pool); alloc->pool = pool; - *new = alloc; + *new_allocator = alloc; return SWITCH_STATUS_SUCCESS; } @@ -180,7 +180,7 @@ switch_mutex_lock(alloc->mutex); port = alloc->next; - alloc->next += alloc->inc; + alloc->next = alloc->next + alloc->inc; if (alloc->next > alloc->end) { alloc->next = alloc->start; }

1 0

[commit] r2541 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 07 Sep '06

07 Sep '06

Author: mikej Date: Thu Sep 7 01:34:11 2006 New Revision: 2541 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: remove unnecessary muting on volume adjust and energy, bad bluetooth headsets find bugs, thanks Jason Garland for finding this one. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Sep 7 01:34:11 2006 @@ -1557,7 +1557,6 @@ conference_member_t *member; if ((member = conference_member_get(conference, id))) { - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); if (argv[3]) { switch_mutex_lock(member->flag_mutex); @@ -1595,7 +1594,6 @@ conference_member_t *member; if ((member = conference_member_get(conference, id))) { - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); if (argv[3]) { switch_mutex_lock(member->flag_mutex); @@ -1633,7 +1631,6 @@ conference_member_t *member; if ((member = conference_member_get(conference, id))) { - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); if (argv[3]) { switch_mutex_lock(member->flag_mutex);

1 0