Freeswitch-trunk
Threads by month
- ----- 2026 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- 14172 discussions
Author: anthm
Date: Tue Sep 12 08:38:26 2006
New Revision: 2657
Modified:
freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php
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_wrap.c
Log:
apply api change from yesterday
Modified: freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php Tue Sep 12 08:38:26 2006
@@ -2,7 +2,7 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org)
- * Version 1.3.29
+ * Version 1.3.21
*
* 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
@@ -16,7 +16,7 @@
/* if our extension has not been loaded, do what we can */
if (!extension_loaded("php_freeswitch")) {
- if (!dl("php_freeswitch.so")) return;
+ if (!dl("php_freeswitch.so")) return;
}
Modified: freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h Tue Sep 12 08:38:26 2006
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org)
- * Version 1.3.29
+ * Version 1.3.21
*
* 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
@@ -40,10 +40,6 @@
# define PHP_FREESWITCH_API
#endif
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
PHP_MINIT_FUNCTION(freeswitch);
PHP_MSHUTDOWN_FUNCTION(freeswitch);
PHP_RINIT_FUNCTION(freeswitch);
@@ -76,4 +72,24 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_speak_text);
ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_get_variable);
ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable);
+/*If you declare any globals in php_freeswitch.h uncomment this:
+ZEND_BEGIN_MODULE_GLOBALS(freeswitch)
+ZEND_END_MODULE_GLOBALS(freeswitch)
+*/
+#ifdef ZTS
+#define FREESWITCH_D zend_freeswitch_globals *freeswitch_globals
+#define FREESWITCH_DC , FREESWITCH_D
+#define FREESWITCH_C freeswitch_globals
+#define FREESWITCH_CC , FREESWITCH_C
+#define FREESWITCH_SG(v) (freeswitch_globals->v)
+#define FREESWITCH_FETCH() zend_freeswitch_globals *freeswitch_globals = ts_resource(freeswitch_globals_id)
+#else
+#define FREESWITCH_D
+#define FREESWITCH_DC
+#define FREESWITCH_C
+#define FREESWITCH_CC
+#define FREESWITCH_SG(v) (freeswitch_globals.v)
+#define FREESWITCH_FETCH()
+#endif
+
#endif /* PHP_FREESWITCH_H */
Modified: freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c Tue Sep 12 08:38:26 2006
@@ -257,6 +257,7 @@
switch_core_session_t *peer_session;
unsigned int timelimit = 60;
char *var;
+ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
caller_channel = switch_core_session_get_channel(session);
assert(caller_channel != NULL);
@@ -265,7 +266,7 @@
timelimit = atoi(var);
}
- if (switch_ivr_originate(session, &peer_session, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
+ if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
return;
Modified: freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c Tue Sep 12 08:38:26 2006
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org)
- * Version 1.3.29
+ * Version 1.3.21
*
* 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
@@ -8,284 +8,72 @@
* interface file instead.
* ----------------------------------------------------------------------------- */
-/* -----------------------------------------------------------------------------
- * This section contains generic SWIG labels for method/variable
- * declarations/attributes, and other compiler dependent labels.
- * ----------------------------------------------------------------------------- */
+/*************************************************************** -*- c -*-
+ * php4/precommon.swg
+ *
+ * Rename all exported symbols from common.swg, to avoid symbol
+ * clashes if multiple interpreters are included
+ *
+ ************************************************************************/
-/* 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
+#define SWIG_TypeRegister SWIG_PHP4_TypeRegister
+#define SWIG_TypeCheck SWIG_PHP4_TypeCheck
+#define SWIG_TypeCast SWIG_PHP4_TypeCast
+#define SWIG_TypeDynamicCast SWIG_PHP4_TypeDynamicCast
+#define SWIG_TypeName SWIG_PHP4_TypeName
+#define SWIG_TypeQuery SWIG_PHP4_TypeQuery
+#define SWIG_TypeClientData SWIG_PHP4_TypeClientData
+#define SWIG_PackData SWIG_PHP4_PackData
+#define SWIG_UnpackData SWIG_PHP4_UnpackData
-/* 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
+/***********************************************************************
+ * common.swg
+ *
+ * This file contains generic SWIG runtime support for pointer
+ * type checking as well as a few commonly used macros to control
+ * external linkage.
+ *
+ * Author : David Beazley (beazley(a)cs.uchicago.edu)
+ *
+ * Copyright (c) 1999-2000, The University of Chicago
+ *
+ * This file may be freely redistributed without license or fee provided
+ * this copyright message remains intact.
+ ************************************************************************/
-#ifndef SWIGUNUSEDPARM
-# ifdef __cplusplus
-# define SWIGUNUSEDPARM(p)
-# else
-# define SWIGUNUSEDPARM(p) p SWIGUNUSED
-# endif
-#endif
+#include <string.h>
+#include "switch.h"
-/* 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
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if defined(_MSC_VER) || defined(__GNUC__)
+# if defined(STATIC_LINKED)
+# define SWIGEXPORT(a) a
+# define SWIGIMPORT(a) extern a
+# else
+# define SWIGEXPORT(a) __declspec(dllexport) a
+# define SWIGIMPORT(a) extern a
+# endif
+# else
+# if defined(__BORLANDC__)
+# define SWIGEXPORT(a) a _export
+# define SWIGIMPORT(a) a _export
+# else
+# define SWIGEXPORT(a) a
+# define SWIGIMPORT(a) a
+# endif
# endif
+#else
+# define SWIGEXPORT(a) a
+# define SWIGIMPORT(a) a
#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)
+#ifdef SWIG_GLOBAL
+# define SWIGRUNTIME(a) SWIGEXPORT(a)
#else
-# define SWIG_TYPE_TABLE_NAME
+# define SWIGRUNTIME(a) static a
#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
@@ -293,141 +81,106 @@
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 */
+ const char *name;
+ swig_converter_func converter;
+ const char *str;
+ void *clientdata;
+ swig_dycast_func dcast;
+ struct swig_type_info *next;
+ struct swig_type_info *prev;
} 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;
+#ifdef SWIG_NOINCLUDE
-/* 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;
+SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *);
+SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
+SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *);
+SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
+SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
+SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *);
+SWIGIMPORT(char *) SWIG_PackData(char *, void *, int);
+SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int);
-/*
- Compare two type names skipping the space characters, therefore
- "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+#else
- 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);
-}
+static swig_type_info *swig_type_list = 0;
-/*
- 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;
+/* Register a type mapping with the type-checking */
+SWIGRUNTIME(swig_type_info *)
+SWIG_TypeRegister(swig_type_info *ti) {
+ swig_type_info *tc, *head, *ret, *next;
+ /* Check to see if this type has already been registered */
+ tc = swig_type_list;
+ while (tc) {
+ if (strcmp(tc->name, ti->name) == 0) {
+ /* Already exists in the table. Just add additional types to the list */
+ if (tc->clientdata) ti->clientdata = tc->clientdata;
+ head = tc;
+ next = tc->next;
+ goto l1;
}
- equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
- if (*ne) ++ne;
+ tc = tc->prev;
}
- return equiv;
-}
+ head = ti;
+ next = 0;
-/*
- 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;
+ /* Place in list */
+ ti->prev = swig_type_list;
+ swig_type_list = ti;
+
+ /* Build linked lists */
+ l1:
+ ret = head;
+ tc = ti + 1;
+ /* Patch up the rest of the links */
+ while (tc->name) {
+ head->next = tc;
+ tc->prev = head;
+ head = tc;
+ tc++;
}
- return equiv;
+ if (next) next->prev = head;
+ head->next = next;
+ return ret;
}
-
-/* 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);
+/* Check the typename */
+SWIGRUNTIME(swig_type_info *)
+SWIG_TypeCheck(char *c, swig_type_info *ty) {
+ swig_type_info *s;
+ if (!ty) return 0; /* Void pointer */
+ s = ty->next; /* First element always just a name */
+ do {
+ if (strcmp(s->name,c) == 0) {
+ if (s == ty->next) return s;
+ /* Move s to the top of the linked list */
+ s->prev->next = s->next;
+ if (s->next) {
+ s->next->prev = s->prev;
+ }
+ /* Insert s as second element in the list */
+ s->next = ty->next;
+ if (ty->next) ty->next->prev = s;
+ ty->next = s;
+ s->prev = ty;
+ return s;
+ }
+ s = s->next;
+ } while (s && (s != ty->next));
+ return 0;
}
-/* 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 */
+SWIGRUNTIME(void *)
+SWIG_TypeCast(swig_type_info *ty, void *ptr) {
+ if ((!ty) || (!ty->converter)) return ptr;
+ return (*ty->converter)(ptr);
}
-/*
- 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 *
+/* 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;
@@ -438,251 +191,94 @@
return lastty;
}
-/*
- Return the name associated with this type
-*/
-SWIGRUNTIMEINLINE const char *
+/* Return the name associated with this type */
+SWIGRUNTIME(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;
+/* Search for a swig_type_info structure */
+SWIGRUNTIME(swig_type_info *)
+SWIG_TypeQuery(const char *name) {
+ swig_type_info *ty = swig_type_list;
+ while (ty) {
+ if (ty->str && (strcmp(name,ty->str) == 0)) return ty;
+ if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
+ ty = ty->prev;
}
- else
- return type->name;
+ return 0;
}
-/*
- Set the clientdata field for a type
-*/
-SWIGRUNTIME void
+/* 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; */
+ swig_type_info *tc, *equiv;
+ 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);
+ equiv = ti->next;
+ while (equiv) {
+ if (!equiv->converter) {
+ tc = swig_type_list;
+ while (tc) {
+ if ((strcmp(tc->name, equiv->name) == 0))
+ SWIG_TypeClientData(tc,clientdata);
+ tc = tc->prev;
}
- }
- 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);
+ equiv = equiv->next;
}
-
- /* 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;
+/* Pack binary data into a string */
+SWIGRUNTIME(char *)
+SWIG_PackData(char *c, void *ptr, int sz) {
+ static char hex[17] = "0123456789abcdef";
+ int i;
+ unsigned char *u = (unsigned char *) ptr;
+ register unsigned char uu;
+ for (i = 0; i < sz; i++,u++) {
+ 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;
+/* Unpack binary data from a string */
+SWIGRUNTIME(char *)
+SWIG_UnpackData(char *c, void *ptr, int sz) {
+ register unsigned char uu = 0;
+ register int d;
+ unsigned char *u = (unsigned char *) ptr;
+ int i;
+ for (i = 0; i < sz; i++, u++) {
+ d = *(c++);
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;
-}
+#endif
-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.
+/*
+ * php4.swg
*
- * php4run.swg
- *
* PHP4 runtime library
- * ----------------------------------------------------------------------------- */
+ *
+ */
#ifdef __cplusplus
extern "C" {
@@ -710,28 +306,6 @@
}
#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 {
@@ -739,24 +313,56 @@
int newobject;
} swig_object_wrapper;
+/* local scope self_constructors are set to 1 inside function wrappers
+ which are also class constructors, so that the php4.swg output typemaps
+ know whether or not to wrap returned objects in this_ptr or a new object */
+int self_constructor=0;
+
/* empty zend destructor for types without one */
static ZEND_RSRC_DTOR_FUNC(SWIG_landfill) {};
+/* This one makes old swig style string pointers but the php module doesn't
+ use these any more. This is just left here for old times sake and may go */
+SWIGRUNTIME(void)
+SWIG_MakePtr(char *c, void *ptr, swig_type_info *ty) {
+ static char hex[17] = "0123456789abcdef";
+ unsigned long p, s;
+ char data[32], *r;
+
+ r = data;
+ p = (unsigned long) ptr;
+ if (p > 0) {
+ while (p > 0) {
+ s = p & 0xf;
+ *(r++) = hex[s];
+ p = p >> 4;
+ }
+ *r = '_';
+ while (r >= data) {
+ *(c++) = *(r--);
+ }
+ strcpy (c, ty->name);
+ } else {
+ strcpy (c, "NULL");
+ }
+}
+
+SWIGRUNTIME(void)
+SWIG_SetPointerChar(char **c, void *ptr, swig_type_info *type) {
+ char data[512];
+
+ SWIG_MakePtr(data, ptr, type);
+ *c = estrdup(data);
+}
+
#define SWIG_SetPointerZval(a,b,c,d) SWIG_ZTS_SetPointerZval(a,b,c,d, SWIG_module_entry TSRMLS_CC)
-static void
+SWIGRUNTIME(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;
- }
+ /* No need to call SWIG_MakePtr here! */
if (type->clientdata) {
- if (! (*(int *)(type->clientdata)))
- zend_error(E_ERROR, "Type: %s failed to register with zend",type->name);
+ 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;
@@ -768,6 +374,55 @@
}
}
+/* This old-style routine converts an old string-pointer c into a real pointer
+ ptr calling making appropriate casting functions according to ty
+ We don't use this any more */
+SWIGRUNTIME(int)
+SWIG_ConvertPtr_(char *c, void **ptr, swig_type_info *ty) {
+ register int d;
+ unsigned long p;
+ swig_type_info *tc;
+
+ if(c == NULL) {
+ *ptr = 0;
+ return 0;
+ }
+
+ p = 0;
+ if (*c != '_') {
+ *ptr = (void *) 0;
+ if (strcmp(c,"NULL") == 0) {
+ return 0;
+ } else {
+ goto type_error;
+ }
+ }
+
+ c++;
+ /* Extract hex value from pointer */
+ while ((d = *c)) {
+ if ((d >= '0') && (d <= '9'))
+ p = (p << 4) + (d - '0');
+ else if ((d >= 'a') && (d <= 'f'))
+ p = (p << 4) + (d - ('a'-10));
+ else
+ break;
+ c++;
+ }
+ *ptr = (void *) p;
+
+ if(ty) {
+ tc = SWIG_TypeCheck(c,ty);
+ if(!tc) goto type_error;
+ *ptr = SWIG_TypeCast(tc, (void*)p);
+ }
+ return 0;
+
+type_error:
+
+ return -1;
+}
+
/* 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
@@ -779,9 +434,9 @@
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
+SWIGRUNTIME(int)
SWIG_ZTS_ConvertResourceData(void * p, int type, const char *type_name, void **ptr, swig_type_info *ty TSRMLS_DC) {
- swig_cast_info *tc;
+ swig_type_info *tc;
if (ty) {
if (! type_name) {
@@ -804,30 +459,32 @@
/* 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) {
+SWIGRUNTIME(int)
+SWIG_ZTS_ConvertResourcePtr(zval *z, void **ptr, swig_type_info *ty 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);
+ type_name=zend_rsrc_list_get_rsrc_type(z->value.lval);
return SWIG_ZTS_ConvertResourceData(p,type,type_name,ptr,ty TSRMLS_CC);
}
+/* 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(a,b,c) SWIG_ZTS_ConvertPtr(a,b,c 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) {
+SWIGRUNTIME(int)
+SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty TSRMLS_DC) {
char *c;
zval *val;
@@ -842,14 +499,14 @@
/* 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);
+ return SWIG_ZTS_ConvertResourcePtr(*_cPtr,ptr,ty 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;
+ return SWIG_ZTS_ConvertResourcePtr(z,ptr,ty TSRMLS_CC);
+ } else if (z->type==IS_STRING) {
+ c = Z_STRVAL_P(z);
+ return SWIG_ConvertPtr_(c,ptr,ty);
} else goto type_error;
type_error:
@@ -857,43 +514,17 @@
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_switch_core_session_t swig_types[0]
-#define SWIGTYPE_p_p_void swig_types[1]
-#define SWIGTYPE_p_switch_channel_t swig_types[2]
-#define SWIGTYPE_p_switch_core_session_t swig_types[3]
-#define SWIGTYPE_p_switch_file_handle_t swig_types[4]
-#define SWIGTYPE_p_switch_input_callback_function_t swig_types[5]
-#define SWIGTYPE_p_uint32_t swig_types[6]
+#define SWIGTYPE_p_switch_channel_t swig_types[0]
+#define SWIGTYPE_p_switch_file_handle_t swig_types[1]
+#define SWIGTYPE_p_switch_core_session_t swig_types[2]
+#define SWIGTYPE_p_p_switch_core_session_t swig_types[3]
+#define SWIGTYPE_p_void swig_types[4]
+#define SWIGTYPE_p_uint32_t swig_types[5]
+#define SWIGTYPE_p_switch_input_callback_function_t swig_types[6]
static swig_type_info *swig_types[8];
-static swig_module_info swig_module = {swig_types, 7, 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) -------- */
@@ -916,31 +547,9 @@
| |
+----------------------------------------------------------------------+
*/
-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
+#define SWIG_init initfreeswitch
-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"
+#define SWIG_name "freeswitch"
#ifdef __cplusplus
extern "C" {
#endif
@@ -952,6 +561,32 @@
}
#endif
+extern void fs_core_set_globals(void);
+extern int fs_core_init(char *);
+extern int fs_core_destroy(void);
+extern int fs_loadable_module_init(void);
+extern int fs_loadable_module_shutdown(void);
+extern int fs_console_loop(void);
+extern void fs_consol_log(char *,char *);
+extern void fs_consol_clean(char *);
+extern switch_core_session_t *fs_core_session_locate(char *);
+extern void fs_channel_answer(switch_core_session_t *);
+extern void fs_channel_pre_answer(switch_core_session_t *);
+extern void fs_channel_hangup(switch_core_session_t *,char *);
+extern void fs_channel_set_variable(switch_core_session_t *,char *,char *);
+extern void fs_channel_get_variable(switch_core_session_t *,char *);
+extern void fs_channel_set_state(switch_core_session_t *,char *);
+extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int);
+extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int);
+extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t);
+extern int fs_ivr_play_file2(switch_core_session_t *,char *);
+extern int fs_switch_ivr_collect_digits_callback(switch_core_session_t *,switch_input_callback_function_t,void *,unsigned int);
+extern int fs_switch_ivr_collect_digits_count(switch_core_session_t *,char *,unsigned int,unsigned int,char const *,char *,unsigned int);
+extern int fs_switch_ivr_originate(switch_core_session_t *,switch_core_session_t **,char *,uint32_t);
+extern int fs_switch_ivr_session_transfer(switch_core_session_t *,char *,char *,char *);
+extern int fs_switch_ivr_speak_text(switch_core_session_t *,char *,char *,char *,uint32_t,switch_input_callback_function_t,char *,void *,unsigned int);
+extern char *fs_switch_channel_get_variable(switch_channel_t *,char *);
+extern int fs_switch_channel_set_variable(switch_channel_t *,char *,char *);
#include "switch.h"
@@ -961,33 +596,59 @@
/* 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_consol_log,_wrap_fs_consol_log, NULL)
- ZEND_NAMED_FE(fs_consol_clean,_wrap_fs_consol_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)
- ZEND_NAMED_FE(fs_switch_ivr_record_file,_wrap_fs_switch_ivr_record_file, NULL)
- ZEND_NAMED_FE(fs_switch_ivr_sleep,_wrap_fs_switch_ivr_sleep, NULL)
- ZEND_NAMED_FE(fs_ivr_play_file2,_wrap_fs_ivr_play_file2, NULL)
- ZEND_NAMED_FE(fs_switch_ivr_collect_digits_callback,_wrap_fs_switch_ivr_collect_digits_callback, NULL)
- ZEND_NAMED_FE(fs_switch_ivr_collect_digits_count,_wrap_fs_switch_ivr_collect_digits_count, NULL)
- ZEND_NAMED_FE(fs_switch_ivr_originate,_wrap_fs_switch_ivr_originate, NULL)
- ZEND_NAMED_FE(fs_switch_ivr_session_transfer,_wrap_fs_switch_ivr_session_transfer, NULL)
- ZEND_NAMED_FE(fs_switch_ivr_speak_text,_wrap_fs_switch_ivr_speak_text, NULL)
- ZEND_NAMED_FE(fs_switch_channel_get_variable,_wrap_fs_switch_channel_get_variable, NULL)
- ZEND_NAMED_FE(fs_switch_channel_set_variable,_wrap_fs_switch_channel_set_variable, NULL)
- {NULL, NULL, NULL}
+ 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_consol_log,
+ _wrap_fs_consol_log, NULL)
+ ZEND_NAMED_FE(fs_consol_clean,
+ _wrap_fs_consol_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)
+ ZEND_NAMED_FE(fs_switch_ivr_record_file,
+ _wrap_fs_switch_ivr_record_file, NULL)
+ ZEND_NAMED_FE(fs_switch_ivr_sleep,
+ _wrap_fs_switch_ivr_sleep, NULL)
+ ZEND_NAMED_FE(fs_ivr_play_file2,
+ _wrap_fs_ivr_play_file2, NULL)
+ ZEND_NAMED_FE(fs_switch_ivr_collect_digits_callback,
+ _wrap_fs_switch_ivr_collect_digits_callback, NULL)
+ ZEND_NAMED_FE(fs_switch_ivr_collect_digits_count,
+ _wrap_fs_switch_ivr_collect_digits_count, NULL)
+ ZEND_NAMED_FE(fs_switch_ivr_originate,
+ _wrap_fs_switch_ivr_originate, NULL)
+ ZEND_NAMED_FE(fs_switch_ivr_session_transfer,
+ _wrap_fs_switch_ivr_session_transfer, NULL)
+ ZEND_NAMED_FE(fs_switch_ivr_speak_text,
+ _wrap_fs_switch_ivr_speak_text, NULL)
+ ZEND_NAMED_FE(fs_switch_channel_get_variable,
+ _wrap_fs_switch_channel_get_variable, NULL)
+ ZEND_NAMED_FE(fs_switch_channel_set_variable,
+ _wrap_fs_switch_channel_set_variable, NULL)
+ {NULL, NULL, NULL}
};
zend_module_entry freeswitch_module_entry = {
@@ -1011,1025 +672,966 @@
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
-static swig_type_info _swigt__p_p_switch_core_session_t = {"_p_p_switch_core_session_t", "switch_core_session_t **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_switch_channel_t = {"_p_switch_channel_t", "switch_channel_t *", 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_file_handle_t = {"_p_switch_file_handle_t", "switch_file_handle_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 _swigt__p_uint32_t = {"_p_uint32_t", "uint32_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_switch_channel_t[] = {{"_p_switch_channel_t", 0, "switch_channel_t *", 0},{"_p_switch_channel_t"},{0}};
+static swig_type_info _swigt__p_switch_file_handle_t[] = {{"_p_switch_file_handle_t", 0, "switch_file_handle_t *", 0},{"_p_switch_file_handle_t"},{0}};
+static swig_type_info _swigt__p_switch_core_session_t[] = {{"_p_switch_core_session_t", 0, "switch_core_session_t *", 0},{"_p_switch_core_session_t"},{0}};
+static swig_type_info _swigt__p_p_switch_core_session_t[] = {{"_p_p_switch_core_session_t", 0, "switch_core_session_t **", 0},{"_p_p_switch_core_session_t"},{0}};
+static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}};
+static swig_type_info _swigt__p_uint32_t[] = {{"_p_uint32_t", 0, "uint32_t *", 0},{"_p_uint32_t"},{0}};
+static swig_type_info _swigt__p_switch_input_callback_function_t[] = {{"_p_switch_input_callback_function_t", 0, "switch_input_callback_function_t *", 0},{"_p_switch_input_callback_function_t"},{0}};
-static swig_type_info *swig_type_initial[] = {
- &_swigt__p_p_switch_core_session_t,
- &_swigt__p_p_void,
- &_swigt__p_switch_channel_t,
- &_swigt__p_switch_core_session_t,
- &_swigt__p_switch_file_handle_t,
- &_swigt__p_switch_input_callback_function_t,
- &_swigt__p_uint32_t,
+static swig_type_info *swig_types_initial[] = {
+_swigt__p_switch_channel_t,
+_swigt__p_switch_file_handle_t,
+_swigt__p_switch_core_session_t,
+_swigt__p_p_switch_core_session_t,
+_swigt__p_void,
+_swigt__p_uint32_t,
+_swigt__p_switch_input_callback_function_t,
+0
};
-static swig_cast_info _swigc__p_p_switch_core_session_t[] = { {&_swigt__p_p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}};
-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_channel_t[] = { {&_swigt__p_switch_channel_t, 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_file_handle_t[] = { {&_swigt__p_switch_file_handle_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 _swigc__p_uint32_t[] = { {&_swigt__p_uint32_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info *swig_cast_initial[] = {
- _swigc__p_p_switch_core_session_t,
- _swigc__p_p_void,
- _swigc__p_switch_channel_t,
- _swigc__p_switch_core_session_t,
- _swigc__p_switch_file_handle_t,
- _swigc__p_switch_input_callback_function_t,
- _swigc__p_uint32_t,
-};
-
-
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
-/* end header section */
/* vdecl subsection */
static int le_swig__p_switch_channel_t=0; /* handle for */
static int le_swig__p_switch_file_handle_t=0; /* handle for */
static int le_swig__p_switch_core_session_t=0; /* handle for */
static int le_swig__p_p_switch_core_session_t=0; /* handle for */
-static int le_swig__p_p_void=0; /* handle for */
+static int le_swig__p_void=0; /* handle for */
static int le_swig__p_uint32_t=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());
+ zval **args[1];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+ fs_core_set_globals();
+
+
}
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);
- {
+ char *arg1 ;
+ int result;
+ zval **args[2];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase])));
+ arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase])));
+
+ 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();
- {
+ int result;
+ zval **args[1];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, 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();
- {
+ int result;
+ zval **args[1];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, 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();
- {
+ int result;
+ zval **args[1];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, 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();
- {
+ int result;
+ zval **args[1];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 0) || (zend_get_parameters_array_ex(0-argbase, 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_consol_log) {
- char *arg1 = (char *) 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;
- }
-
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[1]);
- arg2 = (char *) Z_STRVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- fs_consol_log(arg1,arg2);
-
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+ char *arg1 ;
+ char *arg2 ;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase])));
+ arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase])));
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+ fs_consol_log(arg1,arg2);
+
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_consol_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_consol_clean(arg1);
-
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+ char *arg1 ;
+ zval **args[2];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase])));
+ arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase])));
+
+ fs_consol_clean(arg1);
+
+
}
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);
- {
+ char *arg1 ;
+ switch_core_session_t *result;
+ zval **args[2];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
+ }
+ if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ convert_to_string_ex(((0<argbase)?(&this_ptr):(args[0-argbase])));
+ arg1 = (char *) Z_STRVAL_PP(((0<argbase)?(&this_ptr):(args[0-argbase])));
+
+ 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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ zval **args[2];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- fs_channel_answer(arg1);
-
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+ if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_channel_answer. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+ fs_channel_answer(arg1);
+
+
}
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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ zval **args[2];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- fs_channel_pre_answer(arg1);
-
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+ if(((ZEND_NUM_ARGS() + argbase )!= 1) || (zend_get_parameters_array_ex(1-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_channel_pre_answer. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+ fs_channel_pre_answer(arg1);
+
+
}
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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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());
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_channel_hangup. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+ fs_channel_hangup(arg1,arg2);
+
+
}
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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ char *arg3 ;
+ zval **args[4];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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());
+ if(((ZEND_NUM_ARGS() + argbase )!= 3) || (zend_get_parameters_array_ex(3-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_channel_set_variable. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+ fs_channel_set_variable(arg1,arg2,arg3);
+
+
}
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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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());
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_channel_get_variable. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+ fs_channel_get_variable(arg1,arg2);
+
+
}
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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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());
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_channel_set_state. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+ fs_channel_set_state(arg1,arg2);
+
+
}
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");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ char *arg3 ;
+ switch_input_callback_function_t arg4 ;
+ void *arg5 = (void *) 0 ;
+ unsigned int arg6 ;
+ int result;
+ zval **args[7];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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");
+ if(((ZEND_NUM_ARGS() + argbase )!= 6) || (zend_get_parameters_array_ex(6-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- 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");
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
}
- }
- {
- /*@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);
- {
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+ {
+ switch_input_callback_function_t * argp;
+ if(SWIG_ConvertPtr(*args[3-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 4-argbase, SWIGTYPE_p_switch_input_callback_function_t->name);
+ }
+ arg4 = *argp;
+ }
+
+ if(SWIG_ConvertPtr(*args[4-argbase], (void **) &arg5, 0) < 0) {
+ /* Allow NULL from php for void* */
+ if ((*args[4-argbase])->type==IS_NULL) arg5=0;
+ else zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file. Expected %s", 5-argbase, SWIGTYPE_p_void->name);
+ }
+
+
+ convert_to_long_ex(args[5-argbase]);
+ arg6 = (unsigned int) Z_LVAL_PP(args[5-argbase]);
+
+ result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_record_file) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- switch_file_handle_t *arg2 = (switch_file_handle_t *) 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_switch_ivr_record_file. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ;
+ char *arg3 ;
+ switch_input_callback_function_t arg4 ;
+ void *arg5 = (void *) 0 ;
+ unsigned int arg6 ;
+ int result;
+ zval **args[7];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /* typemap(in) SWIGTYPE * */
- if(SWIG_ConvertPtr(*args[1], (void **) &arg2, SWIGTYPE_p_switch_file_handle_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_record_file. Expected SWIGTYPE_p_switch_file_handle_t");
+ if(((ZEND_NUM_ARGS() + argbase )!= 6) || (zend_get_parameters_array_ex(6-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- }
- {
- /*@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_switch_ivr_record_file. Expected SWIGTYPE_p_switch_input_callback_function_t");
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_record_file. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
}
- 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_switch_ivr_record_file. Expected SWIGTYPE_p_p_void");
+
+
+ if(SWIG_ConvertPtr(*args[1-argbase], (void **) &arg2, SWIGTYPE_p_switch_file_handle_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_record_file. Expected %s", 2-argbase, SWIGTYPE_p_switch_file_handle_t->name);
}
- }
- {
- /*@SWIG:CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (unsigned int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- }
- result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6);
- {
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+ {
+ switch_input_callback_function_t * argp;
+ if(SWIG_ConvertPtr(*args[3-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_record_file. Expected %s", 4-argbase, SWIGTYPE_p_switch_input_callback_function_t->name);
+ }
+ arg4 = *argp;
+ }
+
+ if(SWIG_ConvertPtr(*args[4-argbase], (void **) &arg5, 0) < 0) {
+ /* Allow NULL from php for void* */
+ if ((*args[4-argbase])->type==IS_NULL) arg5=0;
+ else zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_record_file. Expected %s", 5-argbase, SWIGTYPE_p_void->name);
+ }
+
+
+ convert_to_long_ex(args[5-argbase]);
+ arg6 = (unsigned int) Z_LVAL_PP(args[5-argbase]);
+
+ result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_sleep) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- uint32_t arg2 ;
- int result;
- uint32_t *tmp2 ;
- 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_switch_ivr_sleep. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ uint32_t arg2 ;
+ int result;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- if(SWIG_ConvertPtr(*args[1], (void **) &tmp2, SWIGTYPE_p_uint32_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_sleep. Expected SWIGTYPE_p_uint32_t");
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- arg2 = *tmp2;
- }
- result = (int)fs_switch_ivr_sleep(arg1,arg2);
- {
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_sleep. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+ {
+ uint32_t * argp;
+ if(SWIG_ConvertPtr(*args[1-argbase], (void **) &argp, SWIGTYPE_p_uint32_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_sleep. Expected %s", 2-argbase, SWIGTYPE_p_uint32_t->name);
+ }
+ arg2 = *argp;
+ }
+ result = (int)fs_switch_ivr_sleep(arg1,arg2);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file2) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- char *arg2 = (char *) 0 ;
- int result;
- 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_ivr_play_file2. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ int result;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[1]);
- arg2 = (char *) Z_STRVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- result = (int)fs_ivr_play_file2(arg1,arg2);
- {
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_ivr_play_file2. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+ result = (int)fs_ivr_play_file2(arg1,arg2);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_callback) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- switch_input_callback_function_t arg2 ;
- void *arg3 = (void *) 0 ;
- unsigned int arg4 ;
- int result;
- switch_input_callback_function_t *tmp2 ;
- zval **args[4];
-
- SWIG_ResetError();
- if(((ZEND_NUM_ARGS() )!= 4) || (zend_get_parameters_array_ex(4, 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_switch_ivr_collect_digits_callback. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ switch_input_callback_function_t arg2 ;
+ void *arg3 = (void *) 0 ;
+ unsigned int arg4 ;
+ int result;
+ zval **args[5];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- if(SWIG_ConvertPtr(*args[1], (void **) &tmp2, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_collect_digits_callback. Expected SWIGTYPE_p_switch_input_callback_function_t");
+ if(((ZEND_NUM_ARGS() + argbase )!= 4) || (zend_get_parameters_array_ex(4-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- arg2 = *tmp2;
- }
- {
- if(SWIG_ConvertPtr(*args[2], (void **) &arg3, 0, 0) < 0) {
- /* Allow NULL from php for void* */
- if ((*args[2])->type==IS_NULL) arg3=0;
- else
- SWIG_PHP_Error(E_ERROR, "Type error in argument 3 of fs_switch_ivr_collect_digits_callback. Expected SWIGTYPE_p_p_void");
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_collect_digits_callback. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
}
- }
- {
- /*@SWIG:CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (unsigned int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- }
- result = (int)fs_switch_ivr_collect_digits_callback(arg1,arg2,arg3,arg4);
- {
+
+ {
+ switch_input_callback_function_t * argp;
+ if(SWIG_ConvertPtr(*args[1-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_collect_digits_callback. Expected %s", 2-argbase, SWIGTYPE_p_switch_input_callback_function_t->name);
+ }
+ arg2 = *argp;
+ }
+
+ if(SWIG_ConvertPtr(*args[2-argbase], (void **) &arg3, 0) < 0) {
+ /* Allow NULL from php for void* */
+ if ((*args[2-argbase])->type==IS_NULL) arg3=0;
+ else zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_collect_digits_callback. Expected %s", 3-argbase, SWIGTYPE_p_void->name);
+ }
+
+
+ convert_to_long_ex(args[3-argbase]);
+ arg4 = (unsigned int) Z_LVAL_PP(args[3-argbase]);
+
+ result = (int)fs_switch_ivr_collect_digits_callback(arg1,arg2,arg3,arg4);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_count) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- char *arg2 = (char *) 0 ;
- unsigned int arg3 ;
- unsigned int arg4 ;
- char *arg5 = (char *) 0 ;
- char *arg6 = (char *) 0 ;
- unsigned int arg7 ;
- int result;
- zval **args[7];
-
- SWIG_ResetError();
- if(((ZEND_NUM_ARGS() )!= 7) || (zend_get_parameters_array_ex(7, 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_switch_ivr_collect_digits_count. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ unsigned int arg3 ;
+ unsigned int arg4 ;
+ char *arg5 ;
+ char *arg6 ;
+ unsigned int arg7 ;
+ int result;
+ zval **args[8];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[1]);
- arg2 = (char *) Z_STRVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- {
- /*@SWIG:CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (unsigned int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- }
- {
- /*@SWIG:CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (unsigned int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[4]);
- arg5 = (char *) Z_STRVAL_PP(args[4]);
- /*@SWIG@*/;
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[5]);
- arg6 = (char *) Z_STRVAL_PP(args[5]);
- /*@SWIG@*/;
- }
- {
- /*@SWIG:CONVERT_INT_IN@*/
- convert_to_long_ex(args[6]);
- arg7 = (unsigned int) Z_LVAL_PP(args[6]);
- /*@SWIG@*/;
- }
- result = (int)fs_switch_ivr_collect_digits_count(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7);
- {
+ if(((ZEND_NUM_ARGS() + argbase )!= 7) || (zend_get_parameters_array_ex(7-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_collect_digits_count. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+
+ convert_to_long_ex(args[2-argbase]);
+ arg3 = (unsigned int) Z_LVAL_PP(args[2-argbase]);
+
+
+ convert_to_long_ex(args[3-argbase]);
+ arg4 = (unsigned int) Z_LVAL_PP(args[3-argbase]);
+
+
+ convert_to_string_ex(args[4-argbase]);
+ arg5 = (char *) Z_STRVAL_PP(args[4-argbase]);
+
+
+ convert_to_string_ex(args[5-argbase]);
+ arg6 = (char *) Z_STRVAL_PP(args[5-argbase]);
+
+
+ convert_to_long_ex(args[6-argbase]);
+ arg7 = (unsigned int) Z_LVAL_PP(args[6-argbase]);
+
+ result = (int)fs_switch_ivr_collect_digits_count(arg1,arg2,arg3,arg4,(char const *)arg5,arg6,arg7);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_originate) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
- char *arg3 = (char *) 0 ;
- uint32_t arg4 ;
- int result;
- uint32_t *tmp4 ;
- zval **args[4];
-
- SWIG_ResetError();
- if(((ZEND_NUM_ARGS() )!= 4) || (zend_get_parameters_array_ex(4, 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_switch_ivr_originate. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
+ char *arg3 ;
+ uint32_t arg4 ;
+ int result;
+ zval **args[5];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /* typemap(in) SWIGTYPE * */
- if(SWIG_ConvertPtr(*args[1], (void **) &arg2, SWIGTYPE_p_p_switch_core_session_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of fs_switch_ivr_originate. Expected SWIGTYPE_p_p_switch_core_session_t");
+ if(((ZEND_NUM_ARGS() + argbase )!= 4) || (zend_get_parameters_array_ex(4-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- }
- {
- /*@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_uint32_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 4 of fs_switch_ivr_originate. Expected SWIGTYPE_p_uint32_t");
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_originate. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
}
- arg4 = *tmp4;
- }
- result = (int)fs_switch_ivr_originate(arg1,arg2,arg3,arg4);
- {
+
+
+ if(SWIG_ConvertPtr(*args[1-argbase], (void **) &arg2, SWIGTYPE_p_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_originate. Expected %s", 2-argbase, SWIGTYPE_p_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+ {
+ uint32_t * argp;
+ if(SWIG_ConvertPtr(*args[3-argbase], (void **) &argp, SWIGTYPE_p_uint32_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_originate. Expected %s", 4-argbase, SWIGTYPE_p_uint32_t->name);
+ }
+ arg4 = *argp;
+ }
+ result = (int)fs_switch_ivr_originate(arg1,arg2,arg3,arg4);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_session_transfer) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
- char *arg4 = (char *) 0 ;
- int result;
- zval **args[4];
-
- SWIG_ResetError();
- if(((ZEND_NUM_ARGS() )!= 4) || (zend_get_parameters_array_ex(4, 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_switch_ivr_session_transfer. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ char *arg3 ;
+ char *arg4 ;
+ int result;
+ zval **args[5];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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@*/;
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[3]);
- arg4 = (char *) Z_STRVAL_PP(args[3]);
- /*@SWIG@*/;
- }
- result = (int)fs_switch_ivr_session_transfer(arg1,arg2,arg3,arg4);
- {
+ if(((ZEND_NUM_ARGS() + argbase )!= 4) || (zend_get_parameters_array_ex(4-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_session_transfer. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+
+ convert_to_string_ex(args[3-argbase]);
+ arg4 = (char *) Z_STRVAL_PP(args[3-argbase]);
+
+ result = (int)fs_switch_ivr_session_transfer(arg1,arg2,arg3,arg4);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_speak_text) {
- switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
- char *arg4 = (char *) 0 ;
- uint32_t arg5 ;
- switch_input_callback_function_t arg6 ;
- char *arg7 = (char *) 0 ;
- void *arg8 = (void *) 0 ;
- unsigned int arg9 ;
- int result;
- uint32_t *tmp5 ;
- switch_input_callback_function_t *tmp6 ;
- zval **args[9];
-
- SWIG_ResetError();
- if(((ZEND_NUM_ARGS() )!= 9) || (zend_get_parameters_array_ex(9, 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_switch_ivr_speak_text. Expected SWIGTYPE_p_switch_core_session_t");
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ char *arg2 ;
+ char *arg3 ;
+ char *arg4 ;
+ uint32_t arg5 ;
+ switch_input_callback_function_t arg6 ;
+ char *arg7 ;
+ void *arg8 = (void *) 0 ;
+ unsigned int arg9 ;
+ int result;
+ zval **args[10];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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@*/;
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[3]);
- arg4 = (char *) Z_STRVAL_PP(args[3]);
- /*@SWIG@*/;
- }
- {
- if(SWIG_ConvertPtr(*args[4], (void **) &tmp5, SWIGTYPE_p_uint32_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 5 of fs_switch_ivr_speak_text. Expected SWIGTYPE_p_uint32_t");
+ if(((ZEND_NUM_ARGS() + argbase )!= 9) || (zend_get_parameters_array_ex(9-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- arg5 = *tmp5;
- }
- {
- if(SWIG_ConvertPtr(*args[5], (void **) &tmp6, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 6 of fs_switch_ivr_speak_text. Expected SWIGTYPE_p_switch_input_callback_function_t");
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_core_session_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 1-argbase, SWIGTYPE_p_switch_core_session_t->name);
}
- arg6 = *tmp6;
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[6]);
- arg7 = (char *) Z_STRVAL_PP(args[6]);
- /*@SWIG@*/;
- }
- {
- if(SWIG_ConvertPtr(*args[7], (void **) &arg8, 0, 0) < 0) {
- /* Allow NULL from php for void* */
- if ((*args[7])->type==IS_NULL) arg8=0;
- else
- SWIG_PHP_Error(E_ERROR, "Type error in argument 8 of fs_switch_ivr_speak_text. Expected SWIGTYPE_p_p_void");
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+
+ convert_to_string_ex(args[3-argbase]);
+ arg4 = (char *) Z_STRVAL_PP(args[3-argbase]);
+
+ {
+ uint32_t * argp;
+ if(SWIG_ConvertPtr(*args[4-argbase], (void **) &argp, SWIGTYPE_p_uint32_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 5-argbase, SWIGTYPE_p_uint32_t->name);
+ }
+ arg5 = *argp;
}
- }
- {
- /*@SWIG:CONVERT_INT_IN@*/
- convert_to_long_ex(args[8]);
- arg9 = (unsigned int) Z_LVAL_PP(args[8]);
- /*@SWIG@*/;
- }
- result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
- {
+ {
+ switch_input_callback_function_t * argp;
+ if(SWIG_ConvertPtr(*args[5-argbase], (void **) &argp, SWIGTYPE_p_switch_input_callback_function_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 6-argbase, SWIGTYPE_p_switch_input_callback_function_t->name);
+ }
+ arg6 = *argp;
+ }
+
+ convert_to_string_ex(args[6-argbase]);
+ arg7 = (char *) Z_STRVAL_PP(args[6-argbase]);
+
+
+ if(SWIG_ConvertPtr(*args[7-argbase], (void **) &arg8, 0) < 0) {
+ /* Allow NULL from php for void* */
+ if ((*args[7-argbase])->type==IS_NULL) arg8=0;
+ else zend_error(E_ERROR, "Type error in argument %d of fs_switch_ivr_speak_text. Expected %s", 8-argbase, SWIGTYPE_p_void->name);
+ }
+
+
+ convert_to_long_ex(args[8-argbase]);
+ arg9 = (unsigned int) Z_LVAL_PP(args[8-argbase]);
+
+ result = (int)fs_switch_ivr_speak_text(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_get_variable) {
- switch_channel_t *arg1 = (switch_channel_t *) 0 ;
- char *arg2 = (char *) 0 ;
- char *result = 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_channel_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_switch_channel_get_variable. Expected SWIGTYPE_p_switch_channel_t");
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 ;
+ char *result;
+ zval **args[3];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[1]);
- arg2 = (char *) Z_STRVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- result = (char *)fs_switch_channel_get_variable(arg1,arg2);
- {
- if(!result) {
- ZVAL_NULL(return_value);
- } else {
- ZVAL_STRING(return_value,result, 1);
+ if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
}
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_channel_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_channel_get_variable. Expected %s", 1-argbase, SWIGTYPE_p_switch_channel_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+ result = (char *)fs_switch_channel_get_variable(arg1,arg2);
+
+
+ ZVAL_STRING(return_value,result, 1);
+
}
ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable) {
- switch_channel_t *arg1 = (switch_channel_t *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
- int result;
- 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_channel_t, 0) < 0) {
- SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_switch_channel_set_variable. Expected SWIGTYPE_p_switch_channel_t");
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 ;
+ char *arg3 ;
+ int result;
+ zval **args[4];
+ int argbase=0 ;
+
+ if (this_ptr && this_ptr->type==IS_OBJECT) {
+ /* fake this_ptr as first arg (till we can work out how to do it better */
+ argbase++;
}
- }
- {
- /*@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@*/;
- }
- result = (int)fs_switch_channel_set_variable(arg1,arg2,arg3);
- {
+ if(((ZEND_NUM_ARGS() + argbase )!= 3) || (zend_get_parameters_array_ex(3-argbase, args)!= SUCCESS)) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ if(SWIG_ConvertPtr(*((0<argbase)?(&this_ptr):(args[0-argbase])), (void **) &arg1, SWIGTYPE_p_switch_channel_t) < 0) {
+ zend_error(E_ERROR, "Type error in argument %d of fs_switch_channel_set_variable. Expected %s", 1-argbase, SWIGTYPE_p_switch_channel_t->name);
+ }
+
+
+ convert_to_string_ex(args[1-argbase]);
+ arg2 = (char *) Z_STRVAL_PP(args[1-argbase]);
+
+
+ convert_to_string_ex(args[2-argbase]);
+ arg3 = (char *) Z_STRVAL_PP(args[2-argbase]);
+
+ result = (int)fs_switch_channel_set_variable(arg1,arg2,arg3);
+
+
ZVAL_LONG(return_value,result);
- }
- return;
-fail:
- zend_error(ErrorCode(),ErrorMsg());
+
}
/* NEW Destructor style */
static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_channel_t) {
- /* bah! No destructor for this simple type!! */
+/* bah! No destructor for this simple type!! */
}
/* NEW Destructor style */
static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_file_handle_t) {
- /* bah! No destructor for this simple type!! */
+/* bah! No destructor for this simple type!! */
}
/* NEW Destructor style */
static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_core_session_t) {
- /* bah! No destructor for this simple type!! */
+/* bah! No destructor for this simple type!! */
}
/* NEW Destructor style */
static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_p_switch_core_session_t) {
- /* bah! No destructor for this simple type!! */
+/* 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!! */
+static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_void) {
+/* bah! No destructor for this simple type!! */
}
/* NEW Destructor style */
static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_uint32_t) {
- /* bah! No destructor for this simple type!! */
+/* 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!! */
+/* bah! No destructor for this simple type!! */
}
+
+
+
+
/* end wrapper section */
/* init section */
#ifdef __cplusplus
@@ -2040,224 +1642,17 @@
}
#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
+PHP_MSHUTDOWN_FUNCTION(freeswitch)
+{
+ return SUCCESS;
}
-
-/* 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;
- }
+PHP_MINIT_FUNCTION(freeswitch)
+{
+ int i;
+ for (i = 0; swig_types_initial[i]; i++) {
+ swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]);
}
- }
-}
-
-#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_channel_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_channel_t,NULL,(char *)(SWIGTYPE_p_switch_channel_t->name),module_number);
@@ -2268,8 +1663,8 @@
SWIG_TypeClientData(SWIGTYPE_p_switch_core_session_t,&le_swig__p_switch_core_session_t);
le_swig__p_p_switch_core_session_t=zend_register_list_destructors_ex(_wrap_destroy_p_p_switch_core_session_t,NULL,(char *)(SWIGTYPE_p_p_switch_core_session_t->name),module_number);
SWIG_TypeClientData(SWIGTYPE_p_p_switch_core_session_t,&le_swig__p_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_void=zend_register_list_destructors_ex(_wrap_destroy_p_void,NULL,(char *)(SWIGTYPE_p_void->name),module_number);
+SWIG_TypeClientData(SWIGTYPE_p_void,&le_swig__p_void);
le_swig__p_uint32_t=zend_register_list_destructors_ex(_wrap_destroy_p_uint32_t,NULL,(char *)(SWIGTYPE_p_uint32_t->name),module_number);
SWIG_TypeClientData(SWIGTYPE_p_uint32_t,&le_swig__p_uint32_t);
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);
@@ -2281,8 +1676,6 @@
}
PHP_RINIT_FUNCTION(freeswitch)
{
-/* rinit section */
-
/* cinit subsection */
/* end cinit subsection */
@@ -2291,16 +1684,8 @@
return SUCCESS;
}
-PHP_MSHUTDOWN_FUNCTION(freeswitch)
-{
-/* shutdown section */
-
- return SUCCESS;
-}
PHP_RSHUTDOWN_FUNCTION(freeswitch)
{
-/* rshutdown section */
-
return SUCCESS;
}
PHP_MINFO_FUNCTION(freeswitch)
1
0
Author: mikej
Date: Tue Sep 12 00:02:13 2006
New Revision: 2654
Modified:
freeswitch/trunk/src/mod/languages/mod_php/Makefile
Log:
set -fno-strict-aliasing on mod_php for gcc. we really need to not be doing this, but this is because of an issue in the php header files. Please note, the affects our ability to do any real optimization on this module. The best details I found on this issue are at: http://www.opensolaris.org/jive/thread.jspa?threadID=1923&tstart=0 .
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 Tue Sep 12 00:02:13 2006
@@ -2,7 +2,8 @@
PCFG=$(PREFIX)/bin/php-config
LCFLAGS=-fPIC -DZTS -DPTHREADS
-CFLAGS += `$(PCFG) --includes` -g3
+# we should NOT use -fno-strict-aliasing. we need to fix this issue, but it is an issue in the php header files. we need to be careful of the optimization level on this module becuase of this setting.
+CFLAGS += `$(PCFG) --includes` -g3 -fno-strict-aliasing
MDIR += `$(PCFG) --extension-dir`
PHPMOD=freeswitch
PHPLDFLAGS = `$(PCFG) --ldflags` -lcrypt -lresolv -lm -ldl -lnsl -lxml2 -lz -lphp5
1
0
Author: mikej
Date: Mon Sep 11 23:20:56 2006
New Revision: 2652
Modified:
freeswitch/trunk/src/mod/languages/mod_php/mod_php.c
Log:
windows warnings fixes and formatting for mod_php.c
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 Mon Sep 11 23:20:56 2006
@@ -32,7 +32,6 @@
*
*/
-
#ifndef _REENTRANT
#define _REENTRANT
#endif
@@ -41,143 +40,150 @@
#define _GNU_SOURCE
#endif
+#ifdef _MSC_VER
+//disable warnings for malformed header files
+#pragma warning(push)
+#pragma warning(disable:4127 4311 4133 4244 4201)
+#define _USE_32BIT_TIME_T 1
+#endif
+
#include <sapi/embed/php_embed.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#ifdef ZTS
- zend_compiler_globals *compiler_globals;
- zend_executor_globals *executor_globals;
- php_core_globals *core_globals;
- sapi_globals_struct *sapi_globals;
+ zend_compiler_globals *compiler_globals;
+ zend_executor_globals *executor_globals;
+ php_core_globals *core_globals;
+ sapi_globals_struct *sapi_globals;
#endif
-
#include <switch.h>
const char modname[] = "mod_php";
static int sapi_mod_php_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
{
-
- FILE *fp = fopen("mod_php.log", "a");
- fwrite(str, str_length, sizeof(char), fp);
- fclose(fp);
-
-
- char buffer[4096];
- int i, j = 0;
- for(i = 0; i < str_length; i++) {
- buffer[j++] = str[i];
- if(str[i] == 10) { /* new line */
- buffer[j] = 0;
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
- j = 0;
- }
- else if(str[i] == 0) { /* null character */
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
- j = 0;
- }
- if(j == 4095) { /* don't overfill buffer */
- buffer[j] = 0;
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
- j = 0;
- }
- }
- if(j) { /* stuff left over */
- buffer[j] = 0;
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
- }
- return str_length;
+ char buffer[4096];
+ unsigned int i;
+ int j = 0;
+ FILE *fp = fopen("mod_php.log", "a");
+ fwrite(str, str_length, sizeof(char), fp);
+ fclose(fp);
+ for(i = 0; i < str_length; i++) {
+ buffer[j++] = str[i];
+ if(str[i] == 10) { /* new line */
+ buffer[j] = 0;
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
+ j = 0;
+ }
+ else if(str[i] == 0) { /* null character */
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
+ j = 0;
+ }
+ if(j == 4095) { /* don't overfill buffer */
+ buffer[j] = 0;
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
+ j = 0;
+ }
+ }
+ if(j) { /* stuff left over */
+ buffer[j] = 0;
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s", buffer);
+ }
+ return str_length;
}
void mod_php_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();
+ char *buffer;
+ int buffer_len;
+ TSRMLS_FETCH();
- buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args);
+ buffer_len = vspprintf(&buffer, PG(log_errors_max_len), format, args);
- if((EG(error_reporting) & type || (type & E_CORE)) && (PG(log_errors) || PG(display_errors))) {
- char *error_type_str;
+ 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;
- }
+ 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;
- 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(log_errors)) {
+ char *log_buffer;
+ 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_LOG, SWITCH_LOG_NOTICE, error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string));
- }
- }
+ 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_LOG, SWITCH_LOG_NOTICE, error_format, STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, 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_NOTICE, "\nPHP: %s exiting\n", error_filename);
- EG(exit_status) = 255;
+ // 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_NOTICE, "\nPHP: %s exiting\n", error_filename);
+ EG(exit_status) = 255;
#if MEMORY_LIMIT
- // restore memory limit
- AG(memory_limit) = PG(memory_limit);
+ // restore memory limit
+ AG(memory_limit) = PG(memory_limit);
#endif
- efree(buffer);
- zend_bailout();
- return;
+ efree(buffer);
+ zend_bailout();
+ return;
+ }
- }
+ // Log if necessary
+ if(PG(track_errors) && EG(active_symbol_table)) {
+ pval *tmp;
- // 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);
+ 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 mod_php_log_message(char *message)
{
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", message);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", message);
}
typedef void (*sapi_error_function_t)(int type, const char *error_msg, ...);
@@ -186,67 +192,66 @@
static void php_function(switch_core_session_t *session, char *data)
{
- char *uuid = switch_core_session_get_uuid(session);
- uint32_t ulen = strlen(uuid);
- uint32_t len = strlen((char *) data) + ulen + 2;
- char *mydata = switch_core_session_alloc(session, len);
- int argc, retval;
- char *argv[5];
- char php_code[1024];
- void*** tsrm_ls = NULL;
+ char *uuid = switch_core_session_get_uuid(session);
+ size_t ulen = strlen(uuid);
+ size_t len = strlen((char *) data) + ulen + 2;
+ char *mydata = switch_core_session_alloc(session, len);
+ int argc, retval;
+ char *argv[5];
+ char php_code[1024];
+ void*** tsrm_ls = NULL;
+ zend_file_handle script;
+ zval *php_uuid;
- snprintf(mydata, len, "%s %s", uuid, data);
+ snprintf(mydata, len, "%s %s", uuid, data);
- argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0])));
+ argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0])));
- sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]);
- //sprintf(php_code, "include('%s');", argv[1]);
-
+ sprintf(php_code, "uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]);
+
sprintf(php_code, "%s %s", data, uuid);
- zend_file_handle script;
- script.type = ZEND_HANDLE_FP;
- script.filename = data;
- script.opened_path = NULL;
- script.free_filename = 0;
- script.handle.fp = fopen(script.filename, "rb");
+ script.type = ZEND_HANDLE_FP;
+ script.filename = data;
+ script.opened_path = NULL;
+ script.free_filename = 0;
+ script.handle.fp = fopen(script.filename, "rb");
// Initialize PHPs CORE
php_embed_init(argc, argv, &tsrm_ls);
// Return All of the DEBUG crap to the console and/or a log file
- php_embed_module.ub_write = sapi_mod_php_ub_write;
- php_embed_module.log_message = mod_php_log_message;
- php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler;
+ php_embed_module.ub_write = sapi_mod_php_ub_write;
+ php_embed_module.log_message = mod_php_log_message;
+ php_embed_module.sapi_error = (sapi_error_function_t)mod_php_error_handler;
// Let the nice people know we are about to start their script
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting Script %s\n",data);
// Force $uuid and $session to exist in PHPs memory space
- zval *php_uuid;
MAKE_STD_ZVAL(php_uuid);
- //MAKE_STD_ZVAL(php_session);
- //php_uuid->type = IS_STRING;
- //php_uuid->value.str.len = strlen(uuid);
- //php_uuid->value.str.val = estrdup(uuid);
+
+#ifdef _MSC_VER
+//disable warnings for malformed macros from header files
+#pragma warning(push)
+#pragma warning(disable:4127 4267)
+#endif
+
ZVAL_STRING(php_uuid, uuid , 1);
- //ZVAL_STRING(php_session, session , 1);
ZEND_SET_SYMBOL(&EG(symbol_table), "uuid", php_uuid);
- //ZEND_SET_SYMBOL(&EG(active_symbol_table), "session", php_session);
- // Force Some INI entries weather the user likes it or not
- //zend_alter_ini_entry("register_globals", strlen("register_globals")+1, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
// Execute the bloody script
- retval = php_execute_script(&script TSRMLS_CC);
+ retval = php_execute_script(&script TSRMLS_CC);
// Clean up after PHP and such
- php_embed_shutdown(tsrm_ls);
+ php_embed_shutdown(tsrm_ls);
-
-
// Return back to the Dialplan
-
+
// Buh bye now!
}
@@ -270,13 +275,11 @@
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename)
{
-void*** tsrm_ls = NULL;
+ void*** tsrm_ls = NULL;
- /* connect my internal structure to the blank pointer passed to me */
- *module_interface = &php_module_interface;
+ /* 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");
-
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
compiler_globals = ts_resource(compiler_globals_id);
@@ -286,8 +289,8 @@
tsrm_ls = ts_resource(0);
#endif
- /* indicate that the module should continue to be loaded */
- return SWITCH_STATUS_SUCCESS;
+ /* indicate that the module should continue to be loaded */
+ return SWITCH_STATUS_SUCCESS;
}
/*
@@ -297,13 +300,10 @@
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;
}
-
*/
1
0
Author: docelmo
Date: Mon Sep 11 23:18:39 2006
New Revision: 2651
Modified:
freeswitch/trunk/src/mod/languages/mod_php/Makefile
freeswitch/trunk/src/mod/languages/mod_php/php.ini
Log:
Updates working on crash
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 Mon Sep 11 23:18:39 2006
@@ -37,8 +37,9 @@
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
install:
- mkdir -p $(MDIR)
- cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR)
+ #mkdir -p $(MDIR)
+ #cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR)
+ cp -f php_$(PHPMOD).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/lib/php/extensions
cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
cp -f $(PHPMOD).php $(PREFIX)/lib/php
cp -f classFreeswitch.php $(PREFIX)/lib/php
Modified: freeswitch/trunk/src/mod/languages/mod_php/php.ini
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/php.ini (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/php.ini Mon Sep 11 23:18:39 2006
@@ -526,7 +526,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
-extension_dir = "./"
+extension_dir = "../lib/php/extensions/"
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
1
0
Author: mikej
Date: Mon Sep 11 23:14:52 2006
New Revision: 2649
Modified:
freeswitch/trunk/src/include/switch_platform.h
Log:
use our inline macro, really
Modified: freeswitch/trunk/src/include/switch_platform.h
==============================================================================
--- freeswitch/trunk/src/include/switch_platform.h (original)
+++ freeswitch/trunk/src/include/switch_platform.h Mon Sep 11 23:14:52 2006
@@ -75,6 +75,7 @@
#endif
#endif
+#undef inline
#define inline __inline
#ifndef uint32_t
1
0
Author: mikej
Date: Mon Sep 11 21:41:23 2006
New Revision: 2648
Modified:
freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c
Log:
make globals.fd size int
Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Sep 11 21:41:23 2006
@@ -75,7 +75,7 @@
char *codec_rates[SWITCH_MAX_CODECS];
int codec_rates_last;
unsigned int flags;
- switch_port_t fd;
+ int fd;
} globals;
struct private_object {
1
0
[commit] r2647 - in freeswitch/trunk/src: . include mod/applications/mod_bridgecall mod/applications/mod_commands mod/applications/mod_conference mod/languages/mod_spidermonkey
by Freeswitch SVN 12 Sep '06
by Freeswitch SVN 12 Sep '06
12 Sep '06
Author: anthm
Date: Mon Sep 11 21:32:04 2006
New Revision: 2647
Modified:
freeswitch/trunk/src/include/switch_ivr.h
freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c
freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
freeswitch/trunk/src/switch_ivr.c
Log:
pass cause from originate
Modified: freeswitch/trunk/src/include/switch_ivr.h
==============================================================================
--- freeswitch/trunk/src/include/switch_ivr.h (original)
+++ freeswitch/trunk/src/include/switch_ivr.h Mon Sep 11 21:32:04 2006
@@ -189,6 +189,7 @@
\brief Make an outgoing call
\param session originating session
\param bleg B leg session
+ \param cause a pointer to hold call cause
\param bridgeto the desired remote callstring
\param timelimit_sec timeout in seconds for outgoing call
\param table optional state handler table to install on the channel
@@ -199,6 +200,7 @@
*/
SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *session,
switch_core_session_t **bleg,
+ switch_call_cause_t *cause,
char *bridgeto,
uint32_t timelimit_sec,
const switch_state_handler_table_t *table,
Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Mon Sep 11 21:32:04 2006
@@ -42,6 +42,7 @@
switch_core_session_t *peer_session;
unsigned int timelimit = 60;
char *var;
+ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
caller_channel = switch_core_session_get_channel(session);
assert(caller_channel != NULL);
@@ -50,7 +51,7 @@
timelimit = atoi(var);
}
- if (switch_ivr_originate(session, &peer_session, data, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
+ if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
return;
Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Sep 11 21:32:04 2006
@@ -217,7 +217,7 @@
int x, argc = 0;
char *aleg, *exten, *dp, *context, *cid_name, *cid_num;
uint32_t timeout = 60;
-
+ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
if (isession) {
stream->write_function(stream, "Illegal Usage\n");
return SWITCH_STATUS_SUCCESS;
@@ -260,7 +260,7 @@
return SWITCH_STATUS_SUCCESS;
}
- if (switch_ivr_originate(NULL, &caller_session, aleg, timeout, &noop_state_handler, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) {
+ if (switch_ivr_originate(NULL, &caller_session, &cause, aleg, timeout, &noop_state_handler, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "Cannot Create Outgoing Channel! [%s]\n", aleg);
return SWITCH_STATUS_SUCCESS;
}
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 Mon Sep 11 21:32:04 2006
@@ -2044,13 +2044,21 @@
switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_channel_t *caller_channel = NULL;
char appdata[512];
+ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-
- if (switch_ivr_originate(session, &peer_session, bridgeto, timeout, &audio_bridge_peer_state_handlers, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) {
+ if (switch_ivr_originate(session,
+ &peer_session,
+ &cause,
+ bridgeto,
+ timeout,
+ &audio_bridge_peer_state_handlers,
+ cid_name,
+ cid_num,
+ NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
if (session) {
caller_channel = switch_core_session_get_channel(session);
- switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
+ switch_channel_hangup(caller_channel, cause);
}
goto done;
}
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Sep 11 21:32:04 2006
@@ -1390,6 +1390,7 @@
{
switch_memory_pool_t *pool = NULL;
if (argc > 1) {
+ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
struct js_session *jss = NULL;
JSObject *session_obj;
switch_core_session_t *session = NULL, *peer_session = NULL;
@@ -1471,7 +1472,7 @@
context,
dest);
- if (switch_ivr_originate(session, &peer_session, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) {
+ if (switch_ivr_originate(session, &peer_session, &cause, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest);
return JS_TRUE;
}
Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c (original)
+++ freeswitch/trunk/src/switch_ivr.c Mon Sep 11 21:32:04 2006
@@ -1534,6 +1534,7 @@
#define MAX_PEERS 256
SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *session,
switch_core_session_t **bleg,
+ switch_call_cause_t *cause,
char *bridgeto,
uint32_t timelimit_sec,
const switch_state_handler_table_t *table,
@@ -1849,6 +1850,11 @@
done:
+ if (caller_channel) {
+ *cause = switch_channel_get_cause(caller_channel);
+ } else {
+ *cause = SWITCH_CAUSE_CHANNEL_UNACCEPTABLE;
+ }
if (odata) {
free(odata);
}
1
0
Author: docelmo
Date: Mon Sep 11 21:23:53 2006
New Revision: 2646
Added:
freeswitch/trunk/src/mod/languages/mod_php/php.ini
Modified:
freeswitch/trunk/src/mod/languages/mod_php/Makefile
freeswitch/trunk/src/mod/languages/mod_php/mod_php.c
freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c
freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c
Log:
PHP Goes Beta
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 Mon Sep 11 21:23:53 2006
@@ -10,7 +10,7 @@
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN)
depends:
- MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-mysql --with-curl --enable-maintainer-zts --with-tsrm-pthreads
+ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-mysql --with-curl --enable-maintainer-zts --with-tsrm-pthreads --enable-debug
%.o: %.c
$(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@
@@ -45,3 +45,4 @@
cp -f freeswitch.php $(PREFIX)/lib/php
cp -f apptest.php $(PREFIX)/scripts
cp -f test.php $(PREFIX)/scripts
+ cp -f php.ini $(PREFIX)/lib
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 Mon Sep 11 21:23:53 2006
@@ -25,7 +25,9 @@
*
* Anthony Minessale II <anthmct(a)yahoo.com>
* Brian Fertig <brian.fertig(a)convergencetek.com>
+ * Steph Fox <steph(a)zend.com>
*
+ *
* mod_php.c -- PHP Module
*
*/
@@ -233,7 +235,7 @@
//ZEND_SET_SYMBOL(&EG(active_symbol_table), "session", php_session);
// Force Some INI entries weather the user likes it or not
- zend_alter_ini_entry("register_globals",sizeof("register_globals"),"1", sizeof("1") - 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ //zend_alter_ini_entry("register_globals", strlen("register_globals")+1, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
// Execute the bloody script
retval = php_execute_script(&script TSRMLS_CC);
Added: freeswitch/trunk/src/mod/languages/mod_php/php.ini
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/languages/mod_php/php.ini Mon Sep 11 21:23:53 2006
@@ -0,0 +1,1261 @@
+[PHP]
+
+;;;;;;;;;;;;;;;;;;;
+; About php.ini ;
+;;;;;;;;;;;;;;;;;;;
+; This file controls many aspects of PHP's behavior. In order for PHP to
+; read it, it must be named 'php.ini'. PHP looks for it in the current
+; working directory, in the path designated by the environment variable
+; PHPRC, and in the path that was defined in compile time (in that order).
+; Under Windows, the compile-time path is the Windows directory. The
+; path in which the php.ini file is looked for can be overridden using
+; the -c argument in command line mode.
+;
+; The syntax of the file is extremely simple. Whitespace and Lines
+; beginning with a semicolon are silently ignored (as you probably guessed).
+; Section headers (e.g. [Foo]) are also silently ignored, even though
+; they might mean something in the future.
+;
+; Directives are specified using the following syntax:
+; directive = value
+; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
+;
+; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
+; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
+; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
+;
+; Expressions in the INI file are limited to bitwise operators and parentheses:
+; | bitwise OR
+; & bitwise AND
+; ~ bitwise NOT
+; ! boolean NOT
+;
+; Boolean flags can be turned on using the values 1, On, True or Yes.
+; They can be turned off using the values 0, Off, False or No.
+;
+; An empty string can be denoted by simply not writing anything after the equal
+; sign, or by using the None keyword:
+;
+; foo = ; sets foo to an empty string
+; foo = none ; sets foo to an empty string
+; foo = "none" ; sets foo to the string 'none'
+;
+; If you use constants in your value, and these constants belong to a
+; dynamically loaded extension (either a PHP extension or a Zend extension),
+; you may only use these constants *after* the line that loads the extension.
+;
+;
+;;;;;;;;;;;;;;;;;;;
+; About this file ;
+;;;;;;;;;;;;;;;;;;;
+; This is the recommended, PHP 5-style version of the php.ini-dist file. It
+; sets some non standard settings, that make PHP more efficient, more secure,
+; and encourage cleaner coding.
+;
+; The price is that with these settings, PHP may be incompatible with some
+; applications, and sometimes, more difficult to develop with. Using this
+; file is warmly recommended for production sites. As all of the changes from
+; the standard settings are thoroughly documented, you can go over each one,
+; and decide whether you want to use it or not.
+;
+; For general information about the php.ini file, please consult the php.ini-dist
+; file, included in your PHP distribution.
+;
+; This file is different from the php.ini-dist file in the fact that it features
+; different values for several directives, in order to improve performance, while
+; possibly breaking compatibility with the standard out-of-the-box behavior of
+; PHP. Please make sure you read what's different, and modify your scripts
+; accordingly, if you decide to use this file instead.
+;
+; - register_globals = Off [Security, Performance]
+; Global variables are no longer registered for input data (POST, GET, cookies,
+; environment and other server variables). Instead of using $foo, you must use
+; you can use $_REQUEST["foo"] (includes any variable that arrives through the
+; request, namely, POST, GET and cookie variables), or use one of the specific
+; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending
+; on where the input originates. Also, you can look at the
+; import_request_variables() function.
+; Note that register_globals is going to be depracated (i.e., turned off by
+; default) in the next version of PHP, because it often leads to security bugs.
+; Read http://php.net/manual/en/security.registerglobals.php for further
+; information.
+; - register_long_arrays = Off [Performance]
+; Disables registration of the older (and deprecated) long predefined array
+; variables ($HTTP_*_VARS). Instead, use the superglobals that were
+; introduced in PHP 4.1.0
+; - display_errors = Off [Security]
+; With this directive set to off, errors that occur during the execution of
+; scripts will no longer be displayed as a part of the script output, and thus,
+; will no longer be exposed to remote users. With some errors, the error message
+; content may expose information about your script, web server, or database
+; server that may be exploitable for hacking. Production sites should have this
+; directive set to off.
+; - log_errors = On [Security]
+; This directive complements the above one. Any errors that occur during the
+; execution of your script will be logged (typically, to your server's error log,
+; but can be configured in several ways). Along with setting display_errors to off,
+; this setup gives you the ability to fully understand what may have gone wrong,
+; without exposing any sensitive information to remote users.
+; - output_buffering = 4096 [Performance]
+; Set a 4KB output buffer. Enabling output buffering typically results in less
+; writes, and sometimes less packets sent on the wire, which can often lead to
+; better performance. The gain this directive actually yields greatly depends
+; on which Web server you're working with, and what kind of scripts you're using.
+; - register_argc_argv = Off [Performance]
+; Disables registration of the somewhat redundant $argv and $argc global
+; variables.
+; - magic_quotes_gpc = Off [Performance]
+; Input data is no longer escaped with slashes so that it can be sent into
+; SQL databases without further manipulation. Instead, you should use the
+; function addslashes() on each input element you wish to send to a database.
+; - variables_order = "GPCS" [Performance]
+; The environment variables are not hashed into the $_ENV. To access
+; environment variables, you can use getenv() instead.
+; - error_reporting = E_ALL [Code Cleanliness, Security(?)]
+; By default, PHP surpresses errors of type E_NOTICE. These error messages
+; are emitted for non-critical errors, but that could be a symptom of a bigger
+; problem. Most notably, this will cause error messages about the use
+; of uninitialized variables to be displayed.
+; - allow_call_time_pass_reference = Off [Code cleanliness]
+; It's not possible to decide to force a variable to be passed by reference
+; when calling a function. The PHP 4 style to do this is by making the
+; function require the relevant argument by reference.
+
+
+;;;;;;;;;;;;;;;;;;;;
+; Language Options ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Enable the PHP scripting language engine under Apache.
+engine = On
+
+; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
+zend.ze1_compatibility_mode = Off
+
+; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized.
+; NOTE: Using short tags should be avoided when developing applications or
+; libraries that are meant for redistribution, or deployment on PHP
+; servers which are not under your control, because short tags may not
+; be supported on the target server. For portable, redistributable code,
+; be sure not to use short tags.
+short_open_tag = Off
+
+; Allow ASP-style <% %> tags.
+asp_tags = Off
+
+; The number of significant digits displayed in floating point numbers.
+precision = 14
+
+; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
+y2k_compliance = On
+
+; Output buffering allows you to send header lines (including cookies) even
+; after you send body content, at the price of slowing PHP's output layer a
+; bit. You can enable output buffering during runtime by calling the output
+; buffering functions. You can also enable output buffering for all files by
+; setting this directive to On. If you wish to limit the size of the buffer
+; to a certain size - you can use a maximum number of bytes instead of 'On', as
+; a value for this directive (e.g., output_buffering=4096).
+output_buffering = 4096
+
+; You can redirect all of the output of your scripts to a function. For
+; example, if you set output_handler to "mb_output_handler", character
+; encoding will be transparently converted to the specified encoding.
+; Setting any output handler automatically turns on output buffering.
+; Note: People who wrote portable scripts should not depend on this ini
+; directive. Instead, explicitly set the output handler using ob_start().
+; Using this ini directive may cause problems unless you know what script
+; is doing.
+; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
+; and you cannot use both "ob_gzhandler" and "zlib.output_compression".
+; Note: output_handler must be empty if this is set 'On' !!!!
+; Instead you must use zlib.output_handler.
+;output_handler =
+
+; Transparent output compression using the zlib library
+; Valid values for this option are 'off', 'on', or a specific buffer size
+; to be used for compression (default is 4KB)
+; Note: Resulting chunk size may vary due to nature of compression. PHP
+; outputs chunks that are few hundreds bytes each as a result of
+; compression. If you prefer a larger chunk size for better
+; performance, enable output_buffering in addition.
+; Note: You need to use zlib.output_handler instead of the standard
+; output_handler, or otherwise the output will be corrupted.
+zlib.output_compression = Off
+
+; You cannot specify additional output handlers if zlib.output_compression
+; is activated here. This setting does the same as output_handler but in
+; a different order.
+;zlib.output_handler =
+
+; Implicit flush tells PHP to tell the output layer to flush itself
+; automatically after every output block. This is equivalent to calling the
+; PHP function flush() after each and every call to print() or echo() and each
+; and every HTML block. Turning this option on has serious performance
+; implications and is generally recommended for debugging purposes only.
+implicit_flush = Off
+
+; The unserialize callback function will be called (with the undefined class'
+; name as parameter), if the unserializer finds an undefined class
+; which should be instantiated.
+; A warning appears if the specified function is not defined, or if the
+; function doesn't include/implement the missing class.
+; So only set this entry, if you really want to implement such a
+; callback-function.
+unserialize_callback_func=
+
+; When floats & doubles are serialized store serialize_precision significant
+; digits after the floating point. The default value ensures that when floats
+; are decoded with unserialize, the data will remain the same.
+serialize_precision = 100
+
+; Whether to enable the ability to force arguments to be passed by reference
+; at function call time. This method is deprecated and is likely to be
+; unsupported in future versions of PHP/Zend. The encouraged method of
+; specifying which arguments should be passed by reference is in the function
+; declaration. You're encouraged to try and turn this option Off and make
+; sure your scripts work properly with it in order to ensure they will work
+; with future versions of the language (you will receive a warning each time
+; you use this feature, and the argument will be passed by value instead of by
+; reference).
+allow_call_time_pass_reference = Off
+
+;
+; Safe Mode
+;
+safe_mode = Off
+
+; By default, Safe Mode does a UID compare check when
+; opening files. If you want to relax this to a GID compare,
+; then turn on safe_mode_gid.
+safe_mode_gid = Off
+
+; When safe_mode is on, UID/GID checks are bypassed when
+; including files from this directory and its subdirectories.
+; (directory must also be in include_path or full path must
+; be used when including)
+safe_mode_include_dir =
+
+; When safe_mode is on, only executables located in the safe_mode_exec_dir
+; will be allowed to be executed via the exec family of functions.
+safe_mode_exec_dir =
+
+; Setting certain environment variables may be a potential security breach.
+; This directive contains a comma-delimited list of prefixes. In Safe Mode,
+; the user may only alter environment variables whose names begin with the
+; prefixes supplied here. By default, users will only be able to set
+; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
+;
+; Note: If this directive is empty, PHP will let the user modify ANY
+; environment variable!
+safe_mode_allowed_env_vars = PHP_
+
+; This directive contains a comma-delimited list of environment variables that
+; the end user won't be able to change using putenv(). These variables will be
+; protected even if safe_mode_allowed_env_vars is set to allow to change them.
+safe_mode_protected_env_vars = LD_LIBRARY_PATH
+
+; open_basedir, if set, limits all file operations to the defined directory
+; and below. This directive makes most sense if used in a per-directory
+; or per-virtualhost web server configuration file. This directive is
+; *NOT* affected by whether Safe Mode is turned On or Off.
+;open_basedir =
+
+; This directive allows you to disable certain functions for security reasons.
+; It receives a comma-delimited list of function names. This directive is
+; *NOT* affected by whether Safe Mode is turned On or Off.
+disable_functions =
+
+; This directive allows you to disable certain classes for security reasons.
+; It receives a comma-delimited list of class names. This directive is
+; *NOT* affected by whether Safe Mode is turned On or Off.
+disable_classes =
+
+; Colors for Syntax Highlighting mode. Anything that's acceptable in
+; <span style="color: ???????"> would work.
+;highlight.string = #DD0000
+;highlight.comment = #FF9900
+;highlight.keyword = #007700
+;highlight.bg = #FFFFFF
+;highlight.default = #0000BB
+;highlight.html = #000000
+
+; If enabled, the request will be allowed to complete even if the user aborts
+; the request. Consider enabling it if executing long request, which may end up
+; being interrupted by the user or a browser timing out.
+; ignore_user_abort = On
+
+; Determines the size of the realpath cache to be used by PHP. This value should
+; be increased on systems where PHP opens many files to reflect the quantity of
+; the file operations performed.
+; realpath_cache_size=16k
+
+; Duration of time, in seconds for which to cache realpath information for a given
+; file or directory. For systems with rarely changing files, consider increasing this
+; value.
+; realpath_cache_ttl=120
+
+;
+; Misc
+;
+; Decides whether PHP may expose the fact that it is installed on the server
+; (e.g. by adding its signature to the Web server header). It is no security
+; threat in any way, but it makes it possible to determine whether you use PHP
+; on your server or not.
+expose_php = On
+
+
+;;;;;;;;;;;;;;;;;;;
+; Resource Limits ;
+;;;;;;;;;;;;;;;;;;;
+
+max_execution_time = 1000 ; Maximum execution time of each script, in seconds
+max_input_time = 1000 ; Maximum amount of time each script may spend parsing request data
+memory_limit = 8M ; Maximum amount of memory a script may consume (8MB)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Error handling and logging ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; error_reporting is a bit-field. Or each number up to get desired error
+; reporting level
+; E_ALL - All errors and warnings (doesn't include E_STRICT)
+; E_ERROR - fatal run-time errors
+; E_WARNING - run-time warnings (non-fatal errors)
+; E_PARSE - compile-time parse errors
+; E_NOTICE - run-time notices (these are warnings which often result
+; from a bug in your code, but it's possible that it was
+; intentional (e.g., using an uninitialized variable and
+; relying on the fact it's automatically initialized to an
+; empty string)
+; E_STRICT - run-time notices, enable to have PHP suggest changes
+; to your code which will ensure the best interoperability
+; and forward compatibility of your code
+; E_CORE_ERROR - fatal errors that occur during PHP's initial startup
+; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's
+; initial startup
+; E_COMPILE_ERROR - fatal compile-time errors
+; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
+; E_USER_ERROR - user-generated error message
+; E_USER_WARNING - user-generated warning message
+; E_USER_NOTICE - user-generated notice message
+;
+; Examples:
+;
+; - Show all errors, except for notices and coding standards warnings
+;
+;error_reporting = E_ALL & ~E_NOTICE
+;
+; - Show all errors, except for notices
+;
+;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
+;
+; - Show only errors
+;
+;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;
+; - Show all errors, except coding standards warnings
+;
+error_reporting = E_ALL
+
+; Print out errors (as a part of the output). For production web sites,
+; you're strongly encouraged to turn this feature off, and use error logging
+; instead (see below). Keeping display_errors enabled on a production web site
+; may reveal security information to end users, such as file paths on your Web
+; server, your database schema or other information.
+display_errors = Off
+
+; Even when display_errors is on, errors that occur during PHP's startup
+; sequence are not displayed. It's strongly recommended to keep
+; display_startup_errors off, except for when debugging.
+display_startup_errors = Off
+
+; Log errors into a log file (server-specific log, stderr, or error_log (below))
+; As stated above, you're strongly advised to use error logging in place of
+; error displaying on production web sites.
+log_errors = On
+
+; Set maximum length of log_errors. In error_log information about the source is
+; added. The default is 1024 and 0 allows to not apply any maximum length at all.
+log_errors_max_len = 1024
+
+; Do not log repeated messages. Repeated errors must occur in same file on same
+; line until ignore_repeated_source is set true.
+ignore_repeated_errors = Off
+
+; Ignore source of message when ignoring repeated messages. When this setting
+; is On you will not log errors with repeated messages from different files or
+; sourcelines.
+ignore_repeated_source = Off
+
+; If this parameter is set to Off, then memory leaks will not be shown (on
+; stdout or in the log). This has only effect in a debug compile, and if
+; error reporting includes E_WARNING in the allowed list
+report_memleaks = On
+
+; Store the last error/warning message in $php_errormsg (boolean).
+track_errors = Off
+
+; Disable the inclusion of HTML tags in error messages.
+; Note: Never use this feature for production boxes.
+html_errors = Off
+
+; If html_errors is set On PHP produces clickable error messages that direct
+; to a page describing the error or function causing the error in detail.
+; You can download a copy of the PHP manual from http://www.php.net/docs.php
+; and change docref_root to the base URL of your local copy including the
+; leading '/'. You must also specify the file extension being used including
+; the dot.
+; Note: Never use this feature for production boxes.
+;docref_root = "/phpmanual/"
+;docref_ext = .html
+
+; String to output before an error message.
+;error_prepend_string = "<font color=ff0000>"
+
+; String to output after an error message.
+;error_append_string = "</font>"
+
+; Log errors to specified file.
+;error_log = filename
+
+; Log errors to syslog (Event Log on NT, not valid in Windows 95).
+;error_log = syslog
+
+
+;;;;;;;;;;;;;;;;;
+; Data Handling ;
+;;;;;;;;;;;;;;;;;
+;
+; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
+
+; The separator used in PHP generated URLs to separate arguments.
+; Default is "&".
+;arg_separator.output = "&"
+
+; List of separator(s) used by PHP to parse input URLs into variables.
+; Default is "&".
+; NOTE: Every character in this directive is considered as separator!
+;arg_separator.input = ";&"
+
+; This directive describes the order in which PHP registers GET, POST, Cookie,
+; Environment and Built-in variables (G, P, C, E & S respectively, often
+; referred to as EGPCS or GPC). Registration is done from left to right, newer
+; values override older values.
+variables_order = "GPCS"
+
+; Whether or not to register the EGPCS variables as global variables. You may
+; want to turn this off if you don't want to clutter your scripts' global scope
+; with user data. This makes most sense when coupled with track_vars - in which
+; case you can access all of the GPC variables through the $HTTP_*_VARS[],
+; variables.
+;
+; You should do your best to write your scripts so that they do not require
+; register_globals to be on; Using form variables as globals can easily lead
+; to possible security problems, if the code is not very well thought of.
+register_globals = On
+
+; Whether or not to register the old-style input arrays, HTTP_GET_VARS
+; and friends. If you're not using them, it's recommended to turn them off,
+; for performance reasons.
+register_long_arrays = Off
+
+; This directive tells PHP whether to declare the argv&argc variables (that
+; would contain the GET information). If you don't use these variables, you
+; should turn it off for increased performance.
+register_argc_argv = Off
+
+; When enabled, the SERVER and ENV variables are created when they're first
+; used (Just In Time) instead of when the script starts. If these variables
+; are not used within a script, having this directive on will result in a
+; performance gain. The PHP directives register_globals, register_long_arrays,
+; and register_argc_argv must be disabled for this directive to have any affect.
+auto_globals_jit = On
+
+; Maximum size of POST data that PHP will accept.
+post_max_size = 8M
+
+; Magic quotes
+;
+
+; Magic quotes for incoming GET/POST/Cookie data.
+magic_quotes_gpc = Off
+
+; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
+magic_quotes_runtime = Off
+
+; Use Sybase-style magic quotes (escape ' with '' instead of \').
+magic_quotes_sybase = Off
+
+; Automatically add files before or after any PHP document.
+auto_prepend_file =
+auto_append_file =
+
+; As of 4.0b4, PHP always outputs a character encoding by default in
+; the Content-type: header. To disable sending of the charset, simply
+; set it to be empty.
+;
+; PHP's built-in default is text/html
+default_mimetype = "text/html"
+;default_charset = "iso-8859-1"
+
+; Always populate the $HTTP_RAW_POST_DATA variable.
+;always_populate_raw_post_data = On
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+; Paths and Directories ;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; UNIX: "/path1:/path2"
+;include_path = ".:/php/includes"
+;
+; Windows: "\path1;\path2"
+;include_path = ".;c:\php\includes"
+
+; The root of the PHP pages, used only if nonempty.
+; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
+; if you are running php as a CGI under any web server (other than IIS)
+; see documentation for security issues. The alternate is to use the
+; cgi.force_redirect configuration below
+doc_root =
+
+; The directory under which PHP opens the script using /~username used only
+; if nonempty.
+user_dir =
+
+; Directory in which the loadable extensions (modules) reside.
+extension_dir = "./"
+
+; Whether or not to enable the dl() function. The dl() function does NOT work
+; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+; disabled on them.
+enable_dl = Off
+
+; cgi.force_redirect is necessary to provide security running PHP as a CGI under
+; most web servers. Left undefined, PHP turns this on by default. You can
+; turn it off here AT YOUR OWN RISK
+; **You CAN safely turn this off for IIS, in fact, you MUST.**
+; cgi.force_redirect = 1
+
+; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
+; every request.
+; cgi.nph = 1
+
+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
+; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
+; will look for to know it is OK to continue execution. Setting this variable MAY
+; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
+; cgi.redirect_status_env = ;
+
+; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
+; security tokens of the calling client. This allows IIS to define the
+; security context that the request runs under. mod_fastcgi under Apache
+; does not currently support this feature (03/17/2002)
+; Set to 1 if running under IIS. Default is zero.
+; fastcgi.impersonate = 1;
+
+; Disable logging through FastCGI connection
+; fastcgi.log = 0
+
+; cgi.rfc2616_headers configuration option tells PHP what type of headers to
+; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
+; is supported by Apache. When this option is set to 1 PHP will send
+; RFC2616 compliant header.
+; Default is zero.
+;cgi.rfc2616_headers = 0
+
+
+;;;;;;;;;;;;;;;;
+; File Uploads ;
+;;;;;;;;;;;;;;;;
+
+; Whether to allow HTTP file uploads.
+file_uploads = On
+
+; Temporary directory for HTTP uploaded files (will use system default if not
+; specified).
+;upload_tmp_dir =
+
+; Maximum allowed size for uploaded files.
+upload_max_filesize = 2M
+
+
+;;;;;;;;;;;;;;;;;;
+; Fopen wrappers ;
+;;;;;;;;;;;;;;;;;;
+
+; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
+allow_url_fopen = On
+
+; Define the anonymous ftp password (your email address)
+;from="john(a)doe.com"
+
+; Define the User-Agent string
+; user_agent="PHP"
+
+; Default timeout for socket based streams (seconds)
+default_socket_timeout = 60
+
+; If your scripts have to deal with files from Macintosh systems,
+; or you are running on a Mac and need to deal with files from
+; unix or win32 systems, setting this flag will cause PHP to
+; automatically detect the EOL character in those files so that
+; fgets() and file() will work regardless of the source of the file.
+; auto_detect_line_endings = Off
+
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
+;
+; If you wish to have an extension loaded automatically, use the following
+; syntax:
+;
+; extension=modulename.extension
+;
+; For example, on Windows:
+;
+; extension=msql.dll
+;
+; ... or under UNIX:
+;
+; extension=msql.so
+;
+; Note that it should be the name of the module only; no directory information
+; needs to go here. Specify the location of the extension with the
+; extension_dir directive above.
+
+
+; Windows Extensions
+; Note that ODBC support is built in, so no dll is needed for it.
+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+; extension folders as well as the separate PECL DLL download (PHP 5).
+; Be sure to appropriately set the extension_dir directive.
+
+;extension=php_mbstring.dll
+;extension=php_bz2.dll
+;extension=php_curl.dll
+;extension=php_dba.dll
+;extension=php_dbase.dll
+;extension=php_exif.dll
+;extension=php_fdf.dll
+;extension=php_filepro.dll
+;extension=php_gd2.dll
+;extension=php_gettext.dll
+;extension=php_ifx.dll
+;extension=php_imap.dll
+;extension=php_interbase.dll
+;extension=php_ldap.dll
+;extension=php_mcrypt.dll
+;extension=php_mhash.dll
+;extension=php_mime_magic.dll
+;extension=php_ming.dll
+;extension=php_mssql.dll
+;extension=php_msql.dll
+;extension=php_mysql.dll
+;extension=php_oci8.dll
+;extension=php_openssl.dll
+;extension=php_oracle.dll
+;extension=php_pgsql.dll
+;extension=php_shmop.dll
+;extension=php_snmp.dll
+;extension=php_sockets.dll
+;extension=php_sqlite.dll
+;extension=php_sybase_ct.dll
+;extension=php_tidy.dll
+;extension=php_xmlrpc.dll
+;extension=php_xsl.dll
+extension=php_freeswitch.so
+
+;;;;;;;;;;;;;;;;;;;
+; Module Settings ;
+;;;;;;;;;;;;;;;;;;;
+
+[Date]
+; Defines the default timezone used by the date functions
+;date.timezone =
+
+[Syslog]
+; Whether or not to define the various syslog variables (e.g. $LOG_PID,
+; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
+; runtime, you can define these variables by calling define_syslog_variables().
+define_syslog_variables = Off
+
+[mail function]
+; For Win32 only.
+SMTP = localhost
+smtp_port = 25
+
+; For Win32 only.
+;sendmail_from = me(a)example.com
+
+; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
+;sendmail_path =
+
+; Force the addition of the specified parameters to be passed as extra parameters
+; to the sendmail binary. These parameters will always replace the value of
+; the 5th parameter to mail(), even in safe mode.
+;mail.force_extra_parameters =
+
+[SQL]
+sql.safe_mode = Off
+
+[ODBC]
+;odbc.default_db = Not yet implemented
+;odbc.default_user = Not yet implemented
+;odbc.default_pw = Not yet implemented
+
+; Allow or prevent persistent links.
+odbc.allow_persistent = On
+
+; Check that a connection is still valid before reuse.
+odbc.check_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+odbc.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
+odbc.max_links = -1
+
+; Handling of LONG fields. Returns number of bytes to variables. 0 means
+; passthru.
+odbc.defaultlrl = 4096
+
+; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char.
+; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
+; of uodbc.defaultlrl and uodbc.defaultbinmode
+odbc.defaultbinmode = 1
+
+[MySQL]
+; Allow or prevent persistent links.
+mysql.allow_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+mysql.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
+mysql.max_links = -1
+
+; Default port number for mysql_connect(). If unset, mysql_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
+; at MYSQL_PORT.
+mysql.default_port =
+
+; Default socket name for local MySQL connects. If empty, uses the built-in
+; MySQL defaults.
+mysql.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+mysql.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+mysql.default_user =
+
+; Default password for mysql_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
+; and reveal this password! And of course, any users with read access to this
+; file will be able to reveal the password as well.
+mysql.default_password =
+
+; Maximum time (in secondes) for connect timeout. -1 means no limit
+mysql.connect_timeout = 60
+
+; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
+; SQL-Errors will be displayed.
+mysql.trace_mode = Off
+
+[MySQLi]
+
+; Maximum number of links. -1 means no limit.
+mysqli.max_links = -1
+
+; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
+; at MYSQL_PORT.
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects. If empty, uses the built-in
+; MySQL defaults.
+mysqli.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
+; and reveal this password! And of course, any users with read access to this
+; file will be able to reveal the password as well.
+mysqli.default_pw =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
+[mSQL]
+; Allow or prevent persistent links.
+msql.allow_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+msql.max_persistent = -1
+
+; Maximum number of links (persistent+non persistent). -1 means no limit.
+msql.max_links = -1
+
+[PostgresSQL]
+; Allow or prevent persistent links.
+pgsql.allow_persistent = On
+
+; Detect broken persistent links always with pg_pconnect().
+; Auto reset feature requires a little overheads.
+pgsql.auto_reset_persistent = Off
+
+; Maximum number of persistent links. -1 means no limit.
+pgsql.max_persistent = -1
+
+; Maximum number of links (persistent+non persistent). -1 means no limit.
+pgsql.max_links = -1
+
+; Ignore PostgreSQL backends Notice message or not.
+; Notice message logging require a little overheads.
+pgsql.ignore_notice = 0
+
+; Log PostgreSQL backends Noitce message or not.
+; Unless pgsql.ignore_notice=0, module cannot log notice message.
+pgsql.log_notice = 0
+
+[Sybase]
+; Allow or prevent persistent links.
+sybase.allow_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+sybase.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
+sybase.max_links = -1
+
+;sybase.interface_file = "/usr/sybase/interfaces"
+
+; Minimum error severity to display.
+sybase.min_error_severity = 10
+
+; Minimum message severity to display.
+sybase.min_message_severity = 10
+
+; Compatability mode with old versions of PHP 3.0.
+; If on, this will cause PHP to automatically assign types to results according
+; to their Sybase type, instead of treating them all as strings. This
+; compatability mode will probably not stay around forever, so try applying
+; whatever necessary changes to your code, and turn it off.
+sybase.compatability_mode = Off
+
+[Sybase-CT]
+; Allow or prevent persistent links.
+sybct.allow_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+sybct.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
+sybct.max_links = -1
+
+; Minimum server message severity to display.
+sybct.min_server_severity = 10
+
+; Minimum client message severity to display.
+sybct.min_client_severity = 10
+
+[bcmath]
+; Number of decimal digits for all bcmath functions.
+bcmath.scale = 0
+
+[browscap]
+;browscap = extra/browscap.ini
+
+[Informix]
+; Default host for ifx_connect() (doesn't apply in safe mode).
+ifx.default_host =
+
+; Default user for ifx_connect() (doesn't apply in safe mode).
+ifx.default_user =
+
+; Default password for ifx_connect() (doesn't apply in safe mode).
+ifx.default_password =
+
+; Allow or prevent persistent links.
+ifx.allow_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+ifx.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent). -1 means no limit.
+ifx.max_links = -1
+
+; If on, select statements return the contents of a text blob instead of its id.
+ifx.textasvarchar = 0
+
+; If on, select statements return the contents of a byte blob instead of its id.
+ifx.byteasvarchar = 0
+
+; Trailing blanks are stripped from fixed-length char columns. May help the
+; life of Informix SE users.
+ifx.charasvarchar = 0
+
+; If on, the contents of text and byte blobs are dumped to a file instead of
+; keeping them in memory.
+ifx.blobinfile = 0
+
+; NULL's are returned as empty strings, unless this is set to 1. In that case,
+; NULL's are returned as string 'NULL'.
+ifx.nullformat = 0
+
+[Session]
+; Handler used to store/retrieve data.
+session.save_handler = files
+
+; Argument passed to save_handler. In the case of files, this is the path
+; where data files are stored. Note: Windows users have to change this
+; variable in order to use PHP's session functions.
+;
+; As of PHP 4.0.1, you can define the path as:
+;
+; session.save_path = "N;/path"
+;
+; where N is an integer. Instead of storing all the session files in
+; /path, what this will do is use subdirectories N-levels deep, and
+; store the session data in those directories. This is useful if you
+; or your OS have problems with lots of files in one directory, and is
+; a more efficient layout for servers that handle lots of sessions.
+;
+; NOTE 1: PHP will not create this directory structure automatically.
+; You can use the script in the ext/session dir for that purpose.
+; NOTE 2: See the section on garbage collection below if you choose to
+; use subdirectories for session storage
+;
+; The file storage module creates files using mode 600 by default.
+; You can change that by using
+;
+; session.save_path = "N;MODE;/path"
+;
+; where MODE is the octal representation of the mode. Note that this
+; does not overwrite the process's umask.
+;session.save_path = "/tmp"
+
+; Whether to use cookies.
+session.use_cookies = 1
+
+; This option enables administrators to make their users invulnerable to
+; attacks which involve passing session ids in URLs; defaults to 0.
+; session.use_only_cookies = 1
+
+; Name of the session (used as cookie name).
+session.name = PHPSESSID
+
+; Initialize session on request startup.
+session.auto_start = 0
+
+; Lifetime in seconds of cookie or, if 0, until browser is restarted.
+session.cookie_lifetime = 0
+
+; The path for which the cookie is valid.
+session.cookie_path = /
+
+; The domain for which the cookie is valid.
+session.cookie_domain =
+
+; Handler used to serialize data. php is the standard serializer of PHP.
+session.serialize_handler = php
+
+; Define the probability that the 'garbage collection' process is started
+; on every session initialization.
+; The probability is calculated by using gc_probability/gc_divisor,
+; e.g. 1/100 means there is a 1% chance that the GC process starts
+; on each request.
+
+session.gc_probability = 1
+session.gc_divisor = 1000
+
+; After this number of seconds, stored data will be seen as 'garbage' and
+; cleaned up by the garbage collection process.
+session.gc_maxlifetime = 1440
+
+; NOTE: If you are using the subdirectory option for storing session files
+; (see session.save_path above), then garbage collection does *not*
+; happen automatically. You will need to do your own garbage
+; collection through a shell script, cron entry, or some other method.
+; For example, the following script would is the equivalent of
+; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
+; cd /path/to/sessions; find -cmin +24 | xargs rm
+
+; PHP 4.2 and less have an undocumented feature/bug that allows you to
+; to initialize a session variable in the global scope, albeit register_globals
+; is disabled. PHP 4.3 and later will warn you, if this feature is used.
+; You can disable the feature and the warning separately. At this time,
+; the warning is only displayed, if bug_compat_42 is enabled.
+
+session.bug_compat_42 = 0
+session.bug_compat_warn = 1
+
+; Check HTTP Referer to invalidate externally stored URLs containing ids.
+; HTTP_REFERER has to contain this substring for the session to be
+; considered as valid.
+session.referer_check =
+
+; How many bytes to read from the file.
+session.entropy_length = 0
+
+; Specified here to create the session id.
+session.entropy_file =
+
+;session.entropy_length = 16
+
+;session.entropy_file = /dev/urandom
+
+; Set to {nocache,private,public,} to determine HTTP caching aspects
+; or leave this empty to avoid sending anti-caching headers.
+session.cache_limiter = nocache
+
+; Document expires after n minutes.
+session.cache_expire = 180
+
+; trans sid support is disabled by default.
+; Use of trans sid may risk your users security.
+; Use this option with caution.
+; - User may send URL contains active session ID
+; to other person via. email/irc/etc.
+; - URL that contains active session ID may be stored
+; in publically accessible computer.
+; - User may access your site with the same session ID
+; always using URL stored in browser's history or bookmarks.
+session.use_trans_sid = 0
+
+; Select a hash function
+; 0: MD5 (128 bits)
+; 1: SHA-1 (160 bits)
+session.hash_function = 0
+
+; Define how many bits are stored in each character when converting
+; the binary hash data to something readable.
+;
+; 4 bits: 0-9, a-f
+; 5 bits: 0-9, a-v
+; 6 bits: 0-9, a-z, A-Z, "-", ","
+session.hash_bits_per_character = 5
+
+; The URL rewriter will look for URLs in a defined set of HTML tags.
+; form/fieldset are special; if you include them here, the rewriter will
+; add a hidden <input> field with the info which is otherwise appended
+; to URLs. If you want XHTML conformity, remove the form entry.
+; Note that all valid entries require a "=", even if no value follows.
+url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
+
+[MSSQL]
+; Allow or prevent persistent links.
+mssql.allow_persistent = On
+
+; Maximum number of persistent links. -1 means no limit.
+mssql.max_persistent = -1
+
+; Maximum number of links (persistent+non persistent). -1 means no limit.
+mssql.max_links = -1
+
+; Minimum error severity to display.
+mssql.min_error_severity = 10
+
+; Minimum message severity to display.
+mssql.min_message_severity = 10
+
+; Compatability mode with old versions of PHP 3.0.
+mssql.compatability_mode = Off
+
+; Connect timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
+; Valid range 0 - 2147483647. Default = 4096.
+;mssql.textlimit = 4096
+
+; Valid range 0 - 2147483647. Default = 4096.
+;mssql.textsize = 4096
+
+; Limits the number of records in each batch. 0 = all records in one batch.
+;mssql.batchsize = 0
+
+; Specify how datetime and datetim4 columns are returned
+; On => Returns data converted to SQL server settings
+; Off => Returns values as YYYY-MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
+
+; Use NT authentication when connecting to the server
+mssql.secure_connection = Off
+
+; Specify max number of processes. -1 = library default
+; msdlib defaults to 25
+; FreeTDS defaults to 4096
+;mssql.max_procs = -1
+
+; Specify client character set.
+; If empty or not set the client charset from freetds.comf is used
+; This is only used when compiled with FreeTDS
+;mssql.charset = "ISO-8859-1"
+
+[Assertion]
+; Assert(expr); active by default.
+;assert.active = On
+
+; Issue a PHP warning for each failed assertion.
+;assert.warning = On
+
+; Don't bail out by default.
+;assert.bail = Off
+
+; User-function to be called if an assertion fails.
+;assert.callback = 0
+
+; Eval the expression with current error_reporting(). Set to true if you want
+; error_reporting(0) around the eval().
+;assert.quiet_eval = 0
+
+[Verisign Payflow Pro]
+; Default Payflow Pro server.
+pfpro.defaulthost = "test-payflow.verisign.com"
+
+; Default port to connect to.
+pfpro.defaultport = 443
+
+; Default timeout in seconds.
+pfpro.defaulttimeout = 30
+
+; Default proxy IP address (if required).
+;pfpro.proxyaddress =
+
+; Default proxy port.
+;pfpro.proxyport =
+
+; Default proxy logon.
+;pfpro.proxylogon =
+
+; Default proxy password.
+;pfpro.proxypassword =
+
+[COM]
+; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
+;com.typelib_file =
+; allow Distributed-COM calls
+;com.allow_dcom = true
+; autoregister constants of a components typlib on com_load()
+;com.autoregister_typelib = true
+; register constants casesensitive
+;com.autoregister_casesensitive = false
+; show warnings on duplicate constat registrations
+;com.autoregister_verbose = true
+
+[mbstring]
+; language for internal character representation.
+;mbstring.language = Japanese
+
+; internal/script encoding.
+; Some encoding cannot work as internal encoding.
+; (e.g. SJIS, BIG5, ISO-2022-*)
+;mbstring.internal_encoding = EUC-JP
+
+; http input encoding.
+;mbstring.http_input = auto
+
+; http output encoding. mb_output_handler must be
+; registered as output buffer to function
+;mbstring.http_output = SJIS
+
+; enable automatic encoding translation according to
+; mbstring.internal_encoding setting. Input chars are
+; converted to internal encoding by setting this to On.
+; Note: Do _not_ use automatic encoding translation for
+; portable libs/applications.
+;mbstring.encoding_translation = Off
+
+; automatic encoding detection order.
+; auto means
+;mbstring.detect_order = auto
+
+; substitute_character used when character cannot be converted
+; one from another
+;mbstring.substitute_character = none;
+
+; overload(replace) single byte functions by mbstring functions.
+; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
+; etc. Possible values are 0,1,2,4 or combination of them.
+; For example, 7 for overload everything.
+; 0: No overload
+; 1: Overload mail() function
+; 2: Overload str*() functions
+; 4: Overload ereg*() functions
+;mbstring.func_overload = 0
+
+; enable strict encoding detection.
+;mbstring.strict_encoding = Off
+
+[FrontBase]
+;fbsql.allow_persistent = On
+;fbsql.autocommit = On
+;fbsql.show_timestamp_decimals = Off
+;fbsql.default_database =
+;fbsql.default_database_password =
+;fbsql.default_host =
+;fbsql.default_password =
+;fbsql.default_user = "_SYSTEM"
+;fbsql.generate_warnings = Off
+;fbsql.max_connections = 128
+;fbsql.max_links = 128
+;fbsql.max_persistent = -1
+;fbsql.max_results = 128
+;fbsql.batchSize = 1000
+
+[gd]
+; Tell the jpeg decode to libjpeg warnings and try to create
+; a gd image. The warning will then be displayed as notices
+; disabled by default
+;gd.jpeg_ignore_warning = 0
+
+[exif]
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
+; With mbstring support this will automatically be converted into the encoding
+; given by corresponding encode setting. When empty mbstring.internal_encoding
+; is used. For the decode settings you can distinguish between motorola and
+; intel byte order. A decode setting cannot be empty.
+;exif.encode_unicode = ISO-8859-15
+;exif.decode_unicode_motorola = UCS-2BE
+;exif.decode_unicode_intel = UCS-2LE
+;exif.encode_jis =
+;exif.decode_jis_motorola = JIS
+;exif.decode_jis_intel = JIS
+
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
+[soap]
+; Enables or disables WSDL caching feature.
+soap.wsdl_cache_enabled=1
+; Sets the directory name where SOAP extension will put cache files.
+soap.wsdl_cache_dir="/tmp"
+; (time to live) Sets the number of second while cached file will be used
+; instead of original one.
+soap.wsdl_cache_ttl=86400
+
+; Local Variables:
+; tab-width: 4
+; End:
Modified: freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c Mon Sep 11 21:23:53 2006
@@ -112,57 +112,38 @@
return session;
}
-void fs_channel_answer(char *uuid)
+void fs_channel_answer(switch_core_session_t *session)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
- switch_channel_t *channel;
- channel = switch_core_session_get_channel(session);
+ switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_answer(channel);
}
-void fs_channel_pre_answer(char *uuid)
+void fs_channel_pre_answer(switch_core_session_t *session)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_pre_answer(channel);
}
-void fs_channel_hangup(char *uuid, char *cause)
+void fs_channel_hangup(switch_core_session_t *session, char *cause)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_hangup(channel, switch_channel_str2cause(cause));
}
-void fs_channel_set_variable(char *uuid, char *var, char *val)
+void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_set_variable(channel, var, val);
}
-void fs_channel_get_variable(char *uuid, char *var)
+void fs_channel_get_variable(switch_core_session_t *session, char *var)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_get_variable(channel, var);
}
-void fs_channel_set_state(char *uuid, char *state)
+void fs_channel_set_state(switch_core_session_t *session, char *state)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_channel_state_t fs_state = switch_channel_get_state(channel);
@@ -176,16 +157,13 @@
IVR Routines! You can do IVR in PHP NOW!
*/
-int fs_ivr_play_file(char *uuid,
- char *file,
- char *timer_name,
- switch_input_callback_function_t dtmf_callback,
- void *buf,
- unsigned int buflen)
+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_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
if (switch_strlen_zero(timer_name)) {
timer_name = NULL;
@@ -195,40 +173,31 @@
return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
}
-int fs_switch_ivr_record_file(char *uuid,
- switch_file_handle_t *fh,
- char *file,
- switch_input_callback_function_t dtmf_callback,
- void *buf,
- unsigned int buflen)
+int fs_switch_ivr_record_file(switch_core_session_t *session,
+ switch_file_handle_t *fh,
+ char *file,
+ switch_input_callback_function_t dtmf_callback,
+ void *buf,
+ unsigned int buflen)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen);
return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
}
-int fs_switch_ivr_sleep(char *uuid,
- uint32_t ms)
+int fs_switch_ivr_sleep(switch_core_session_t *session,
+ uint32_t ms)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_sleep(session, ms);
return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
}
-int fs_ivr_play_file2(char *uuid,
- char *file)
+int fs_ivr_play_file2(switch_core_session_t *session,
+ char *file)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0);
@@ -236,21 +205,18 @@
}
-int fs_switch_ivr_collect_digits_callback (char *uuid,
- switch_input_callback_function_t dtmf_callback,
- void *buf,
- unsigned int buflen)
+int fs_switch_ivr_collect_digits_callback (switch_core_session_t *session,
+ switch_input_callback_function_t dtmf_callback,
+ void *buf,
+ unsigned int buflen)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen);
return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
}
-int fs_switch_ivr_collect_digits_count(char *uuid,
+int fs_switch_ivr_collect_digits_count (switch_core_session_t *session,
char *buf,
unsigned int buflen,
unsigned int maxdigits,
@@ -258,9 +224,6 @@
char *terminator,
unsigned int timeout)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_collect_digits_count(session, buf, buflen, maxdigits, terminators, terminator, timeout);
@@ -280,7 +243,7 @@
}
*/
-int fs_switch_ivr_originate(char *uuid,
+int fs_switch_ivr_originate (switch_core_session_t *session,
switch_core_session_t **bleg,
char * bridgeto,
uint32_t timelimit_sec)
@@ -289,8 +252,6 @@
char * cid_num_override,
switch_caller_profile_t *caller_profile_override) */
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
switch_channel_t *caller_channel;
switch_core_session_t *peer_session;
@@ -315,21 +276,18 @@
}
-int fs_switch_ivr_session_transfer(char *uuid,
+int fs_switch_ivr_session_transfer(switch_core_session_t *session,
char *extension,
char *dialplan,
char *context)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_session_transfer(session,extension,dialplan,context);
return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
}
-int fs_switch_ivr_speak_text (char *uuid,
+int fs_switch_ivr_speak_text (switch_core_session_t *session,
char *tts_name,
char *voice_name,
char *timer_name,
@@ -339,9 +297,6 @@
void *buf,
unsigned int buflen)
{
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
switch_status_t status;
status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen);
@@ -355,28 +310,17 @@
*/
-char* fs_switch_channel_get_variable(char *uuid, char *varname)
+char* fs_switch_channel_get_variable(switch_channel_t *channel, char *varname)
{
- switch_channel_t *channel;
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
- channel = switch_core_session_get_channel(session);
return switch_channel_get_variable(channel, varname);
}
-int fs_switch_channel_set_variable(char *uuid, char *varname, char *value)
+int fs_switch_channel_set_variable(switch_channel_t *channel, char *varname, char *value)
{
- switch_channel_t *channel;
- switch_core_session_t *session;
- session = fs_core_session_locate(uuid);
-
-
switch_status_t status;
- channel = switch_core_session_get_channel(session);
+
status = switch_channel_set_variable(channel, varname, value);
return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
}
-//char*
Modified: freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c Mon Sep 11 21:23:53 2006
@@ -885,12 +885,13 @@
#define SWIGTYPE_p_p_switch_core_session_t swig_types[0]
#define SWIGTYPE_p_p_void swig_types[1]
-#define SWIGTYPE_p_switch_core_session_t swig_types[2]
-#define SWIGTYPE_p_switch_file_handle_t swig_types[3]
-#define SWIGTYPE_p_switch_input_callback_function_t swig_types[4]
-#define SWIGTYPE_p_uint32_t swig_types[5]
-static swig_type_info *swig_types[7];
-static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
+#define SWIGTYPE_p_switch_channel_t swig_types[2]
+#define SWIGTYPE_p_switch_core_session_t swig_types[3]
+#define SWIGTYPE_p_switch_file_handle_t swig_types[4]
+#define SWIGTYPE_p_switch_input_callback_function_t swig_types[5]
+#define SWIGTYPE_p_uint32_t swig_types[6]
+static swig_type_info *swig_types[8];
+static swig_module_info swig_module = {swig_types, 7, 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)
@@ -1012,6 +1013,7 @@
static swig_type_info _swigt__p_p_switch_core_session_t = {"_p_p_switch_core_session_t", "switch_core_session_t **", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_switch_channel_t = {"_p_switch_channel_t", "switch_channel_t *", 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_file_handle_t = {"_p_switch_file_handle_t", "switch_file_handle_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};
@@ -1020,6 +1022,7 @@
static swig_type_info *swig_type_initial[] = {
&_swigt__p_p_switch_core_session_t,
&_swigt__p_p_void,
+ &_swigt__p_switch_channel_t,
&_swigt__p_switch_core_session_t,
&_swigt__p_switch_file_handle_t,
&_swigt__p_switch_input_callback_function_t,
@@ -1028,6 +1031,7 @@
static swig_cast_info _swigc__p_p_switch_core_session_t[] = { {&_swigt__p_p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}};
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_channel_t[] = { {&_swigt__p_switch_channel_t, 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_file_handle_t[] = { {&_swigt__p_switch_file_handle_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}};
@@ -1036,6 +1040,7 @@
static swig_cast_info *swig_cast_initial[] = {
_swigc__p_p_switch_core_session_t,
_swigc__p_p_void,
+ _swigc__p_switch_channel_t,
_swigc__p_switch_core_session_t,
_swigc__p_switch_file_handle_t,
_swigc__p_switch_input_callback_function_t,
@@ -1047,6 +1052,7 @@
/* end header section */
/* vdecl subsection */
+static int le_swig__p_switch_channel_t=0; /* handle for */
static int le_swig__p_switch_file_handle_t=0; /* handle for */
static int le_swig__p_switch_core_session_t=0; /* handle for */
static int le_swig__p_p_switch_core_session_t=0; /* handle for */
@@ -1253,7 +1259,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_channel_answer) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
zval **args[1];
SWIG_ResetError();
@@ -1262,10 +1268,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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);
@@ -1276,7 +1282,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_channel_pre_answer) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
zval **args[1];
SWIG_ResetError();
@@ -1285,10 +1291,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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);
@@ -1299,7 +1305,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_channel_hangup) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
zval **args[2];
@@ -1309,10 +1315,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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@*/
@@ -1329,7 +1335,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_variable) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) 0 ;
zval **args[3];
@@ -1340,10 +1346,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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@*/
@@ -1366,7 +1372,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_channel_get_variable) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
zval **args[2];
@@ -1376,10 +1382,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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@*/
@@ -1396,7 +1402,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
zval **args[2];
@@ -1406,10 +1412,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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@*/
@@ -1426,7 +1432,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) 0 ;
switch_input_callback_function_t arg4 ;
@@ -1442,10 +1448,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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@*/
@@ -1490,7 +1496,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_record_file) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
switch_file_handle_t *arg2 = (switch_file_handle_t *) 0 ;
char *arg3 = (char *) 0 ;
switch_input_callback_function_t arg4 ;
@@ -1506,10 +1512,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_record_file. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
/* typemap(in) SWIGTYPE * */
@@ -1554,7 +1560,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_sleep) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
uint32_t arg2 ;
int result;
uint32_t *tmp2 ;
@@ -1566,10 +1572,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_sleep. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
if(SWIG_ConvertPtr(*args[1], (void **) &tmp2, SWIGTYPE_p_uint32_t, 0) < 0) {
@@ -1588,7 +1594,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file2) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
int result;
zval **args[2];
@@ -1599,10 +1605,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_file2. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
/*@SWIG:CONVERT_STRING_IN@*/
@@ -1621,7 +1627,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_callback) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
switch_input_callback_function_t arg2 ;
void *arg3 = (void *) 0 ;
unsigned int arg4 ;
@@ -1635,10 +1641,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_collect_digits_callback. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
if(SWIG_ConvertPtr(*args[1], (void **) &tmp2, SWIGTYPE_p_switch_input_callback_function_t, 0) < 0) {
@@ -1671,7 +1677,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_collect_digits_count) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
unsigned int arg3 ;
unsigned int arg4 ;
@@ -1687,10 +1693,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_collect_digits_count. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
/*@SWIG:CONVERT_STRING_IN@*/
@@ -1739,7 +1745,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_originate) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
char *arg3 = (char *) 0 ;
uint32_t arg4 ;
@@ -1753,10 +1759,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_originate. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
/* typemap(in) SWIGTYPE * */
@@ -1787,7 +1793,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_session_transfer) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) 0 ;
char *arg4 = (char *) 0 ;
@@ -1800,10 +1806,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_session_transfer. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
/*@SWIG:CONVERT_STRING_IN@*/
@@ -1834,7 +1840,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_speak_text) {
- char *arg1 = (char *) 0 ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) 0 ;
char *arg4 = (char *) 0 ;
@@ -1854,10 +1860,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* 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_switch_ivr_speak_text. Expected SWIGTYPE_p_switch_core_session_t");
+ }
}
{
/*@SWIG:CONVERT_STRING_IN@*/
@@ -1920,7 +1926,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_get_variable) {
- char *arg1 = (char *) 0 ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
char *arg2 = (char *) 0 ;
char *result = 0 ;
zval **args[2];
@@ -1931,10 +1937,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* typemap(in) SWIGTYPE * */
+ if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_channel_t, 0) < 0) {
+ SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_switch_channel_get_variable. Expected SWIGTYPE_p_switch_channel_t");
+ }
}
{
/*@SWIG:CONVERT_STRING_IN@*/
@@ -1957,7 +1963,7 @@
ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable) {
- char *arg1 = (char *) 0 ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) 0 ;
int result;
@@ -1969,10 +1975,10 @@
}
{
- /*@SWIG:CONVERT_STRING_IN@*/
- convert_to_string_ex(args[0]);
- arg1 = (char *) Z_STRVAL_PP(args[0]);
- /*@SWIG@*/;
+ /* typemap(in) SWIGTYPE * */
+ if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_switch_channel_t, 0) < 0) {
+ SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of fs_switch_channel_set_variable. Expected SWIGTYPE_p_switch_channel_t");
+ }
}
{
/*@SWIG:CONVERT_STRING_IN@*/
@@ -1997,6 +2003,10 @@
/* NEW Destructor style */
+static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_channel_t) {
+ /* bah! No destructor for this simple type!! */
+}
+/* NEW Destructor style */
static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_switch_file_handle_t) {
/* bah! No destructor for this simple type!! */
}
@@ -2250,6 +2260,8 @@
ZEND_INIT_MODULE_GLOBALS(freeswitch, freeswitch_init_globals, freeswitch_destroy_globals);
/* Register resource destructors for pointer types */
+le_swig__p_switch_channel_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_channel_t,NULL,(char *)(SWIGTYPE_p_switch_channel_t->name),module_number);
+SWIG_TypeClientData(SWIGTYPE_p_switch_channel_t,&le_swig__p_switch_channel_t);
le_swig__p_switch_file_handle_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_file_handle_t,NULL,(char *)(SWIGTYPE_p_switch_file_handle_t->name),module_number);
SWIG_TypeClientData(SWIGTYPE_p_switch_file_handle_t,&le_swig__p_switch_file_handle_t);
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);
1
0
Author: anthm
Date: Mon Sep 11 19:58:52 2006
New Revision: 2645
Modified:
freeswitch/trunk/src/switch.c
freeswitch/trunk/src/switch_core.c
Log:
less priority
Modified: freeswitch/trunk/src/switch.c
==============================================================================
--- freeswitch/trunk/src/switch.c (original)
+++ freeswitch/trunk/src/switch.c Mon Sep 11 19:58:52 2006
@@ -62,7 +62,7 @@
#ifdef WIN32
SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
#else
- nice(-20);
+ //nice(-20);
#endif
}
Modified: freeswitch/trunk/src/switch_core.c
==============================================================================
--- freeswitch/trunk/src/switch_core.c (original)
+++ freeswitch/trunk/src/switch_core.c Mon Sep 11 19:58:52 2006
@@ -3596,7 +3596,9 @@
}
#ifdef HAVE_MLOCKALL
+#ifdef USE_MLOCKALL
mlockall(MCL_CURRENT|MCL_FUTURE);
+#endif
#endif
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nFreeSWITCH Version %s Started.\nCrash Protection [%s]\nMax Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, switch_core_session_limit(0));
1
0
[commit] r2644 - in freeswitch/trunk: libs/iax/src src/mod/endpoints/mod_iax
by Freeswitch SVN 11 Sep '06
by Freeswitch SVN 11 Sep '06
11 Sep '06
Author: anthm
Date: Mon Sep 11 18:52:19 2006
New Revision: 2644
Modified:
freeswitch/trunk/libs/iax/src/iax.c
freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c
Log:
iax
Modified: freeswitch/trunk/libs/iax/src/iax.c
==============================================================================
--- freeswitch/trunk/libs/iax/src/iax.c (original)
+++ freeswitch/trunk/libs/iax/src/iax.c Mon Sep 11 18:52:19 2006
@@ -904,6 +904,7 @@
}
if (netfd > -1) {
+ shutdown(netfd, 2);
close(netfd);
}
Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Sep 11 18:52:19 2006
@@ -75,6 +75,7 @@
char *codec_rates[SWITCH_MAX_CODECS];
int codec_rates_last;
unsigned int flags;
+ switch_port_t fd;
} globals;
struct private_object {
@@ -916,7 +917,7 @@
iax_set_error(iax_err_cb);
iax_set_output(iax_out_cb);
- //netfd = iax_get_fd();
+ globals.fd = iax_get_fd();
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "IAX Ready Port %d\n", globals.port);
@@ -933,9 +934,10 @@
}
/* Wait for an event. */
- if ((iaxevent = iax_get_event(0)) == NULL) {
- switch_yield(100);
- continue;
+ if ((iaxevent = iax_get_event(-1)) == NULL) {
+ //switch_yield(100);
+ //continue;
+ break;
} else {
struct private_object *tech_pvt = iax_get_private(iaxevent->session);
@@ -1160,6 +1162,10 @@
running = -1;
+ if (globals.fd) {
+ /* Die Mutha $%#$@% Die Mutha $#%#$^ Die*/
+ shutdown(globals.fd, 2);
+ }
iax_shutdown();
while (running) {
1
0