changes to language stuff

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2768 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/languages/mod_perl/Makefile

@@ -6,7 +6,8 @@ CFLAGS  += -DEMBED_PERL
 LDFLAGS +=  $(shell $(PERL) -MExtUtils::Embed -e ldopts)
 LDFLAGS +=  $(shell $(PERL) -MConfig -e 'print $$Config{libs}')  
 OBJS += perlxsi.o
-
+SWIGCFILE=../../../switch_swig.c
+SWIGIFILE=../../../switch_swig.i
 
 
 all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) fs_perl.$(DYNAMIC_LIB_EXTEN)
@@ -23,7 +24,10 @@ depends:
 
 reswig: 
 	rm switch_swig_wrap.c
-	swig -lswitch_swig.i -ignoremissing -DMULTIPLICITY -perl5 -module fs_perl switch_swig.c
+	swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -perl5 -module fs_perl $(SWIGCFILE)
+
+switch_swig.o: $(SWIGCFILE) Makefile
+	$(CC)  -w $(CFLAGS) -c $< -o $@
 
 switch_swig_wrap.o: switch_swig_wrap.c
 	$(CC) -w $(CFLAGS) -c $< -o $@

src/mod/languages/mod_perl/fs_perl.pm

@@ -1,4 +1,5 @@
-# This file was automatically generated by SWIG
+# This file was created automatically by SWIG 1.3.29.
+# Don't modify this file, modify the SWIG interface instead.
 package fs_perl;
 require Exporter;
 require DynaLoader;
@@ -51,8 +52,8 @@ package fs_perl;
 *fs_loadable_module_init = *fs_perlc::fs_loadable_module_init;
 *fs_loadable_module_shutdown = *fs_perlc::fs_loadable_module_shutdown;
 *fs_console_loop = *fs_perlc::fs_console_loop;
-*fs_console_log = *fs_perlc::fs_console_log;
+*fs_consol_log = *fs_perlc::fs_consol_log;
-*fs_console_clean = *fs_perlc::fs_console_clean;
+*fs_consol_clean = *fs_perlc::fs_consol_clean;
 *fs_core_session_locate = *fs_perlc::fs_core_session_locate;
 *fs_channel_answer = *fs_perlc::fs_channel_answer;
 *fs_channel_pre_answer = *fs_perlc::fs_channel_pre_answer;
@@ -61,7 +62,16 @@ package fs_perl;
 *fs_channel_get_variable = *fs_perlc::fs_channel_get_variable;
 *fs_channel_set_state = *fs_perlc::fs_channel_set_state;
 *fs_ivr_play_file = *fs_perlc::fs_ivr_play_file;
+*fs_switch_ivr_record_file = *fs_perlc::fs_switch_ivr_record_file;
+*fs_switch_ivr_sleep = *fs_perlc::fs_switch_ivr_sleep;
 *fs_ivr_play_file2 = *fs_perlc::fs_ivr_play_file2;
+*fs_switch_ivr_collect_digits_callback = *fs_perlc::fs_switch_ivr_collect_digits_callback;
+*fs_switch_ivr_collect_digits_count = *fs_perlc::fs_switch_ivr_collect_digits_count;
+*fs_switch_ivr_originate = *fs_perlc::fs_switch_ivr_originate;
+*fs_switch_ivr_session_transfer = *fs_perlc::fs_switch_ivr_session_transfer;
+*fs_switch_ivr_speak_text = *fs_perlc::fs_switch_ivr_speak_text;
+*fs_switch_channel_get_variable = *fs_perlc::fs_switch_channel_get_variable;
+*fs_switch_channel_set_variable = *fs_perlc::fs_switch_channel_set_variable;
 
 # ------- VARIABLE STUBS --------
 

src/mod/languages/mod_perl/switch_swig.c

