June 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13954 - freeswitch/trunk/scripts/contrib/intralanman/perl/cdr
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: intralanman Date: Thu Jun 25 13:17:20 2009 New Revision: 13954 Log: i knew i had this laying around somewhere Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr/xml-cdr-importer (contents, props changed) Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr/xml-cdr-importer ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/perl/cdr/xml-cdr-importer Thu Jun 25 13:17:20 2009 @@ -0,0 +1,151 @@ +#!/usr/bin/perl +use strict; +use Data::Dumper; +use Sys::Syslog; +use XML::Simple; +use CGI; +use DBI; + +openlog('xml-cdr', 'pid|ndelay', "LOG_USER"); +open(DEBUG, ">/tmp/debug.txt"); + +my $config={}; +my $db; +my $identifier = 'cdr-csv-importer'; + +sub parse_config { + open(CONFIG, "<cdr-csv-importer.ini") or die("Can't open config file (cdr-csv-importer.ini)\n"); + while (<CONFIG>) { + #print $_; + chomp; #kill whitespaces + + next if !(m/^[[:alnum:]]/); #skip lines that don't start right + next if m/^\s*$/; #skip lines with only whitespace + next if m/^;/; #skip ini comments + next if m(/^\[.*\]/); # skip the start of a section + + my ($key, $val) = split(/\s+=\s+/, $_, 2); + #print "'$key' = '$val'\n"; + if($key eq "fields") { + @{$config->{fields}} = split(/,/, $val); + } else { + $config->{$key} = $val; + } + } + close(CONFIG); +} + +sub create_table { +# my $db = shift; + my $sql = "CREATE TABLE IF NOT EXISTS `$config->{table}` ( + `id` int(11) NOT NULL auto_increment, + `caller_id_name` varchar(255) NOT NULL default '', + `caller_id_number` varchar(255) NOT NULL default '', + `destination_number` varchar(255) NOT NULL default '', + `context` varchar(255) NOT NULL default '', + `start_stamp` varchar(255) NOT NULL default '', + `answer_stamp` varchar(255) NOT NULL default '', + `end_stamp` varchar(255) NOT NULL default '', + `duration` varchar(255) NOT NULL default '', + `billsec` varchar(255) NOT NULL default '', + `hangup_cause` varchar(255) NOT NULL default '', + `uuid` varchar(255) NOT NULL default '', + `bleg_uuid` varchar(255) NOT NULL default '', + `accountcode` varchar(255) NOT NULL default '', + `read_codec` varchar(255) NOT NULL default '', + `write_codec` varchar(255) NOT NULL default '', + PRIMARY KEY (`id`), + UNIQUE KEY `uuid` (`uuid`) +) ENGINE=InnoDB"; + $db->do($sql); + if (!$db->{Executed}) { + die("We couldn't CREATE the DB table\n"); + } +} + +sub connect_db { + return DBI->connect($config->{connect_string}, $config->{username}, $config->{password}); +} + +sub is_db_connected { + my $query = $db->prepare("SELECT CURRENT_TIMESTAMP;"); + $query->execute(); +} + +sub urldecode { + my $url = shift; + $url =~ s/%([a-fA-F0-9]{2,2})/chr(hex($1))/eg; + return $url; +} + + + +&parse_config; +$db = &connect_db; +&create_table; +my $cgi = new CGI; +#syslog("LOG_INFO", Dumper $cgi); +#syslog("LOG_INFO", Dumper \@ARGV); + +my @cgi_params = $cgi->param; +print "Content-Type: text/plain\r\n\r\n"; + +my $xml = new XML::Simple(); +#my $cdr = $xml->XMLin('/usr/local/freeswitch/conf/autoload_configs/acl.conf.xml'); +my $cdr = $xml->parse_string($cgi->param('cdr')); +print DEBUG Dumper $cdr; + +my $variables = $cdr->{variables}; +my $caller_profile = {}; +if (ref $cdr->{callflow} eq "ARRAY") { + syslog("LOG_INFO", "callflow is an array"); + $caller_profile = $cdr->{callflow}->[0]->{caller_profile}; +} else { + syslog("LOG_INFO", "callflow is not an array"); + $caller_profile = $cdr->{callflow}->{caller_profile}; +} + +#syslog(LOG_INFO, Dumper $cdr); + +print "caller_id_name: $caller_profile->{caller_id_name}\n"; +print "caller_id_number: $caller_profile->{caller_id_number}\n"; +print "destination_number: $caller_profile->{destination_number}\n"; +print "context: $caller_profile->{context}\n"; +print "start_stamp: " . &urldecode($variables->{start_stamp}) . "\n"; +print "answer_stamp: " . &urldecode($variables->{answer_stamp}) . "\n"; +print "end_stamp: " . &urldecode($variables->{end_stamp}) . "\n"; +print "duration: $variables->{duration}\n"; +print "billsec: $variables->{billsec}\n"; +print "hangup_cause: $variables->{hangup_cause}\n"; +print "uuid: $caller_profile->{uuid}\n"; +print "bleg_uuid: $caller_profile->{bleg_uuid}\n"; +print "accountcode: $variables->{accountcode}\n"; +print "\n\n"; + +my $cdr_line = sprintf( + '"%s","%s","%s","%s","%s","%s","%s","%s","%s","%s","%s","%s","%s","%s","%s"', + $caller_profile->{caller_id_name}, + $caller_profile->{caller_id_number}, + $caller_profile->{destination_number}, + $caller_profile->{context}, + &urldecode($variables->{start_stamp}), + &urldecode($variables->{answer_stamp}), + &urldecode($variables->{end_stamp}), + $variables->{duration}, + $variables->{billsec}, + $variables->{hangup_cause}, + $caller_profile->{uuid}, + $caller_profile->{bleg_uuid}, + $variables->{accountcode}, + $variables->{read_codec}, + $variables->{write_codec} +); + +syslog("LOG_INFO", $cdr_line); + +my $query = sprintf( + "INSERT INTO %s (%s) VALUES (%s);", + $config->{table}, join(',', @{$config->{fields}}), $cdr_line + ); +syslog("LOG_INFO", $query); +$db->do($query);

