September 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2675 - freeswitch/trunk
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 19:42:37 2006 New Revision: 2675 Modified: freeswitch/trunk/AUTHORS Log: update AUTHORS Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Tue Sep 12 19:42:37 2006 @@ -25,7 +25,7 @@ Johny Kadarisman <jkr888(a)gmail.com> Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) Stefan Knoblich - Various patches and support. Thanks. - Justin Unger - Lots of help with patches and SIP testing. Thanks! + Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! A big THANK YOU goes to:

1 0

[commit] r2674 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 19:41:42 2006 New Revision: 2674 Modified: freeswitch/trunk/src/switch_ivr.c Log: a little more cause stuff Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Sep 12 19:41:42 2006 @@ -1836,23 +1836,18 @@ if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { *bleg = peer_session; - if (caller_channel) { - switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); - } status = SWITCH_STATUS_SUCCESS; } else { - if (caller_channel) { - switch_channel_set_variable(caller_channel, "originate_disposition", "no answer"); - switch_channel_hangup(caller_channel, SWITCH_CAUSE_NO_ANSWER); - } status = SWITCH_STATUS_FALSE; } - done: *cause = SWITCH_CAUSE_UNALLOCATED; if (status == SWITCH_STATUS_SUCCESS) { + if (caller_channel) { + switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); } else { if (peer_channel) { @@ -1862,10 +1857,13 @@ if (!peer_channels[i]) { continue; } - + *cause = switch_channel_get_cause(peer_channels[i]); break; } + } + if (caller_channel) { + switch_channel_set_variable(caller_channel, "originate_disposition", switch_channel_cause2str(*cause)); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Error Cause: %d [%s]\n", *cause, switch_channel_cause2str(*cause)); }

1 0

[commit] r2673 - in freeswitch/trunk/src/mod/languages/mod_mono: . mod_mono
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: james Date: Tue Sep 12 19:39:18 2006 New Revision: 2673 Added: freeswitch/trunk/src/mod/languages/mod_mono/Makefile - copied unchanged from r2662, /freeswitch/trunk/src/mod/languages/mod_mono/mod_mono/Makefile freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c - copied unchanged from r2662, /freeswitch/trunk/src/mod/languages/mod_mono/mod_mono/mod_mono.c Removed: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono/ Log: Accidently importing into a subdir.

1 0

[commit] r2672 - freeswitch/trunk
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 19:24:52 2006 New Revision: 2672 Modified: freeswitch/trunk/AUTHORS Log: update AUTHORS Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Tue Sep 12 19:24:52 2006 @@ -18,13 +18,15 @@ Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs, and moral support. Xcode project files. - Joshua Colp - For his help making mod_exosip possible, and for just being a swell guy! + Joshua Colp - For his help making mod_exosip possible (which we are now getting rid of but oh well), + and for just being a swell guy! (until he backstabbed us, c'est la vie) Michal "cypromis" Bielicki (michal.bielicki AT halo2.pl) - Solaris porting, and autotools enhancements. James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888(a)gmail.com> Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) Stefan Knoblich - Various patches and support. Thanks. - + Justin Unger - Lots of help with patches and SIP testing. Thanks! + A big THANK YOU goes to: Justin Cassidy - Build related cleanups and automatic build setup.

1 0

[commit] r2671 - in freeswitch/trunk/src: . mod/applications/mod_bridgecall
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 19:20:40 2006 New Revision: 2671 Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/switch_ivr.c Log: cause code goodies 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 Tue Sep 12 19:20:40 2006 @@ -53,7 +53,8 @@ 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); + /* Hangup the channel with the cause code from the failed originate.*/ + switch_channel_hangup(caller_channel, cause); return; } else { switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Sep 12 19:20:40 2006 @@ -1555,7 +1555,7 @@ switch_channel_t *caller_channel = NULL; switch_memory_pool_t *pool = NULL; char *data = NULL; - int i, argc; + int i, argc = 0; int32_t idx = -1; switch_codec_t write_codec = {0}; switch_frame_t write_frame = {0}; @@ -1850,17 +1850,33 @@ done: - if (caller_channel) { - *cause = switch_channel_get_cause(caller_channel); + *cause = SWITCH_CAUSE_UNALLOCATED; + + if (status == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); } else { - *cause = SWITCH_CAUSE_CHANNEL_UNACCEPTABLE; + if (peer_channel) { + *cause = switch_channel_get_cause(peer_channel); + } else { + for (i = 0; i < argc; i++) { + if (!peer_channels[i]) { + continue; + } + + *cause = switch_channel_get_cause(peer_channels[i]); + break; + } + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Error Cause: %d [%s]\n", *cause, switch_channel_cause2str(*cause)); } + if (odata) { free(odata); } if (!pass && write_codec.implementation) { switch_core_codec_destroy(&write_codec); } + return status; }

1 0

[commit] r2670 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/endpoints/mod_sofia
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 18:24:39 2006 New Revision: 2670 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: add justinu's patch 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 Tue Sep 12 18:24:39 2006 @@ -80,7 +80,8 @@ CFLAG_DYNAMIC = (1 << 1), CFLAG_ENFORCE_MIN = (1 << 2), CFLAG_DESTRUCT = (1 << 3), - CFLAG_LOCKED = (1 << 4) + CFLAG_LOCKED = (1 << 4), + CFLAG_ANSWERED = (1 << 5) } conf_flag_t; typedef enum { @@ -127,6 +128,7 @@ char *bad_pin_sound; char *profile_name; uint32_t flags; + switch_call_cause_t bridge_hangup_cause; switch_mutex_t *flag_mutex; uint32_t rate; uint32_t interval; @@ -645,7 +647,13 @@ for(imember = conference->members; imember; imember = imember->next) { switch_channel_t *channel = switch_core_session_get_channel(imember->session); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + // add this little bit to preserve the bridge cause code in case of an early media call that + // never answers + if (switch_test_flag(conference, CFLAG_ANSWERED)) + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + else + // put actual cause code from outbound channel hangup here + switch_channel_hangup(channel, conference->bridge_hangup_cause); switch_clear_flag_locked(imember, MFLAG_RUNNING); } @@ -698,12 +706,6 @@ return; } - if (!switch_channel_test_flag(channel, CF_OUTBOUND)) { - /* Answer the channel */ - switch_channel_answer(channel); - } - - /* Prepare the write frame */ write_frame.data = data; write_frame.buflen = sizeof(data); write_frame.codec = &member->write_codec; @@ -723,7 +725,20 @@ if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) { switch_event_destroy(&event); } - +#if 1 + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + // test to see if outbound channel has answered + if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED"); + switch_set_flag(member->conference, CFLAG_ANSWERED); + } + } else { + if (switch_test_flag(member->conference, CFLAG_ANSWERED) && !switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n"); + switch_channel_answer(channel); + } + } +#endif if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); @@ -946,6 +961,15 @@ switch_clear_flag_locked(member, MFLAG_RUNNING); switch_core_timer_destroy(&timer); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n", + switch_channel_cause2str(switch_channel_get_cause(channel))); + + // if it's an outbound channel, store the release cause in the conference struct, we might need it + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + member->conference->bridge_hangup_cause = switch_channel_get_cause(channel); + } + /* Wait for the input thead to end */ while(switch_test_flag(member, MFLAG_ITHREAD)) { switch_yield(1000); @@ -2055,7 +2079,8 @@ cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", + switch_channel_cause2str(cause)); if (session) { caller_channel = switch_core_session_get_channel(session); switch_channel_hangup(caller_channel, cause); @@ -2319,7 +2344,9 @@ if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { goto done; } - } + } //else + // if we're not using "bridge:" set the conference answered flag + //switch_set_flag(conference, CFLAG_ANSWERED); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Sep 12 18:24:39 2006 @@ -532,14 +532,69 @@ return SWITCH_STATUS_SUCCESS; } +// map QSIG cause codes to SIP ala RFC4497 +static int hangup_cause_to_sip(switch_call_cause_t cause) { + switch (cause) { + case SWITCH_CAUSE_UNALLOCATED: + case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET: + case SWITCH_CAUSE_NO_ROUTE_DESTINATION: + return 404; + case SWITCH_CAUSE_USER_BUSY: + return 486; + case SWITCH_CAUSE_NO_USER_RESPONSE: + return 408; + case SWITCH_CAUSE_NO_ANSWER: + return 480; + case SWITCH_CAUSE_CALL_REJECTED: + return 603; + case SWITCH_CAUSE_NUMBER_CHANGED: + return 410; + case SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER: + return 502; + case SWITCH_CAUSE_INVALID_NUMBER_FORMAT: + return 484; + case SWITCH_CAUSE_FACILITY_REJECTED: + return 501; + case SWITCH_CAUSE_NORMAL_UNSPECIFIED: + return 480; + case SWITCH_CAUSE_NORMAL_CIRCUIT_CONGESTION: + case SWITCH_CAUSE_NETWORK_OUT_OF_ORDER: + case SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE: + case SWITCH_CAUSE_SWITCH_CONGESTION: + return 503; + case SWITCH_CAUSE_OUTGOING_CALL_BARRED: + case SWITCH_CAUSE_INCOMING_CALL_BARRED: + case SWITCH_CAUSE_BEARERCAPABILITY_NOTAUTH: + return 403; + case SWITCH_CAUSE_BEARERCAPABILITY_NOTAVAIL: + return 503; + case SWITCH_CAUSE_BEARERCAPABILITY_NOTIMPL: + return 488; + case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED: + return 501; + case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION: + return 503; + case SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE: + return 504; + default: + return 500; + } + +} + static switch_status_t sofia_on_hangup(switch_core_session_t *session) { private_object_t *tech_pvt; switch_channel_t *channel = NULL; + switch_call_cause_t cause; + int sip_cause; channel = switch_core_session_get_channel(session); assert(channel != NULL); + cause = switch_channel_get_cause(channel); + sip_cause = hangup_cause_to_sip(cause); + tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); @@ -547,14 +602,18 @@ su_home_deinit(tech_pvt->home); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s, SIP response: %d\n", + switch_channel_get_name(channel), switch_channel_cause2str(cause), sip_cause); - if (tech_pvt->nh) { if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { if (switch_test_flag(tech_pvt, TFLAG_ANS)) { nua_bye(tech_pvt->nh, TAG_END()); } else { - nua_cancel(tech_pvt->nh, TAG_END()); + if (switch_test_flag(tech_pvt, TFLAG_INBOUND)) + nua_respond(tech_pvt->nh, sip_cause, NULL, TAG_END()); + else + nua_cancel(tech_pvt->nh, TAG_END()); } } nua_handle_bind(tech_pvt->nh, NULL); @@ -565,8 +624,6 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_clear_flag_locked(tech_pvt, TFLAG_IO); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA HANGUP\n"); - return SWITCH_STATUS_SUCCESS; } @@ -1198,6 +1255,57 @@ return match; } +// map sip responses to QSIG cause codes ala RFC4497 +static switch_call_cause_t sip_cause_to_freeswitch(int status) { + switch (status) { + case 200: + return SWITCH_CAUSE_NORMAL_CLEARING; + case 401: + case 402: + case 403: + case 407: + case 603: + return SWITCH_CAUSE_CALL_REJECTED; + case 404: + case 485: + case 604: + return SWITCH_CAUSE_UNALLOCATED; + case 408: + case 504: + return SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE; + case 410: + return SWITCH_CAUSE_NUMBER_CHANGED; + case 413: + case 414: + case 416: + case 420: + case 421: + case 423: + case 505: + case 513: + return SWITCH_CAUSE_INTERWORKING; + case 480: + return SWITCH_CAUSE_NO_USER_RESPONSE; + case 400: + case 481: + case 500: + case 503: + return SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE; + case 486: + case 600: + return SWITCH_CAUSE_USER_BUSY; + case 484: + return SWITCH_CAUSE_INVALID_NUMBER_FORMAT; + case 488: + case 606: + return SWITCH_CAUSE_BEARERCAPABILITY_NOTIMPL; + case 502: + return SWITCH_CAUSE_NETWORK_OUT_OF_ORDER; + default: + return SWITCH_CAUSE_NORMAL_UNSPECIFIED; + } +} + static void sip_i_state(int status, char const *phrase, nua_t *nua, @@ -1362,7 +1470,7 @@ case nua_callstate_terminated: if (session) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); - terminate_session(&session, SWITCH_CAUSE_NORMAL_CLEARING, __LINE__); + terminate_session(&session, sip_cause_to_freeswitch(status), __LINE__); } break; } @@ -1445,8 +1553,8 @@ tagi_t tags[]) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "event [%s] status [%d] [%s]\n", - nua_event_name (event), status, phrase); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "channel [%s] event [%s] status [%d] [%s]\n", + session ? switch_channel_get_name(switch_core_session_get_channel(session)) : "null",nua_event_name (event), status, phrase); switch (event) { case nua_r_shutdown: Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Sep 12 18:24:39 2006 @@ -2372,7 +2372,7 @@ static void switch_core_standard_on_hangup(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HANGUP %s\n", switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HANGUP %s, cause: %s\n", switch_channel_get_name(session->channel),switch_channel_cause2str(switch_channel_get_cause(session->channel))); }

1 0

[commit] r2669 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_exosip mod/endpoints/mod_sofia mod/timers/mod_softtimer
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 18:23:45 2006 New Revision: 2669 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_rtp.c Log: enhance timers and make rtp use it that way Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Sep 12 18:23:45 2006 @@ -788,6 +788,20 @@ SWITCH_DECLARE(int) switch_core_timer_next(switch_timer_t *timer); /*! + \brief Step the timer one step + \param timer the timer to wait on + \return the newest sample count +*/ +SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer); + +/*! + \brief Check if the current step has been exceeded + \param timer the timer to wait on + \return the newest sample count +*/ +SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer); + +/*! \brief Destroy an allocated timer \param timer timer to destroy \return SWITCH_STATUS_SUCCESS after destruction Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Tue Sep 12 18:23:45 2006 @@ -240,6 +240,10 @@ switch_status_t (*timer_init)(switch_timer_t *); /*! function to wait for one cycle to pass */ switch_status_t (*timer_next)(switch_timer_t *); + /*! function to step the timer one step */ + switch_status_t (*timer_step)(switch_timer_t *); + /*! function to check if the current step has expired */ + switch_status_t (*timer_check)(switch_timer_t *); /*! function to deallocate the timer */ switch_status_t (*timer_destroy)(switch_timer_t *); const struct switch_timer_interface *next; Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Sep 12 18:23:45 2006 @@ -77,13 +77,14 @@ \return the new RTP session or NULL on failure */ SWITCH_DECLARE(switch_status_t)switch_rtp_create(switch_rtp_t **new_rtp_session, - switch_payload_t payload, - uint32_t packet_size, - uint32_t ms_per_packet, - switch_rtp_flag_t flags, - char *crypto_key, - const char **err, - switch_memory_pool_t *pool); + switch_payload_t payload, + uint32_t packet_size, + uint32_t ms_per_packet, + switch_rtp_flag_t flags, + char *crypto_key, + char *timer_name, + const char **err, + switch_memory_pool_t *pool); /*! @@ -102,16 +103,17 @@ \return the new RTP session or NULL on failure */ SWITCH_DECLARE(switch_rtp_t *)switch_rtp_new(char *rx_host, - switch_port_t rx_port, - char *tx_host, - switch_port_t tx_port, - switch_payload_t payload, - uint32_t packet_size, - uint32_t ms_per_packet, - switch_rtp_flag_t flags, - char *crypto_key, - const char **err, - switch_memory_pool_t *pool); + switch_port_t rx_port, + char *tx_host, + switch_port_t tx_port, + switch_payload_t payload, + uint32_t packet_size, + uint32_t ms_per_packet, + switch_rtp_flag_t flags, + char *crypto_key, + char *timer_name, + const char **err, + switch_memory_pool_t *pool); /*! Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Sep 12 18:23:45 2006 @@ -102,6 +102,7 @@ char *server; char *exten; char *context; + char *timer_name; ldl_handle_t *handle; uint32_t flags; uint32_t user_flags; @@ -343,6 +344,7 @@ tech_pvt->read_codec.implementation->microseconds_per_frame, flags, NULL, + tech_pvt->profile->timer_name, &err, switch_core_session_get_pool(tech_pvt->session)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP ERROR %s\n", err); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -1326,6 +1328,8 @@ profile->extip = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "server")) { profile->server = switch_core_strdup(module_pool, val); + } else if (!strcasecmp(var, "rtp-timer-name")) { + profile->timer_name = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "lanaddr")) { profile->lanaddr = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "tls")) { Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Tue Sep 12 18:23:45 2006 @@ -585,6 +585,7 @@ ms, flags, key, + "soft", &err, switch_core_session_get_pool(tech_pvt->session)); if (switch_rtp_ready(tech_pvt->rtp_session)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Sep 12 18:23:45 2006 @@ -111,6 +111,7 @@ char *username; char *url; char *sipdomain; + char *timer_name; int sip_port; char *codec_string; char *codec_order[SWITCH_MAX_CODECS]; @@ -697,6 +698,7 @@ tech_pvt->codec_ms * 1000, (switch_rtp_flag_t) flags, NULL, + tech_pvt->profile->timer_name, &err, switch_core_session_get_pool(tech_pvt->session)); @@ -1698,6 +1700,8 @@ profile->sipip = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "sip-domain")) { profile->sipdomain = switch_core_strdup(profile->pool, val); + } else if (!strcmp(var, "rtp-timer-name")) { + profile->timer_name = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "ext-sip-ip")) { profile->extsipip = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "bitpacking")) { Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Tue Sep 12 18:23:45 2006 @@ -48,7 +48,7 @@ #endif }; -static switch_status_t soft_timer_init(switch_timer_t *timer) +static inline switch_status_t soft_timer_init(switch_timer_t *timer) { struct timer_private *private; @@ -65,7 +65,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t soft_timer_next(switch_timer_t *timer) +static inline switch_status_t soft_timer_next(switch_timer_t *timer) { struct timer_private *private = timer->private_info; @@ -91,8 +91,45 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t soft_timer_destroy(switch_timer_t *timer) +static inline switch_status_t soft_timer_step(switch_timer_t *timer) { + struct timer_private *private = timer->private_info; +#ifdef WINTIMER + private->base.QuadPart += timer->interval * (private->freq.QuadPart / 1000); +#else + private->reference += timer->interval * 1000; +#endif + + return SWITCH_STATUS_SUCCESS; +} + + +static inline switch_status_t soft_timer_check(switch_timer_t *timer) + +{ + struct timer_private *private = timer->private_info; +#ifdef WINTIMER + QueryPerformanceCounter(&private->now); + if (private->now.QuadPart >= private->base.QuadPart) { + private->base.QuadPart += timer->interval * (private->freq.QuadPart / 1000); + return SWITCH_STATUS_SUCCESS; + } else { + return SWITCH_STATUS_FALSE; + } +#else + if (switch_time_now() < private->reference) { + return SWITCH_STATUS_FALSE; + } else { + private->reference += timer->interval * 1000; + return SWITCH_STATUS_SUCCESS; + } +#endif + +} + + +static inline switch_status_t soft_timer_destroy(switch_timer_t *timer) +{ timer->private_info = NULL; return SWITCH_STATUS_SUCCESS; } @@ -101,6 +138,8 @@ /*.interface_name */ "soft", /*.timer_init */ soft_timer_init, /*.timer_next */ soft_timer_next, + /*.timer_step */ soft_timer_step, + /*.timer_check */ soft_timer_check, /*.timer_destroy */ soft_timer_destroy }; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Sep 12 18:23:45 2006 @@ -1050,6 +1050,26 @@ } +SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer) +{ + if (!timer->timer_interface) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); + return SWITCH_STATUS_GENERR; + } + + return timer->timer_interface->timer_step(timer); +} + +SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer) +{ + if (!timer->timer_interface) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n"); + return SWITCH_STATUS_GENERR; + } + + return timer->timer_interface->timer_check(timer); +} + SWITCH_DECLARE(switch_status_t) switch_core_timer_destroy(switch_timer_t *timer) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Sep 12 18:23:45 2006 @@ -161,7 +161,6 @@ uint32_t packet_size; uint32_t rpacket_size; switch_time_t last_read; - switch_time_t next_read; uint32_t ms_per_packet; uint32_t remote_port; uint8_t stuncount; @@ -171,6 +170,7 @@ uint8_t mini; switch_payload_t te; switch_mutex_t *flag_mutex; + switch_timer_t timer; }; static int global_init = 0; @@ -353,13 +353,14 @@ } SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session, - switch_payload_t payload, - uint32_t packet_size, - uint32_t ms_per_packet, - switch_rtp_flag_t flags, - char *crypto_key, - const char **err, - switch_memory_pool_t *pool) + switch_payload_t payload, + uint32_t packet_size, + uint32_t ms_per_packet, + switch_rtp_flag_t flags, + char *crypto_key, + char *timer_name, + const char **err, + switch_memory_pool_t *pool) { switch_rtp_t *rtp_session = NULL; srtp_policy_t policy; @@ -456,7 +457,6 @@ rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->packet_size = packet_size; - rtp_session->next_read = switch_time_now() + rtp_session->ms_per_packet; if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { err_status_t stat; @@ -473,26 +473,33 @@ } } + if (!timer_name) { + timer_name = "soft"; + } + + switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, packet_size, rtp_session->pool); + *new_rtp_session = rtp_session; return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE(switch_rtp_t *)switch_rtp_new(char *rx_host, - switch_port_t rx_port, - char *tx_host, - switch_port_t tx_port, - switch_payload_t payload, - uint32_t packet_size, - uint32_t ms_per_packet, - switch_rtp_flag_t flags, - char *crypto_key, - const char **err, - switch_memory_pool_t *pool) + switch_port_t rx_port, + char *tx_host, + switch_port_t tx_port, + switch_payload_t payload, + uint32_t packet_size, + uint32_t ms_per_packet, + switch_rtp_flag_t flags, + char *crypto_key, + char *timer_name, + const char **err, + switch_memory_pool_t *pool) { switch_rtp_t *rtp_session; - if (switch_rtp_create(&rtp_session, payload, packet_size, ms_per_packet, flags, crypto_key, err, pool) != SWITCH_STATUS_SUCCESS) { + if (switch_rtp_create(&rtp_session, payload, packet_size, ms_per_packet, flags, crypto_key, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { return NULL; } @@ -573,6 +580,10 @@ srtp_dealloc((*rtp_session)->send_ctx); } + if ((*rtp_session)->timer.timer_interface) { + switch_core_timer_destroy(&(*rtp_session)->timer); + } + return; } @@ -714,6 +725,10 @@ for(;;) { bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes); + + if (!SWITCH_STATUS_IS_BREAK(status)) { + switch_core_timer_step(&rtp_session->timer); + } if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); @@ -773,17 +788,9 @@ } } } - - if ((switch_time_now() - rtp_session->next_read) > 1000) { + if (switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS) { do_2833(rtp_session); - - /* Set the next waypoint */ - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_TIMER_RECLOCK)) { - rtp_session->next_read = switch_time_now() + rtp_session->ms_per_packet; - } else { - rtp_session->next_read += rtp_session->ms_per_packet; - } - + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late!*/ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) { @@ -877,7 +884,6 @@ } rtp_session->last_read = switch_time_now(); - rtp_session->next_read += rtp_session->ms_per_packet; *payload_type = rtp_session->recv_msg.header.pt;

1 0

[commit] r2668 - freeswitch/trunk/src/mod/languages/mod_freehp
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 18:11:47 2006 New Revision: 2668 Modified: freeswitch/trunk/src/mod/languages/mod_freehp/Makefile freeswitch/trunk/src/mod/languages/mod_freehp/freeswitch.php freeswitch/trunk/src/mod/languages/mod_freehp/php_freeswitch.h freeswitch/trunk/src/mod/languages/mod_freehp/switch_swig_wrap.c Log: make sure it compiles Modified: freeswitch/trunk/src/mod/languages/mod_freehp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_freehp/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_freehp/Makefile Tue Sep 12 18:11:47 2006 @@ -7,11 +7,13 @@ MDIR += `$(PCFG) --extension-dir` PHPMOD=freeswitch PHPLDFLAGS = `$(PCFG) --ldflags` -lcrypt -lresolv -lm -ldl -lnsl -lxml2 -lz -lphp5 - +MOD_CFLAGS += -fPIC 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 --enable-debug + MOD_CFLAGS="$(MOD_CFLAGS)" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install zlib-1.2.3.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install php-5.1.6.tar.gz --prefix=$(PREFIX) --enable-embed=shared --enable-shared --with-pic --with-zlib=$(PREFIX) --with-curl --enable-maintainer-zts --with-tsrm-pthreads --enable-debug %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@ Modified: freeswitch/trunk/src/mod/languages/mod_freehp/freeswitch.php ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_freehp/freeswitch.php (original) +++ freeswitch/trunk/src/mod/languages/mod_freehp/freeswitch.php Tue Sep 12 18:11:47 2006 @@ -2,7 +2,7 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -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_freehp/php_freeswitch.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_freehp/php_freeswitch.h (original) +++ freeswitch/trunk/src/mod/languages/mod_freehp/php_freeswitch.h Tue Sep 12 18:11:47 2006 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -40,6 +40,10 @@ # define PHP_FREESWITCH_API #endif +#ifdef ZTS +#include "TSRM.h" +#endif + PHP_MINIT_FUNCTION(freeswitch); PHP_MSHUTDOWN_FUNCTION(freeswitch); PHP_RINIT_FUNCTION(freeswitch); @@ -72,24 +76,4 @@ 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_freehp/switch_swig_wrap.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_freehp/switch_swig_wrap.c (original) +++ freeswitch/trunk/src/mod/languages/mod_freehp/switch_swig_wrap.c Tue Sep 12 18:11:47 2006 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -8,72 +8,284 @@ * interface file instead. * ----------------------------------------------------------------------------- */ -/*************************************************************** -*- c -*- - * php4/precommon.swg - * - * Rename all exported symbols from common.swg, to avoid symbol - * clashes if multiple interpreters are included - * - ************************************************************************/ +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ -#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 +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif -/*********************************************************************** - * 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. - ************************************************************************/ +/* 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 -#include <string.h> -#include "switch.h" +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif -#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 +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY # endif -#else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a #endif -#ifdef SWIG_GLOBAL -# define SWIGRUNTIME(a) SWIGEXPORT(a) +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic CAPI SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "2" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) #else -# define SWIGRUNTIME(a) static a +# define SWIG_TYPE_TABLE_NAME #endif +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. + + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif + +/* Flags for pointer conversions */ +#define SWIG_POINTER_DISOWN 0x1 + +/* Flags for new pointer objects */ +#define SWIG_POINTER_OWN 0x1 + + +/* + Flags/methods for returning states. + + The swig conversion methods, as ConvertPtr, return and integer + that tells if the conversion was successful or not. And if not, + an error code can be returned (see swigerrors.swg for the codes). + + Use the following macros/flags to set or process the returning + states. + + In old swig versions, you usually write code as: + + if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { + // success code + } else { + //fail code + } + + Now you can be more explicit as: + + int res = SWIG_ConvertPtr(obj,vptr,ty.flags); + if (SWIG_IsOK(res)) { + // success code + } else { + // fail code + } + + that seems to be the same, but now you can also do + + Type *ptr; + int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); + if (SWIG_IsOK(res)) { + // success code + if (SWIG_IsNewObj(res) { + ... + delete *ptr; + } else { + ... + } + } else { + // fail code + } + + I.e., now SWIG_ConvertPtr can return new objects and you can + identify the case and take care of the deallocation. Of course that + requires also to SWIG_ConvertPtr to return new result values, as + + int SWIG_ConvertPtr(obj, ptr,...) { + if (<obj is ok>) { + if (<need new object>) { + *ptr = <ptr to new allocated object>; + return SWIG_NEWOBJ; + } else { + *ptr = <ptr to old object>; + return SWIG_OLDOBJ; + } + } else { + return SWIG_BADOBJ; + } + } + + Of course, returning the plain '0(success)/-1(fail)' still works, but you can be + more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the + swig errors code. + + Finally, if the SWIG_CASTRANK_MODE is enabled, the result code + allows to return the 'cast rank', for example, if you have this + + int food(double) + int fooi(int); + + and you call + + food(1) // cast rank '1' (1 -> 1.0) + fooi(1) // cast rank '0' + + just use the SWIG_AddCast()/SWIG_CheckState() + + + */ +#define SWIG_OK (0) +#define SWIG_ERROR (-1) +#define SWIG_IsOK(r) (r >= 0) +#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) + +/* The CastRankLimit says how many bits are used for the cast rank */ +#define SWIG_CASTRANKLIMIT (1 << 8) +/* The NewMask denotes the object was created (using new/malloc) */ +#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1) +/* The TmpMask is for in/out typemaps that use temporal objects */ +#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1) +/* Simple returning values */ +#define SWIG_BADOBJ (SWIG_ERROR) +#define SWIG_OLDOBJ (SWIG_OK) +#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) +#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) +/* Check, add and del mask methods */ +#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) +#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) +#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) +#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r) +#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) +#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) + + +/* Cast-Rank Mode */ +#if defined(SWIG_CASTRANK_MODE) +# ifndef SWIG_TypeRank +# define SWIG_TypeRank unsigned long +# endif +# ifndef SWIG_MAXCASTRANK /* Default cast allowed */ +# define SWIG_MAXCASTRANK (2) +# endif +# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) +# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) +SWIGINTERNINLINE int SWIG_AddCast(int r) { + return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; +} +SWIGINTERNINLINE int SWIG_CheckState(int r) { + return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; +} +#else /* no cast-rank mode */ +# define SWIG_AddCast +# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) +#endif + + + + +#include <string.h> +#include "switch.h" + #ifdef __cplusplus extern "C" { #endif @@ -81,106 +293,141 @@ 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; - swig_converter_func converter; - const char *str; - void *clientdata; - swig_dycast_func dcast; - struct swig_type_info *next; - struct swig_type_info *prev; + const char *name; /* mangled name of this type */ + const char *str; /* human readable name of this type */ + swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ + struct swig_cast_info *cast; /* linked list of types that can cast into this type */ + void *clientdata; /* language specific type data */ + int owndata; /* flag if the structure owns the clientdata */ } swig_type_info; -#ifdef SWIG_NOINCLUDE +/* 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; -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); +/* 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; -#else +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class<int>" == "Class<int >", etc. -static swig_type_info *swig_type_list = 0; + 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); +} -/* 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; +/* + 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; } - tc = tc->prev; + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; } - head = ti; - next = 0; + return equiv; +} - /* 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++; +/* + 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; } - if (next) next->prev = head; - head->next = next; - return ret; + return equiv; } -/* 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; + +/* 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); } -/* 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); +/* 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); } -/* Dynamic pointer casting. Down an inheritance hierarchy */ -SWIGRUNTIME(swig_type_info *) +/* + Cast a pointer up an inheritance hierarchy +*/ +SWIGRUNTIMEINLINE void * +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); +} + +/* + Dynamic pointer casting. Down an inheritance hierarchy +*/ +SWIGRUNTIME swig_type_info * SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { swig_type_info *lastty = ty; if (!ty || !ty->dcast) return ty; @@ -191,94 +438,251 @@ return lastty; } -/* Return the name associated with this type */ -SWIGRUNTIME(const char *) +/* + Return the name associated with this type +*/ +SWIGRUNTIMEINLINE const char * SWIG_TypeName(const swig_type_info *ty) { return ty->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; +/* + 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; } - return 0; + else + return type->name; } -/* 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_type_info *tc, *equiv; - if (ti->clientdata == clientdata) return; + swig_cast_info *cast = ti->cast; + /* if (ti->clientdata == clientdata) return; */ ti->clientdata = 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; + + while (cast) { + if (!cast->converter) { + swig_type_info *tc = cast->type; + if (!tc->clientdata) { + SWIG_TypeClientData(tc, clientdata); } + } + cast = cast->next; + } +} +SWIGRUNTIME void +SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { + SWIG_TypeClientData(ti, clientdata); + ti->owndata = 1; +} + +/* + Search for a swig_type_info structure only by mangled name + Search is a O(log #types) + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + swig_module_info *iter = start; + do { + if (iter->size) { + register size_t l = 0; + register size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ + register size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { + register int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { + if (i) { + r = i - 1; + } else { + break; + } + } else if (compare > 0) { + l = i + 1; + } + } else { + break; /* should never happen */ + } + } while (l <= r); } - equiv = equiv->next; + iter = iter->next; + } while (iter != end); + return 0; +} + +/* + Search for a swig_type_info structure for either a mangled name or a human readable name. + It first searches the mangled names of the types, which is a O(log #types) + If a type is not found it then searches the human readable names, which is O(#types). + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + /* STEP 1: Search the name field using binary search */ + swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); + if (ret) { + return ret; + } else { + /* STEP 2: If the type hasn't been found, do a complete search + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { + register size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; + } + iter = iter->next; + } while (iter != end); } + + /* neither found a match */ + return 0; } -/* Pack binary data into a string */ -SWIGRUNTIME(char *) -SWIG_PackData(char *c, void *ptr, 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; +/* + Pack binary data into a string +*/ +SWIGRUNTIME char * +SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; + register const unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register unsigned char uu = *u; *(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[uu & 0xf]; } return c; } -/* Unpack binary data from a string */ -SWIGRUNTIME(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++); +/* + Unpack binary data from a string +*/ +SWIGRUNTIME const char * +SWIG_UnpackData(const char *c, void *ptr, size_t sz) { + register unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register char d = *(c++); + register unsigned char uu; if ((d >= '0') && (d <= '9')) uu = ((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) uu = ((d - ('a'-10)) << 4); + else + return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) uu |= (d - '0'); else if ((d >= 'a') && (d <= 'f')) uu |= (d - ('a'-10)); + else + return (char *) 0; *u = uu; } return c; } -#endif +/* + Pack 'void *' into a string buffer. +*/ +SWIGRUNTIME char * +SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { + char *r = buff; + if ((2*sizeof(void *) + 2) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + if (strlen(name) + 1 > (bsz - (r - buff))) return 0; + strcpy(r,name); + return buff; +} +SWIGRUNTIME const char * +SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + *ptr = (void *) 0; + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sizeof(void *)); +} + +SWIGRUNTIME char * +SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { + char *r = buff; + size_t lname = (name ? strlen(name) : 0); + if ((2*sz + 2 + lname) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + if (lname) { + strncpy(r,name,lname+1); + } else { + *r = 0; + } + return buff; +} + +SWIGRUNTIME const char * +SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + memset(ptr,0,sz); + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sz); +} + #ifdef __cplusplus } #endif -/* - * php4.swg +/* ----------------------------------------------------------------------------- + * 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 runtime library + * php4run.swg * - */ + * PHP4 runtime library + * ----------------------------------------------------------------------------- */ #ifdef __cplusplus extern "C" { @@ -306,6 +710,28 @@ } #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 { @@ -313,56 +739,24 @@ 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) -SWIGRUNTIME(void) +static void SWIG_ZTS_SetPointerZval(zval *z, void *ptr, swig_type_info *type, int newobject, zend_module_entry* module_entry TSRMLS_DC) { swig_object_wrapper *value=NULL; - /* No need to call SWIG_MakePtr here! */ + /* + * First test for Null pointers. Return those as PHP native NULL + */ + if (!ptr ) { + ZVAL_NULL(z); + return; + } if (type->clientdata) { - if (! (*(int *)(type->clientdata))) zend_error(E_ERROR, "Type: %s failed to register with zend",type->name); + 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; @@ -374,55 +768,6 @@ } } -/* 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 @@ -434,9 +779,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. */ -SWIGRUNTIME(int) +static int SWIG_ZTS_ConvertResourceData(void * p, int type, const char *type_name, void **ptr, swig_type_info *ty TSRMLS_DC) { - swig_type_info *tc; + swig_cast_info *tc; if (ty) { if (! type_name) { @@ -459,32 +804,30 @@ /* 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. */ -SWIGRUNTIME(int) -SWIG_ZTS_ConvertResourcePtr(zval *z, void **ptr, swig_type_info *ty TSRMLS_DC) { +static int +SWIG_ZTS_ConvertResourcePtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) { swig_object_wrapper *value; void *p; int type; char *type_name; value = (swig_object_wrapper *) zend_list_find(z->value.lval,&type); + if ( flags && SWIG_POINTER_DISOWN ) { + value->newobject = 0; + } p = value->ptr; if (type==-1) return -1; - type_name=zend_rsrc_list_get_rsrc_type(z->value.lval); + type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC); return SWIG_ZTS_ConvertResourceData(p,type,type_name,ptr,ty TSRMLS_CC); } -/* 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 */ -SWIGRUNTIME(int) -SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty TSRMLS_DC) { +static int +SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC) { char *c; zval *val; @@ -499,14 +842,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 TSRMLS_CC); + return SWIG_ZTS_ConvertResourcePtr(*_cPtr,ptr,ty, flags TSRMLS_CC); } else goto type_error; /* _cPtr was not string or resource property */ } else goto type_error; /* can't find property _cPtr */ } else if (z->type==IS_RESOURCE) { - return SWIG_ZTS_ConvertResourcePtr(z,ptr,ty TSRMLS_CC); - } else if (z->type==IS_STRING) { - c = Z_STRVAL_P(z); - return SWIG_ConvertPtr_(c,ptr,ty); + return SWIG_ZTS_ConvertResourcePtr(z,ptr,ty, flags TSRMLS_CC); + } if (z->type==IS_NULL ) { + *ptr = 0; + return 0; } else goto type_error; type_error: @@ -514,17 +857,43 @@ 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_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] +#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] 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) -------- */ @@ -547,9 +916,31 @@ | | +----------------------------------------------------------------------+ */ -#define SWIG_init initfreeswitch +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_name "freeswitch" +static void freeswitch_init_globals(zend_freeswitch_globals *freeswitch_globals ) { + freeswitch_globals->error_msg = default_error_msg; + freeswitch_globals->error_code = default_error_code; +} +static void freeswitch_destroy_globals(zend_freeswitch_globals *freeswitch_globals) { } + +void SWIG_ResetError() { + TSRMLS_FETCH(); + ErrorMsg() = default_error_msg; + ErrorCode() = default_error_code; +} +#define SWIG_name "freeswitch" #ifdef __cplusplus extern "C" { #endif @@ -561,32 +952,6 @@ } #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" @@ -596,59 +961,33 @@ /* 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 = { @@ -672,966 +1011,1025 @@ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -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 _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 *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_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_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_void=0; /* handle for */ +static int le_swig__p_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[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(); - - + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + fs_core_set_globals(); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_core_init) { - char *arg1 ; - 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); - - + char *arg1 = (char *) 0 ; + int result; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + result = (int)fs_core_init(arg1); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_core_destroy) { - int result; - zval **args[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(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_core_destroy(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_init) { - int result; - zval **args[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(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_loadable_module_init(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_loadable_module_shutdown) { - int result; - zval **args[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(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_loadable_module_shutdown(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_console_loop) { - int result; - zval **args[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(); - - + int result; + zval **args[0]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 0) || (zend_get_parameters_array_ex(0, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + result = (int)fs_console_loop(); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_consol_log) { - 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); - - + 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()); } ZEND_NAMED_FUNCTION(_wrap_fs_consol_clean) { - 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); - - + 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()); } ZEND_NAMED_FUNCTION(_wrap_fs_core_session_locate) { - 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); - - + char *arg1 = (char *) 0 ; + switch_core_session_t *result = 0 ; + zval **args[1]; + + SWIG_ResetError(); + if(((ZEND_NUM_ARGS() )!= 1) || (zend_get_parameters_array_ex(1, args)!= SUCCESS)) { + WRONG_PARAM_COUNT; + } + + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[0]); + arg1 = (char *) Z_STRVAL_PP(args[0]); + /*@SWIG@*/; + } + result = (switch_core_session_t *)fs_core_session_locate(arg1); + { SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_switch_core_session_t, 0); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_answer) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - zval **args[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++; + 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"); } - 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); - - + } + fs_channel_answer(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_pre_answer) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - zval **args[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++; + 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"); } - 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); - - + } + fs_channel_pre_answer(arg1); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_hangup) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - 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++; + 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"); } - 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); - - + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_hangup(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_variable) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *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++; + 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"); } - 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); - - + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + } + fs_channel_set_variable(arg1,arg2,arg3); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_get_variable) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - 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++; + 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"); } - 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); - - + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_get_variable(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_channel_set_state) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - 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++; + 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"); } - 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); - - + } + { + /*@SWIG:CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + } + fs_channel_set_state(arg1,arg2); + + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_ivr_play_file) { - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - char *arg2 ; - char *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++; + 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"); } - 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[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(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); + 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"); } - - - 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); - - + } + { + /*@SWIG:CONVERT_INT_IN@*/ + convert_to_long_ex(args[5]); + arg6 = (unsigned int) Z_LVAL_PP(args[5]); + /*@SWIG@*/; + } + result = (int)fs_ivr_play_file(arg1,arg2,arg3,arg4,arg5,arg6); + { ZVAL_LONG(return_value,result); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } 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 ; - 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++; + 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"); } - if(((ZEND_NUM_ARGS() + argbase )!= 6) || (zend_get_parameters_array_ex(6-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + /* 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(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); + } + { + /*@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(*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); + 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"); } - - - 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); - - + } + { + /*@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); + { 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; - 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++; + 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"); } - if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + 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(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); - - + arg2 = *tmp2; + } + 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 ; - 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++; + 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"); } - 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); - - + } + { + /*@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); + { 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; - 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++; + 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"); } - if(((ZEND_NUM_ARGS() + argbase )!= 4) || (zend_get_parameters_array_ex(4-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + 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(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); + 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"); } - - { - 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); - - + } + { + /*@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); + { 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 ; - 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++; + 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"); } - 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); - - + } + { + /*@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); + { 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 ; - 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++; + 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"); } - if(((ZEND_NUM_ARGS() + argbase )!= 4) || (zend_get_parameters_array_ex(4-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + /* 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(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); + } + { + /*@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(*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); - - + arg4 = *tmp4; + } + 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 *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++; + 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"); } - 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); - - + } + { + /*@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); + { 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 *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++; + 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"); } - if(((ZEND_NUM_ARGS() + argbase )!= 9) || (zend_get_parameters_array_ex(9-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + /*@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(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); + 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"); } - - - 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; + 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"); } - { - 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); - - + } + { + /*@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); + { 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 *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++; + 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"); } - if(((ZEND_NUM_ARGS() + argbase )!= 2) || (zend_get_parameters_array_ex(2-argbase, args)!= SUCCESS)) { - WRONG_PARAM_COUNT; + } + { + /*@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(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); - + } + return; +fail: + zend_error(ErrorCode(),ErrorMsg()); } ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable) { - 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++; + 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"); } - 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); - - + } + { + /*@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); + { 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_void) { -/* bah! No destructor for this simple type!! */ +static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_p_void) { + /* bah! No destructor for this simple type!! */ } /* NEW Destructor style */ static ZEND_RSRC_DTOR_FUNC(_wrap_destroy_p_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 @@ -1642,17 +2040,224 @@ } #endif -PHP_MSHUTDOWN_FUNCTION(freeswitch) -{ - return SUCCESS; +#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_MINIT_FUNCTION(freeswitch) -{ - int i; - for (i = 0; swig_types_initial[i]; i++) { - swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]); + +/* This function will propagate the clientdata field of type to +* any new swig_type_info structures that have been added into the list +* of equivalent types. It is like calling +* SWIG_TypeClientData(type, clientdata) a second time. +*/ +SWIGRUNTIME void +SWIG_PropagateClientData(void) { + size_t i; + swig_cast_info *equiv; + static int init_run = 0; + + if (init_run) return; + init_run = 1; + + for (i = 0; i < swig_module.size; i++) { + if (swig_module.types[i]->clientdata) { + equiv = swig_module.types[i]->cast; + while (equiv) { + if (!equiv->converter) { + if (equiv->type && !equiv->type->clientdata) + SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); + } + equiv = equiv->next; + } } + } +} + +#ifdef __cplusplus +#if 0 +{ /* c-mode */ +#endif +} +#endif + + + SWIG_php_minit { + SWIG_InitializeModule(0); + /* oinit subsection */ +ZEND_INIT_MODULE_GLOBALS(freeswitch, freeswitch_init_globals, freeswitch_destroy_globals); /* Register resource destructors for pointer types */ le_swig__p_switch_channel_t=zend_register_list_destructors_ex(_wrap_destroy_p_switch_channel_t,NULL,(char *)(SWIGTYPE_p_switch_channel_t->name),module_number); @@ -1663,8 +2268,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_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_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_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); @@ -1676,6 +2281,8 @@ } PHP_RINIT_FUNCTION(freeswitch) { +/* rinit section */ + /* cinit subsection */ /* end cinit subsection */ @@ -1684,8 +2291,16 @@ return SUCCESS; } +PHP_MSHUTDOWN_FUNCTION(freeswitch) +{ +/* shutdown section */ + + return SUCCESS; +} PHP_RSHUTDOWN_FUNCTION(freeswitch) { +/* rshutdown section */ + return SUCCESS; } PHP_MINFO_FUNCTION(freeswitch)

1 0

[commit] r2667 - freeswitch/trunk/src/mod/codecs/mod_g711
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: mikej Date: Tue Sep 12 14:34:43 2006 New Revision: 2667 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj Log: small 711 tweak, windows style! Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj Tue Sep 12 14:34:43 2006 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\g7xx\src\include\g7xx"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -122,7 +122,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\g7xx\src\include\g7xx"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0"

1 0

[commit] r2666 - freeswitch/trunk/src/mod/codecs/mod_g711
by Freeswitch SVN 12 Sep '06

12 Sep '06

Author: anthm Date: Tue Sep 12 14:31:15 2006 New Revision: 2666 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Log: small 711 tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Tue Sep 12 14:31:15 2006 @@ -1,4 +1,4 @@ -CFLAGS += -I$(BASE)/libs/codec/g7xx/src/include/g7xx +CFLAGS += -I$(BASE)/libs/codec/g7xx/src/include all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Tue Sep 12 14:31:15 2006 @@ -30,7 +30,7 @@ * */ #include <switch.h> -#include "g711.h" +#include <g7xx/g711.h> static const char modname[] = "mod_g711";

1 0