@@ -1,151 +0,0 @@
-#include <switch.h>
-#ifdef __ICC
-#pragma warning (disable:1418)
-#endif
-
-
-
-#ifdef _MSC_VER
-#include <php.h>
-#pragma comment(lib, PHP_LIB)
-#endif
-
-void fs_core_set_globals(void)
-{
-	switch_core_set_globals();
-}
-
-int fs_core_init(char *path)
-{
-	switch_status_t status;
-	const char *err = NULL;
-
-	if (switch_strlen_zero(path)) {
-		path = NULL;
-	}
-
-	status = switch_core_init(path, &err);
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_core_destroy(void)
-{
-	switch_status_t status;
-
-	status = switch_core_destroy();
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_init(void)
-{
-	return switch_loadable_module_init() == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_shutdown(void)
-{
-	switch_loadable_module_shutdown();
-	return 1;
-}
-
-int fs_console_loop(void) 
-{
-	switch_console_loop();
-	return 0;
-}
-
-void fs_console_log(char *level_str, char *msg)
-{
-	switch_log_level_t level = SWITCH_LOG_DEBUG;
-
-	if (level_str) {
-		level = switch_log_str2level(level_str);
-	}
-	
-	switch_log_printf(SWITCH_CHANNEL_LOG, level, msg);
-}
-
-void fs_console_clean(char *msg)
-{
-	switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg);
-}
-
-switch_core_session_t *fs_core_session_locate(char *uuid)
-{
-	switch_core_session_t *session;
-
-	if ((session = switch_core_session_locate(uuid))) {
-		switch_core_session_rwunlock(session);
-	}
-
-	return session;
-}
-
-void fs_channel_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_answer(channel);
-}
-
-void fs_channel_pre_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_pre_answer(channel);
-}
-
-void fs_channel_hangup(switch_core_session_t *session, char *cause)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_hangup(channel, switch_channel_str2cause(cause));
-}
-
-void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_set_variable(channel, var, val);
-}
-
-void fs_channel_get_variable(switch_core_session_t *session, char *var)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_get_variable(channel, var);
-}
-
-void fs_channel_set_state(switch_core_session_t *session, char *state)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t fs_state = switch_channel_get_state(channel);
-
-	if ((fs_state = switch_channel_name_state(state)) < CS_HANGUP) {
-		switch_channel_set_state(channel, fs_state);
-	}
-}
-
-int fs_ivr_play_file(switch_core_session_t *session,
-					 char *file,
-					 char *timer_name,
-					 switch_input_callback_function_t dtmf_callback,
-					 void *buf,
-					 unsigned int buflen)
-{
-	switch_status_t status;
-	if (switch_strlen_zero(timer_name)) {
-		timer_name = NULL;
-	}
-	
-	status = switch_ivr_play_file(session, NULL, file, timer_name, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-
-int fs_ivr_play_file2(switch_core_session_t *session,
-					  char *file)
-
-{
-	switch_status_t status;
-	
-	status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-

src/mod/languages/mod_perl/switch_swig.i

@@ -1,9 +0,0 @@
-// gd.i
-%module fs_perl
-%{
-#include <switch.h>
-%}
-
-// Grab the gd.h header file
-%include <switch.h>
-

src/mod/languages/mod_php/Makefile

@@ -8,6 +8,9 @@ MDIR += `$(PCFG) --extension-dir`
 PHPMOD=freeswitch
 PHPLDFLAGS = `$(PCFG) --ldflags` -lm -ldl -lxml2 -lz -lphp5
 MOD_CFLAGS += -fPIC
+SWIGCFILE=../../../switch_swig.c
+SWIGIFILE=../../../switch_swig.i
+
 all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PHPMOD).$(DYNAMIC_LIB_EXTEN)
 
 depends:
@@ -19,13 +22,13 @@ depends:
 
 reswig: 
 	rm -f switch_swig_wrap.c config.m4 CREDITS *$(PHPMOD)*
-	swig -lswitch_swig.i -ignoremissing -DMULTIPLICITY -php -module $(PHPMOD) switch_swig.c
+	swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -php -module $(PHPMOD) $(SWIGCFILE)
 	patch -p0 -i fix.diff
 
 switch_swig_wrap.o: switch_swig_wrap.c Makefile
 	$(CC)  -w $(CFLAGS) -c $< -o $@
 
-switch_swig.o: switch_swig.c Makefile
+switch_swig.o: $(SWIGCFILE) Makefile
 	$(CC)  -w $(CFLAGS) -c $< -o $@
 
 

src/mod/languages/mod_python/Makefile

@@ -2,11 +2,13 @@ LCFLAGS=-fPIC
 CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/
 PYMOD=freeswitch
 LDFLAGS=-lpython2.4 -Xlinker -L$(PREFIX)/lib/python2.4/config/
+SWIGCFILE=../../../switch_swig.c
+SWIGIFILE=../../../switch_swig.i
 
 all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads
+	MAKE=$(MAKE) PY_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads
 
 %.o:  %.c
 	$(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@
@@ -16,13 +18,13 @@ mod_python.c:
 
 reswig: 
 	rm -f switch_swig_wrap.c config.m4 CREDITS *${PYMOD}*
-	swig -lswitch_swig.i -ignoremissing -DMULTIPLICITY -python -module $(PYMOD) switch_swig.c
+	swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -python -module $(PYMOD) $(SWIGCFILE)
 	patch -p0 -i fix.diff
 
 switch_swig_wrap.o: switch_swig_wrap.c Makefile
 	$(CC)  -w $(CFLAGS) -c $< -o $@
 
-switch_swig.o: switch_swig.c Makefile
+switch_swig.o: $(SWIGCFILE) Makefile
 	$(CC)  -w $(CFLAGS) -c $< -o $@
 
 

src/mod/languages/mod_python/switch_swig.c

@@ -1,327 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthmct@yahoo.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthmct@yahoo.com>
- * Brian Fertig <brian.fertig@convergencetek.com>
- *
- * php_freeswitch.c -- PHP Module Framework
- *
- */
-#include <switch.h>
-#ifdef __ICC
-#pragma warning (disable:1418)
-#endif
-
-
-
-#ifdef _MSC_VER
-#include <php.h>
-#pragma comment(lib, PHP_LIB)
-#endif
-
-void fs_core_set_globals(void)
-{
-	switch_core_set_globals();
-}
-
-int fs_core_init(char *path)
-{
-	switch_status_t status;
-	const char *err = NULL;
-
-	if (switch_strlen_zero(path)) {
-		path = NULL;
-	}
-
-	status = switch_core_init(path, &err);
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_core_destroy(void)
-{
-	switch_status_t status;
-
-	status = switch_core_destroy();
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_init(void)
-{
-	return switch_loadable_module_init() == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_shutdown(void)
-{
-	switch_loadable_module_shutdown();
-	return 1;
-}
-
-int fs_console_loop(void) 
-{
-	switch_console_loop();
-	return 0;
-}
-
-void fs_consol_log(char *level_str, char *msg)
-{
-        switch_log_level_t level = SWITCH_LOG_DEBUG;
-        if (level_str) {
-                level = switch_log_str2level(level_str);
-	}
-      
-        switch_log_printf(SWITCH_CHANNEL_LOG, level, msg);
-}
-	
-void fs_consol_clean(char *msg)
-{
-        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg);
-}
-
-switch_core_session_t *fs_core_session_locate(char *uuid)
-{
-	switch_core_session_t *session;
-
-	if ((session = switch_core_session_locate(uuid))) {
-		switch_core_session_rwunlock(session);
-	}
-
-	return session;
-}
-
-void fs_channel_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_answer(channel);
-}
-
-void fs_channel_pre_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_pre_answer(channel);
-}
-
-void fs_channel_hangup(switch_core_session_t *session, char *cause)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_hangup(channel, switch_channel_str2cause(cause));
-}
-
-void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_set_variable(channel, var, val);
-}
-
-void fs_channel_get_variable(switch_core_session_t *session, char *var)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_get_variable(channel, var);
-}
-
-void fs_channel_set_state(switch_core_session_t *session, char *state)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t fs_state = switch_channel_get_state(channel);
-
-	if ((fs_state = switch_channel_name_state(state)) < CS_HANGUP) {
-		switch_channel_set_state(channel, fs_state);
-	}
-}
-
-
-/*
-IVR Routines!  You can do IVR in PHP NOW!
-*/
-
-int fs_ivr_play_file(switch_core_session_t *session,
-					 char *file,
-					 char *timer_name,
-					 switch_input_callback_function_t dtmf_callback,
-					 void *buf,
-					 unsigned int buflen)
-{
-	switch_status_t status;
-	if (switch_strlen_zero(timer_name)) {
-		timer_name = NULL;
-	}
-	
-	status = switch_ivr_play_file(session, NULL, file, timer_name, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_record_file(switch_core_session_t *session,
-						switch_file_handle_t *fh,
-						char *file,
-						switch_input_callback_function_t dtmf_callback,
-						void *buf,
-						unsigned int buflen)
-{  
-	switch_status_t status;
-	
-        status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_sleep(switch_core_session_t *session,
-					uint32_t ms)
-{
-	switch_status_t status;
-	status = switch_ivr_sleep(session, ms);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_ivr_play_file2(switch_core_session_t *session,
-					  char *file)
-
-{
-	switch_status_t status;
-	
-	status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-
-int fs_switch_ivr_collect_digits_callback (switch_core_session_t *session,
-							switch_input_callback_function_t dtmf_callback,
-							void *buf,
-							unsigned int buflen)
-{
-        switch_status_t status;
-
-        status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_collect_digits_count  	(switch_core_session_t *session,
-					char *buf,
-					unsigned int buflen,
-					unsigned int maxdigits,
-					const char *terminators,
-					char *terminator,
-					unsigned int timeout)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_collect_digits_count(session, buf, buflen, maxdigits, terminators, terminator, timeout);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-/*int fs_switch_ivr_multi_threaded_bridge   (switch_core_session_t *session,
-					switch_core_session_t *peer_session,
-					switch_input_callback_function_t dtmf_callback,
-					void *session_data,
-					void *peer_session_data)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_multi_threaded_bridge(session, peer_session, dtmf_callback, session_data, peer_session_data);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-*/
-
-int fs_switch_ivr_originate       (switch_core_session_t *session,
-				switch_core_session_t **bleg,
-				char *  	bridgeto,
-				uint32_t  	timelimit_sec)
-				/*const switch_state_handler_table_t *table,
-				char *  	cid_name_override,
-				char *  	cid_num_override,
-				switch_caller_profile_t *caller_profile_override)  */
-{
-
-        switch_channel_t *caller_channel;
-        switch_core_session_t *peer_session;
-        unsigned int timelimit = 60;
-        char *var;
-		switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-
-        caller_channel = switch_core_session_get_channel(session);
-        assert(caller_channel != NULL);
-
-        if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) {
-                timelimit = atoi(var);
-        }
-        
-        if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
-                switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-                return;
-        } else {
-                switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
-        }
-
-
-}
-
-int fs_switch_ivr_session_transfer(switch_core_session_t *session,
-				char *extension,
-				char *dialplan,
-				char *context)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_session_transfer(session,extension,dialplan,context);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_speak_text      (switch_core_session_t *session,
-				char *tts_name,
-				char *voice_name,
-				char *timer_name,
-				uint32_t  	rate,
-				switch_input_callback_function_t dtmf_callback,
-				char *text,
-				void *buf,
-				unsigned int buflen)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-
-/*
-
-*******  CHANNEL STUFF  *******
-
-*/
-
-char* fs_switch_channel_get_variable(switch_channel_t *channel, char *varname)
-{
-	return switch_channel_get_variable(channel, varname);
-}
-
-
-int fs_switch_channel_set_variable(switch_channel_t *channel, char *varname, char *value)
-{
-        switch_status_t status;
-
-        status = switch_channel_set_variable(channel, varname, value);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}  
-

src/mod/languages/mod_python/switch_swig.i

@@ -1,7 +0,0 @@
-%module fs_elmoscript
-%{
-#include "switch.h"
-%}
-
-%include "/usr/local/freeswitch/include/switch.h"
-

src/mod/languages/mod_ruby/Makefile

@@ -2,11 +2,13 @@ LCFLAGS=-fPIC -DZTS -DPTHREADS
 CFLAGS += -fPIC -I../../../../libs/ruby-1.8.5/
 RBMOD=freeswitch
 LDFLAGS=-lruby-static -L$(PREFIX)/lib/ 
+SWIGCFILE=../../../switch_swig.c
+SWIGIFILE=../../../switch_swig.i
 
 all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(RBMOD).$(DYNAMIC_LIB_EXTEN)
-	
+
 depends:
-	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install ruby-1.8.5.tar.gz --prefix=$(PREFIX)
+	MAKE=$(MAKE) MOD_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install ruby-1.8.5.tar.gz --prefix=$(PREFIX)
 	cp -f config.h ../../../../libs/ruby-1.8.5/
 
 %.o:  %.c
@@ -17,13 +19,12 @@ mod_ruby.c:
 
 reswig: 
 	rm -f switch_swig_wrap.c config.m4 CREDITS *${RBMOD}*
-	swig -lswitch_swig.i -ignoremissing -DMULTIPLICITY -ruby -module $(RBMOD) switch_swig.c
+	swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -ruby -module $(RBMOD) $(SWIGCFILE)
-	patch -p0 -i fix.diff
 
 switch_swig_wrap.o: switch_swig_wrap.c Makefile
 	$(CC)  -w $(CFLAGS) -c $< -o $@
 
-switch_swig.o: switch_swig.c Makefile
+switch_swig.o: $(SWIGCFILE) Makefile
 	$(CC)  -w $(CFLAGS) -c $< -o $@
 
 
@@ -40,4 +41,3 @@ clean:
 install:
 	#cp -f rb_$(RBMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR)
 	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
-	

src/mod/languages/mod_ruby/mod_ruby.c

@@ -61,7 +61,7 @@ static void ruby_function(switch_core_session_t *session, char *data)
 	sprintf(ruby_code, "$uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]);
 
 	ruby_init();
-			
+	
 	ruby_init_loadpath();
 
 	ruby_script("embedded");	

src/mod/languages/mod_ruby/switch_swig.c

@@ -1,327 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthmct@yahoo.com>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthmct@yahoo.com>
- * Brian Fertig <brian.fertig@convergencetek.com>
- *
- * php_freeswitch.c -- PHP Module Framework
- *
- */
-#include <switch.h>
-#ifdef __ICC
-#pragma warning (disable:1418)
-#endif
-
-
-
-#ifdef _MSC_VER
-#include <php.h>
-#pragma comment(lib, PHP_LIB)
-#endif
-
-void fs_core_set_globals(void)
-{
-	switch_core_set_globals();
-}
-
-int fs_core_init(char *path)
-{
-	switch_status_t status;
-	const char *err = NULL;
-
-	if (switch_strlen_zero(path)) {
-		path = NULL;
-	}
-
-	status = switch_core_init(path, &err);
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_core_destroy(void)
-{
-	switch_status_t status;
-
-	status = switch_core_destroy();
-
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_init(void)
-{
-	return switch_loadable_module_init() == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_loadable_module_shutdown(void)
-{
-	switch_loadable_module_shutdown();
-	return 1;
-}
-
-int fs_console_loop(void) 
-{
-	switch_console_loop();
-	return 0;
-}
-
-void fs_consol_log(char *level_str, char *msg)
-{
-        switch_log_level_t level = SWITCH_LOG_DEBUG;
-        if (level_str) {
-                level = switch_log_str2level(level_str);
-	}
-      
-        switch_log_printf(SWITCH_CHANNEL_LOG, level, msg);
-}
-	
-void fs_consol_clean(char *msg)
-{
-        switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg);
-}
-
-switch_core_session_t *fs_core_session_locate(char *uuid)
-{
-	switch_core_session_t *session;
-
-	if ((session = switch_core_session_locate(uuid))) {
-		switch_core_session_rwunlock(session);
-	}
-
-	return session;
-}
-
-void fs_channel_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_answer(channel);
-}
-
-void fs_channel_pre_answer(switch_core_session_t *session)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_pre_answer(channel);
-}
-
-void fs_channel_hangup(switch_core_session_t *session, char *cause)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_hangup(channel, switch_channel_str2cause(cause));
-}
-
-void fs_channel_set_variable(switch_core_session_t *session, char *var, char *val)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_set_variable(channel, var, val);
-}
-
-void fs_channel_get_variable(switch_core_session_t *session, char *var)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_get_variable(channel, var);
-}
-
-void fs_channel_set_state(switch_core_session_t *session, char *state)
-{
-	switch_channel_t *channel = switch_core_session_get_channel(session);
-	switch_channel_state_t fs_state = switch_channel_get_state(channel);
-
-	if ((fs_state = switch_channel_name_state(state)) < CS_HANGUP) {
-		switch_channel_set_state(channel, fs_state);
-	}
-}
-
-
-/*
-IVR Routines!  You can do IVR in PHP NOW!
-*/
-
-int fs_ivr_play_file(switch_core_session_t *session,
-					 char *file,
-					 char *timer_name,
-					 switch_input_callback_function_t dtmf_callback,
-					 void *buf,
-					 unsigned int buflen)
-{
-	switch_status_t status;
-	if (switch_strlen_zero(timer_name)) {
-		timer_name = NULL;
-	}
-	
-	status = switch_ivr_play_file(session, NULL, file, timer_name, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_record_file(switch_core_session_t *session,
-						switch_file_handle_t *fh,
-						char *file,
-						switch_input_callback_function_t dtmf_callback,
-						void *buf,
-						unsigned int buflen)
-{  
-	switch_status_t status;
-	
-        status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_sleep(switch_core_session_t *session,
-					uint32_t ms)
-{
-	switch_status_t status;
-	status = switch_ivr_sleep(session, ms);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_ivr_play_file2(switch_core_session_t *session,
-					  char *file)
-
-{
-	switch_status_t status;
-	
-	status = switch_ivr_play_file(session, NULL, file, NULL, NULL, NULL, 0);
-	return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-
-int fs_switch_ivr_collect_digits_callback (switch_core_session_t *session,
-							switch_input_callback_function_t dtmf_callback,
-							void *buf,
-							unsigned int buflen)
-{
-        switch_status_t status;
-
-        status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_collect_digits_count  	(switch_core_session_t *session,
-					char *buf,
-					unsigned int buflen,
-					unsigned int maxdigits,
-					const char *terminators,
-					char *terminator,
-					unsigned int timeout)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_collect_digits_count(session, buf, buflen, maxdigits, terminators, terminator, timeout);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-/*int fs_switch_ivr_multi_threaded_bridge   (switch_core_session_t *session,
-					switch_core_session_t *peer_session,
-					switch_input_callback_function_t dtmf_callback,
-					void *session_data,
-					void *peer_session_data)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_multi_threaded_bridge(session, peer_session, dtmf_callback, session_data, peer_session_data);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-*/
-
-int fs_switch_ivr_originate       (switch_core_session_t *session,
-				switch_core_session_t **bleg,
-				char *  	bridgeto,
-				uint32_t  	timelimit_sec)
-				/*const switch_state_handler_table_t *table,
-				char *  	cid_name_override,
-				char *  	cid_num_override,
-				switch_caller_profile_t *caller_profile_override)  */
-{
-
-        switch_channel_t *caller_channel;
-        switch_core_session_t *peer_session;
-        unsigned int timelimit = 60;
-        char *var;
-		switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
-
-        caller_channel = switch_core_session_get_channel(session);
-        assert(caller_channel != NULL);
-
-        if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) {
-                timelimit = atoi(var);
-        }
-        
-        if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
-                switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
-                return;
-        } else {
-                switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
-        }
-
-
-}
-
-int fs_switch_ivr_session_transfer(switch_core_session_t *session,
-				char *extension,
-				char *dialplan,
-				char *context)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_session_transfer(session,extension,dialplan,context);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-int fs_switch_ivr_speak_text      (switch_core_session_t *session,
-				char *tts_name,
-				char *voice_name,
-				char *timer_name,
-				uint32_t  	rate,
-				switch_input_callback_function_t dtmf_callback,
-				char *text,
-				void *buf,
-				unsigned int buflen)  
-{
-        switch_status_t status;
-
-        status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}
-
-
-/*
-
-*******  CHANNEL STUFF  *******
-
-*/
-
-char* fs_switch_channel_get_variable(switch_channel_t *channel, char *varname)
-{
-	return switch_channel_get_variable(channel, varname);
-}
-
-
-int fs_switch_channel_set_variable(switch_channel_t *channel, char *varname, char *value)
-{
-        switch_status_t status;
-
-        status = switch_channel_set_variable(channel, varname, value);
-        return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
-}  
-