1 0

[commit] r13953 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: andrew Date: Thu Jun 25 12:23:31 2009 New Revision: 13953 Log: Add a little api command to show multicast peer status Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Thu Jun 25 12:23:31 2009 @@ -225,7 +225,7 @@ switch_core_hash_destroy(&globals.event_hash); globals.event_hash = NULL; switch_core_hash_init(&globals.event_hash, module_pool); - memset(globals.event_list, 0, SWITCH_EVENT_ALL); + memset(globals.event_list, 0, SWITCH_EVENT_ALL + 1); if (load_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to reload config file\n"); } else { @@ -337,9 +337,36 @@ return; } +SWITCH_STANDARD_API(multicast_peers) +{ + switch_hash_index_t *cur; + switch_ssize_t keylen; + const void *key; + void *value; + int now = switch_epoch_time_now(NULL); + struct peer_status *last; + char *host; + int i = 0; + + for (cur = switch_hash_first(NULL, globals.peer_hash); cur; cur = switch_hash_next(cur)) { + switch_hash_this(cur, &key, &keylen, &value); + host = (char*) key; + last = (struct peer_status*) value; + + stream->write_function(stream, "Peer %s %s; last seen %d seconds ago\n", host, last->active ? "UP" : "DOWN", now - last->lastseen); + i++; + } + + if (i == 0) { + stream->write_function(stream, "No multicast peers seen\n"); + } + + return SWITCH_STATUS_SUCCESS; +} SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load) { + switch_api_interface_t *api_interface; switch_ssize_t hlen = -1; memset(&globals, 0, sizeof(globals)); @@ -419,6 +446,9 @@ switch_socket_opt_set(globals.udp_socket, SWITCH_SO_NONBLOCK, TRUE); + + SWITCH_ADD_API(api_interface, "multicast_peers", "Show status of multicast peers", multicast_peers, ""); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13952 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 11:50:13 2009 New Revision: 13952 Log: mod_sofia: do not set route_uri unless there is actually one to go to. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Jun 25 11:50:13 2009 @@ -4162,13 +4162,8 @@ *p = '\0'; } while ((--p > route_uri) && *p == ' '); } - } - else { - if(!(route_uri = strdup(contact))) { - goto mem_fail; - } - } - + } + if (!(to = strdup(data))) { goto mem_fail; }

1 0

[commit] r13951 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: andrew Date: Thu Jun 25 11:37:17 2009 New Revision: 13951 Log: Don't multicast the new multicast peerup/peerdown events Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Thu Jun 25 11:37:17 2009 @@ -176,7 +176,9 @@ return; } - if (event->subclass_name && !strcmp(event->subclass_name, MULTICAST_EVENT)) { + if (event->subclass_name && (!strcmp(event->subclass_name, MULTICAST_EVENT) || + !strcmp(event->subclass_name, MULTICAST_PEERUP) || + !strcmp(event->subclass_name, MULTICAST_PEERDOWN))) { char * event_name; if ((event_name = switch_event_get_header(event, "orig-event-name")) && !strcasecmp(event_name, "HEARTBEAT")) { char *sender = switch_event_get_header(event, "orig-multicast-sender"); @@ -213,6 +215,7 @@ switch_core_hash_insert(globals.peer_hash, sender, p); } + /* ignore our own events to avoid ping pong */ return; }

1 0

[commit] r13950 - in freeswitch/trunk/libs/esl/java: . classes org org/freeswitch org/freeswitch/esl
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 11:02:37 2009 New Revision: 13950 Log: pelims for java esl (needs work any voulenteers?) Added: freeswitch/trunk/libs/esl/java/ freeswitch/trunk/libs/esl/java/Makefile freeswitch/trunk/libs/esl/java/classes/ freeswitch/trunk/libs/esl/java/esl_wrap.cpp freeswitch/trunk/libs/esl/java/org/ freeswitch/trunk/libs/esl/java/org/freeswitch/ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLevent.java freeswitch/trunk/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_event_t.java freeswitch/trunk/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_priority_t.java freeswitch/trunk/libs/esl/java/org/freeswitch/esl/esl.java freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java Added: freeswitch/trunk/libs/esl/java/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/Makefile Thu Jun 25 11:02:37 2009 @@ -0,0 +1,25 @@ +LOCAL_CFLAGS=-I../src/include -I/usr/java/jdk1.6.0_14/include -I/usr/java/jdk1.6.0_14/include/linux +GCC_WARNING_JUNK=-w +CLASSES=org/freeswitch/esl/* + +all: esl.jar + +esl_wrap.cpp: + swig -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i + +esl_wrap.o: esl_wrap.cpp + $(CXX) $(CXX_CFLAGS) $(LOCAL_CFLAGS) $(CXXFLAGS) $(GCC_WARNING_JUNK) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o + +esl.jar: esl_wrap.o + mkdir -p classes + javac -sourcepath org -d classes $(CLASSES) + jar cf esl.jar -C classes org + +clean: + rm -f *.o *.so *~ *.jar + +swigclean: + rm -f esl_wrap.* + +reswig: swigclean esl_wrap.cpp + Added: freeswitch/trunk/libs/esl/java/esl_wrap.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/esl_wrap.cpp Thu Jun 25 11:02:37 2009 @@ -0,0 +1,1034 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * This file is not intended to be easily readable and contains a number of + * coding conventions designed to improve portability and efficiency. Do not make + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. + * ----------------------------------------------------------------------------- */ + + +#ifdef __cplusplus +template<typename T> class SwigValueWrapper { + T *tt; +public: + SwigValueWrapper() : tt(0) { } + SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { } + SwigValueWrapper(const T& t) : tt(new T(t)) { } + ~SwigValueWrapper() { delete tt; } + SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; } + operator T&() const { return *tt; } + T *operator&() { return tt; } +private: + SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs); +}; + +template <typename T> T SwigValueInit() { + return T(); +} +#endif + +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ + +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# elif defined(__HP_aCC) +/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */ +/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */ +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif + +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif + +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif + +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif + +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif + +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif + +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY +# endif +#endif + +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) +# define _SCL_SECURE_NO_DEPRECATE +#endif + + + +/* Fix for jlong on some versions of gcc on Windows */ +#if defined(__GNUC__) && !defined(__INTELC__) + typedef long long __int64; +#endif + +/* Fix for jlong on 64-bit x86 Solaris */ +#if defined(__x86_64) +# ifdef _LP64 +# undef _LP64 +# endif +#endif + +#include <jni.h> +#include <stdlib.h> +#include <string.h> + + +/* Support for throwing Java exceptions */ +typedef enum { + SWIG_JavaOutOfMemoryError = 1, + SWIG_JavaIOException, + SWIG_JavaRuntimeException, + SWIG_JavaIndexOutOfBoundsException, + SWIG_JavaArithmeticException, + SWIG_JavaIllegalArgumentException, + SWIG_JavaNullPointerException, + SWIG_JavaDirectorPureVirtual, + SWIG_JavaUnknownError +} SWIG_JavaExceptionCodes; + +typedef struct { + SWIG_JavaExceptionCodes code; + const char *java_exception; +} SWIG_JavaExceptions_t; + + +static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) { + jclass excep; + static const SWIG_JavaExceptions_t java_exceptions[] = { + { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, + { SWIG_JavaIOException, "java/io/IOException" }, + { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, + { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, + { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, + { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, + { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, + { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" }, + { SWIG_JavaUnknownError, "java/lang/UnknownError" }, + { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } }; + const SWIG_JavaExceptions_t *except_ptr = java_exceptions; + + while (except_ptr->code != code && except_ptr->code) + except_ptr++; + + jenv->ExceptionClear(); + excep = jenv->FindClass(except_ptr->java_exception); + if (excep) + jenv->ThrowNew(excep, msg); +} + + +/* Contract support */ + +#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else + + +#include "esl.h" +#include "esl_oop.h" + + +#ifdef __cplusplus +extern "C" { +#endif + +SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1event_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) { + ESLevent *arg1 = (ESLevent *) 0 ; + esl_event_t *arg2 = (esl_event_t *) 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = *(esl_event_t **)&jarg2; + if (arg1) (arg1)->event = arg2; + +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1event_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jlong jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + esl_event_t *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (esl_event_t *) ((arg1)->event); + *(esl_event_t **)&jresult = result; + return jresult; +} + + +SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1serialized_1string_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + ESLevent *arg1 = (ESLevent *) 0 ; + char *arg2 = (char *) 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return ; + } + { + if (arg1->serialized_string) delete [] arg1->serialized_string; + if (arg2) { + arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->serialized_string, (const char *)arg2); + } else { + arg1->serialized_string = 0; + } + } + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1serialized_1string_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (char *) ((arg1)->serialized_string); + if(result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + +SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1mine_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + ESLevent *arg1 = (ESLevent *) 0 ; + int arg2 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->mine = arg2; + +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1mine_1get(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jint jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (int) ((arg1)->mine); + jresult = (jint)result; + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_new_1ESLevent_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) { + jlong jresult = 0 ; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) NULL ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + arg1 = 0; + if (jarg1) { + arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0); + if (!arg1) return 0; + } + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (ESLevent *)new ESLevent((char const *)arg1,(char const *)arg2); + *(ESLevent **)&jresult = result; + if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1); + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_new_1ESLevent_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) { + jlong jresult = 0 ; + esl_event_t *arg1 = (esl_event_t *) 0 ; + int arg2 = (int) 0 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + arg1 = *(esl_event_t **)&jarg1; + arg2 = (int)jarg2; + result = (ESLevent *)new ESLevent(arg1,arg2); + *(ESLevent **)&jresult = result; + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_new_1ESLevent_1_1SWIG_12(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jlong jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (ESLevent *)new ESLevent(arg1); + *(ESLevent **)&jresult = result; + return jresult; +} + + +SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_delete_1ESLevent(JNIEnv *jenv, jclass jcls, jlong jarg1) { + ESLevent *arg1 = (ESLevent *) 0 ; + + (void)jenv; + (void)jcls; + arg1 = *(ESLevent **)&jarg1; + delete arg1; + +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1serialize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *arg2 = (char *) NULL ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (char *)(arg1)->serialize((char const *)arg2); + if(result) jresult = jenv->NewStringUTF((const char *)result); + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1setPriority(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) { + jboolean jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + esl_priority_t arg2 = (esl_priority_t) ESL_PRIORITY_NORMAL ; + bool result; + esl_priority_t *argp2 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + argp2 = *(esl_priority_t **)&jarg2; + if (!argp2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null esl_priority_t"); + return 0; + } + arg2 = *argp2; + result = (bool)(arg1)->setPriority(arg2); + jresult = (jboolean)result; + return jresult; +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1getHeader(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *arg2 = (char *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (char *)(arg1)->getHeader((char const *)arg2); + if(result) jresult = jenv->NewStringUTF((const char *)result); + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1getBody(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (char *)(arg1)->getBody(); + if(result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1getType(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (char *)(arg1)->getType(); + if(result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1addBody(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jboolean jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *arg2 = (char *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (bool)(arg1)->addBody((char const *)arg2); + jresult = (jboolean)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1addHeader(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) { + jboolean jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + result = (bool)(arg1)->addHeader((char const *)arg2,(char const *)arg3); + jresult = (jboolean)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + return jresult; +} + + +SWIGEXPORT jboolean JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1delHeader(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jboolean jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *arg2 = (char *) 0 ; + bool result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (bool)(arg1)->delHeader((char const *)arg2); + jresult = (jboolean)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1firstHeader(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (char *)(arg1)->firstHeader(); + if(result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + +SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1nextHeader(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jstring jresult = 0 ; + ESLevent *arg1 = (ESLevent *) 0 ; + char *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLevent **)&jarg1; + result = (char *)(arg1)->nextHeader(); + if(result) jresult = jenv->NewStringUTF((const char *)result); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_new_1ESLconnection_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2, jstring jarg3) { + jlong jresult = 0 ; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + ESLconnection *result = 0 ; + + (void)jenv; + (void)jcls; + arg1 = 0; + if (jarg1) { + arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0); + if (!arg1) return 0; + } + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + result = (ESLconnection *)new ESLconnection((char const *)arg1,(char const *)arg2,(char const *)arg3); + *(ESLconnection **)&jresult = result; + if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1); + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_new_1ESLconnection_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jint jarg1) { + jlong jresult = 0 ; + int arg1 ; + ESLconnection *result = 0 ; + + (void)jenv; + (void)jcls; + arg1 = (int)jarg1; + result = (ESLconnection *)new ESLconnection(arg1); + *(ESLconnection **)&jresult = result; + return jresult; +} + + +SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_delete_1ESLconnection(JNIEnv *jenv, jclass jcls, jlong jarg1) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + + (void)jenv; + (void)jcls; + arg1 = *(ESLconnection **)&jarg1; + delete arg1; + +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1socketDescriptor(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + result = (int)(arg1)->socketDescriptor(); + jresult = (jint)result; + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1connected(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + result = (int)(arg1)->connected(); + jresult = (jint)result; + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1getInfo(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + result = (ESLevent *)(arg1)->getInfo(); + *(ESLevent **)&jresult = result; + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1send(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (int)(arg1)->send((char const *)arg2); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1sendRecv(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (ESLevent *)(arg1)->sendRecv((char const *)arg2); + *(ESLevent **)&jresult = result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1api(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3); + *(ESLevent **)&jresult = result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1bgapi(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3); + *(ESLevent **)&jresult = result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1sendEvent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + ESLevent *arg2 = (ESLevent *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + (void)jarg2_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = *(ESLevent **)&jarg2; + result = (int)(arg1)->sendEvent(arg2); + jresult = (jint)result; + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1recvEvent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + result = (ESLevent *)(arg1)->recvEvent(); + *(ESLevent **)&jresult = result; + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1recvEventTimed(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int arg2 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = (int)jarg2; + result = (ESLevent *)(arg1)->recvEventTimed(arg2); + *(ESLevent **)&jresult = result; + return jresult; +} + + +SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1filter(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) { + jlong jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + ESLevent *result = 0 ; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + *(ESLevent **)&jresult = result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1events(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + result = (int)(arg1)->events((char const *)arg2,(char const *)arg3); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1execute(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + arg4 = 0; + if (jarg4) { + arg4 = (char *)jenv->GetStringUTFChars(jarg4, 0); + if (!arg4) return 0; + } + result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1executeAsync(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = 0; + if (jarg3) { + arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0); + if (!arg3) return 0; + } + arg4 = 0; + if (jarg4) { + arg4 = (char *)jenv->GetStringUTFChars(jarg4, 0); + if (!arg4) return 0; + } + result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); + if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1setAsyncExecute(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (int)(arg1)->setAsyncExecute((char const *)arg2); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1setEventLock(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + result = (int)(arg1)->setEventLock((char const *)arg2); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + +SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1disconnect(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { + jint jresult = 0 ; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(ESLconnection **)&jarg1; + result = (int)(arg1)->disconnect(); + jresult = (jint)result; + return jresult; +} + + +SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_eslSetLogLevel(JNIEnv *jenv, jclass jcls, jint jarg1) { + int arg1 ; + + (void)jenv; + (void)jcls; + arg1 = (int)jarg1; + eslSetLogLevel(arg1); +} + + +#ifdef __cplusplus +} +#endif + Added: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java Thu Jun 25 11:02:37 2009 @@ -0,0 +1,119 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.esl; + +public class ESLconnection { + private long swigCPtr; + protected boolean swigCMemOwn; + + protected ESLconnection(long cPtr, boolean cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr(ESLconnection obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } + + protected void finalize() { + delete(); + } + + public synchronized void delete() { + if(swigCPtr != 0 && swigCMemOwn) { + swigCMemOwn = false; + eslJNI.delete_ESLconnection(swigCPtr); + } + swigCPtr = 0; + } + + public ESLconnection(String host, String port, String password) { + this(eslJNI.new_ESLconnection__SWIG_0(host, port, password), true); + } + + public ESLconnection(int socket) { + this(eslJNI.new_ESLconnection__SWIG_1(socket), true); + } + + public int socketDescriptor() { + return eslJNI.ESLconnection_socketDescriptor(swigCPtr, this); + } + + public int connected() { + return eslJNI.ESLconnection_connected(swigCPtr, this); + } + + public ESLevent getInfo() { + long cPtr = eslJNI.ESLconnection_getInfo(swigCPtr, this); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public int send(String cmd) { + return eslJNI.ESLconnection_send(swigCPtr, this, cmd); + } + + public ESLevent sendRecv(String cmd) { + long cPtr = eslJNI.ESLconnection_sendRecv(swigCPtr, this, cmd); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public ESLevent api(String cmd, String arg) { + long cPtr = eslJNI.ESLconnection_api(swigCPtr, this, cmd, arg); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public ESLevent bgapi(String cmd, String arg) { + long cPtr = eslJNI.ESLconnection_bgapi(swigCPtr, this, cmd, arg); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public int sendEvent(ESLevent send_me) { + return eslJNI.ESLconnection_sendEvent(swigCPtr, this, ESLevent.getCPtr(send_me), send_me); + } + + public ESLevent recvEvent() { + long cPtr = eslJNI.ESLconnection_recvEvent(swigCPtr, this); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public ESLevent recvEventTimed(int ms) { + long cPtr = eslJNI.ESLconnection_recvEventTimed(swigCPtr, this, ms); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public ESLevent filter(String header, String value) { + long cPtr = eslJNI.ESLconnection_filter(swigCPtr, this, header, value); + return (cPtr == 0) ? null : new ESLevent(cPtr, false); + } + + public int events(String etype, String value) { + return eslJNI.ESLconnection_events(swigCPtr, this, etype, value); + } + + public int execute(String app, String arg, String uuid) { + return eslJNI.ESLconnection_execute(swigCPtr, this, app, arg, uuid); + } + + public int executeAsync(String app, String arg, String uuid) { + return eslJNI.ESLconnection_executeAsync(swigCPtr, this, app, arg, uuid); + } + + public int setAsyncExecute(String val) { + return eslJNI.ESLconnection_setAsyncExecute(swigCPtr, this, val); + } + + public int setEventLock(String val) { + return eslJNI.ESLconnection_setEventLock(swigCPtr, this, val); + } + + public int disconnect() { + return eslJNI.ESLconnection_disconnect(swigCPtr, this); + } + +} Added: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLevent.java ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLevent.java Thu Jun 25 11:02:37 2009 @@ -0,0 +1,113 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.esl; + +public class ESLevent { + private long swigCPtr; + protected boolean swigCMemOwn; + + protected ESLevent(long cPtr, boolean cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr(ESLevent obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } + + protected void finalize() { + delete(); + } + + public synchronized void delete() { + if(swigCPtr != 0 && swigCMemOwn) { + swigCMemOwn = false; + eslJNI.delete_ESLevent(swigCPtr); + } + swigCPtr = 0; + } + + public void setEvent(SWIGTYPE_p_esl_event_t value) { + eslJNI.ESLevent_event_set(swigCPtr, this, SWIGTYPE_p_esl_event_t.getCPtr(value)); + } + + public SWIGTYPE_p_esl_event_t getEvent() { + long cPtr = eslJNI.ESLevent_event_get(swigCPtr, this); + return (cPtr == 0) ? null : new SWIGTYPE_p_esl_event_t(cPtr, false); + } + + public void setSerialized_string(String value) { + eslJNI.ESLevent_serialized_string_set(swigCPtr, this, value); + } + + public String getSerialized_string() { + return eslJNI.ESLevent_serialized_string_get(swigCPtr, this); + } + + public void setMine(int value) { + eslJNI.ESLevent_mine_set(swigCPtr, this, value); + } + + public int getMine() { + return eslJNI.ESLevent_mine_get(swigCPtr, this); + } + + public ESLevent(String type, String subclass_name) { + this(eslJNI.new_ESLevent__SWIG_0(type, subclass_name), true); + } + + public ESLevent(SWIGTYPE_p_esl_event_t wrap_me, int free_me) { + this(eslJNI.new_ESLevent__SWIG_1(SWIGTYPE_p_esl_event_t.getCPtr(wrap_me), free_me), true); + } + + public ESLevent(ESLevent me) { + this(eslJNI.new_ESLevent__SWIG_2(ESLevent.getCPtr(me), me), true); + } + + public String serialize(String format) { + return eslJNI.ESLevent_serialize(swigCPtr, this, format); + } + + public boolean setPriority(SWIGTYPE_p_esl_priority_t priority) { + return eslJNI.ESLevent_setPriority(swigCPtr, this, SWIGTYPE_p_esl_priority_t.getCPtr(priority)); + } + + public String getHeader(String header_name) { + return eslJNI.ESLevent_getHeader(swigCPtr, this, header_name); + } + + public String getBody() { + return eslJNI.ESLevent_getBody(swigCPtr, this); + } + + public String getType() { + return eslJNI.ESLevent_getType(swigCPtr, this); + } + + public boolean addBody(String value) { + return eslJNI.ESLevent_addBody(swigCPtr, this, value); + } + + public boolean addHeader(String header_name, String value) { + return eslJNI.ESLevent_addHeader(swigCPtr, this, header_name, value); + } + + public boolean delHeader(String header_name) { + return eslJNI.ESLevent_delHeader(swigCPtr, this, header_name); + } + + public String firstHeader() { + return eslJNI.ESLevent_firstHeader(swigCPtr, this); + } + + public String nextHeader() { + return eslJNI.ESLevent_nextHeader(swigCPtr, this); + } + +} Added: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_event_t.java ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_event_t.java Thu Jun 25 11:02:37 2009 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.esl; + +public class SWIGTYPE_p_esl_event_t { + private long swigCPtr; + + protected SWIGTYPE_p_esl_event_t(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_esl_event_t() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_esl_event_t obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + Added: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_priority_t.java ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_priority_t.java Thu Jun 25 11:02:37 2009 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.esl; + +public class SWIGTYPE_p_esl_priority_t { + private long swigCPtr; + + protected SWIGTYPE_p_esl_priority_t(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_esl_priority_t() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_esl_priority_t obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + Added: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/esl.java ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/esl.java Thu Jun 25 11:02:37 2009 @@ -0,0 +1,16 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.esl; + +public class esl { + public static void eslSetLogLevel(int level) { + eslJNI.eslSetLogLevel(level); + } + +} Added: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java Thu Jun 25 11:02:37 2009 @@ -0,0 +1,53 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.esl; + +class eslJNI { + public final static native void ESLevent_event_set(long jarg1, ESLevent jarg1_, long jarg2); + public final static native long ESLevent_event_get(long jarg1, ESLevent jarg1_); + public final static native void ESLevent_serialized_string_set(long jarg1, ESLevent jarg1_, String jarg2); + public final static native String ESLevent_serialized_string_get(long jarg1, ESLevent jarg1_); + public final static native void ESLevent_mine_set(long jarg1, ESLevent jarg1_, int jarg2); + public final static native int ESLevent_mine_get(long jarg1, ESLevent jarg1_); + public final static native long new_ESLevent__SWIG_0(String jarg1, String jarg2); + public final static native long new_ESLevent__SWIG_1(long jarg1, int jarg2); + public final static native long new_ESLevent__SWIG_2(long jarg1, ESLevent jarg1_); + public final static native void delete_ESLevent(long jarg1); + public final static native String ESLevent_serialize(long jarg1, ESLevent jarg1_, String jarg2); + public final static native boolean ESLevent_setPriority(long jarg1, ESLevent jarg1_, long jarg2); + public final static native String ESLevent_getHeader(long jarg1, ESLevent jarg1_, String jarg2); + public final static native String ESLevent_getBody(long jarg1, ESLevent jarg1_); + public final static native String ESLevent_getType(long jarg1, ESLevent jarg1_); + public final static native boolean ESLevent_addBody(long jarg1, ESLevent jarg1_, String jarg2); + public final static native boolean ESLevent_addHeader(long jarg1, ESLevent jarg1_, String jarg2, String jarg3); + public final static native boolean ESLevent_delHeader(long jarg1, ESLevent jarg1_, String jarg2); + public final static native String ESLevent_firstHeader(long jarg1, ESLevent jarg1_); + public final static native String ESLevent_nextHeader(long jarg1, ESLevent jarg1_); + public final static native long new_ESLconnection__SWIG_0(String jarg1, String jarg2, String jarg3); + public final static native long new_ESLconnection__SWIG_1(int jarg1); + public final static native void delete_ESLconnection(long jarg1); + public final static native int ESLconnection_socketDescriptor(long jarg1, ESLconnection jarg1_); + public final static native int ESLconnection_connected(long jarg1, ESLconnection jarg1_); + public final static native long ESLconnection_getInfo(long jarg1, ESLconnection jarg1_); + public final static native int ESLconnection_send(long jarg1, ESLconnection jarg1_, String jarg2); + public final static native long ESLconnection_sendRecv(long jarg1, ESLconnection jarg1_, String jarg2); + public final static native long ESLconnection_api(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3); + public final static native long ESLconnection_bgapi(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3); + public final static native int ESLconnection_sendEvent(long jarg1, ESLconnection jarg1_, long jarg2, ESLevent jarg2_); + public final static native long ESLconnection_recvEvent(long jarg1, ESLconnection jarg1_); + public final static native long ESLconnection_recvEventTimed(long jarg1, ESLconnection jarg1_, int jarg2); + public final static native long ESLconnection_filter(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3); + public final static native int ESLconnection_events(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3); + public final static native int ESLconnection_execute(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4); + public final static native int ESLconnection_executeAsync(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4); + public final static native int ESLconnection_setAsyncExecute(long jarg1, ESLconnection jarg1_, String jarg2); + public final static native int ESLconnection_setEventLock(long jarg1, ESLconnection jarg1_, String jarg2); + public final static native int ESLconnection_disconnect(long jarg1, ESLconnection jarg1_); + public final static native void eslSetLogLevel(int jarg1); +}

1 0

[commit] r13949 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 10:59:41 2009 New Revision: 13949 Log: pelims for java esl (needs work any voulenteers?) Modified: freeswitch/trunk/libs/esl/Makefile Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Thu Jun 25 10:59:41 2009 @@ -47,6 +47,7 @@ $(MAKE) -C lua clean $(MAKE) -C python clean $(MAKE) -C ruby clean + $(MAKE) -C java clean reswig: swigclean $(MAKE) -C perl reswig @@ -54,6 +55,7 @@ $(MAKE) -C lua reswig $(MAKE) -C python reswig $(MAKE) -C ruby reswig + $(MAKE) -C java reswig swigclean: clean $(MAKE) -C perl swigclean @@ -61,6 +63,7 @@ $(MAKE) -C lua swigclean $(MAKE) -C python swigclean $(MAKE) -C ruby swigclean + $(MAKE) -C java swigclean perlmod: $(MYLIB) $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C perl @@ -77,7 +80,10 @@ rubymod: $(MYLIB) $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C ruby +javamod: $(MYLIB) + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C java + phpmod-install: phpmod $(MAKE) -C php install -everymod: perlmod phpmod luamod pymod rubymod +everymod: perlmod phpmod luamod pymod rubymod javamod

1 0

[commit] r13948 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 10:40:38 2009 New Revision: 13948 Log: mod_sofia: preserve transport on route (SFSIP-157) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Jun 25 10:40:38 2009 @@ -1454,7 +1454,7 @@ tech_pvt->transport = SOFIA_TRANSPORT_UDP; } } - + if (sofia_glue_check_nat(tech_pvt->profile, tech_pvt->remote_ip)) { tech_pvt->user_via = sofia_glue_create_external_via(session, tech_pvt->profile, tech_pvt->transport); } @@ -1671,7 +1671,7 @@ dst = sofia_glue_get_destination(tech_pvt->dest); if (dst->route_uri) { - route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, dst->route_uri, 0, SWITCH_TRUE, NULL); + route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, dst->route_uri, tech_pvt->transport, SWITCH_TRUE, NULL); } if (dst->route) {

1 0

[commit] r13947 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 09:53:08 2009 New Revision: 13947 Log: more efficient sql stmt Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Jun 25 09:53:08 2009 @@ -2823,7 +2823,8 @@ } } } else if (!strcasecmp(command, "distinct_channels")) { - sprintf(sql, "select * from channels left join calls on channels.uuid=calls.caller_uuid where uuid in (select caller_uuid from calls) or (uuid not in (select caller_uuid from calls) and uuid not in (select callee_uuid from calls)) order by created_epoch"); + sprintf(sql, "select * from channels left join calls on " + "channels.uuid=calls.caller_uuid where channels.uuid not in (select callee_uuid from calls) order by created_epoch"); if (argv[2] && !strcasecmp(argv[1], "as")) { as = argv[2]; }

1 0

[commit] r13946 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 08:24:00 2009 New Revision: 13946 Log: FSCORE-387 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Jun 25 08:24:00 2009 @@ -2784,7 +2784,7 @@ sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' order by type,name", command); } } else if (!strcasecmp(command, "calls")) { - sprintf(sql, "select * from calls order by created_epoch"); + sprintf(sql, "select * from calls order by call_created_epoch"); if (argv[1] && !strcasecmp(argv[1],"count")) { holder.justcount = 1; if (argv[3] && !strcasecmp(argv[2], "as")) {

1 0

[commit] r13945 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Wed Jun 24 20:07:03 2009 New Revision: 13945 Log: revert Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Wed Jun 24 20:07:03 2009 @@ -227,19 +227,7 @@ struct socketUnix * const socketUnixP = channelP->implP; int rc; - fd_set rfds, efds; - struct timeval tv = { 10, 0 }; - - FD_ZERO(&rfds); - FD_ZERO(&efds); - FD_SET(socketUnixP->fd, &rfds); - FD_SET(socketUnixP->fd, &efds); - - if ((rc = select(socketUnixP->fd + 1, &rfds, NULL, &efds, &tv)) > 0) { - rc = recv(socketUnixP->fd, buffer, bufferSize, 0); - } else { - rc = -1; - } + rc = recv(socketUnixP->fd, buffer, bufferSize, 0); if (rc < 0) { *failedP = TRUE;

1 0