- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13770 - in freeswitch/trunk/libs/esl: lua perl php python ruby src src/include
by FreeSWITCH SVN 12 Jun '09

12 Jun '09

Author: anthm Date: Fri Jun 12 17:57:13 2009 New Revision: 13770 Log: add socketDescriptor() method to ESL::Connection obj Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/ESL.pm freeswitch/trunk/libs/esl/perl/esl_wrap.cpp freeswitch/trunk/libs/esl/php/ESL.php freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/php/php_ESL.h freeswitch/trunk/libs/esl/python/ESL.py freeswitch/trunk/libs/esl/python/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp Fri Jun 12 17:57:13 2009 @@ -2275,6 +2275,31 @@ } +static int _wrap_ESLconnection_socketDescriptor(lua_State* L) { + int SWIG_arg = -1; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + + SWIG_check_num_args("socketDescriptor",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("socketDescriptor",1,"ESLconnection *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLconnection,0))){ + SWIG_fail_ptr("ESLconnection_socketDescriptor",1,SWIGTYPE_p_ESLconnection); + } + + result = (int)(arg1)->socketDescriptor(); + SWIG_arg=0; + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static int _wrap_ESLconnection_connected(lua_State* L) { int SWIG_arg = -1; ESLconnection *arg1 = (ESLconnection *) 0 ; @@ -2756,6 +2781,7 @@ delete arg1; } static swig_lua_method swig_ESLconnection_methods[] = { + {"socketDescriptor", _wrap_ESLconnection_socketDescriptor}, {"connected", _wrap_ESLconnection_connected}, {"getInfo", _wrap_ESLconnection_getInfo}, {"send", _wrap_ESLconnection_send}, Modified: freeswitch/trunk/libs/esl/perl/ESL.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL.pm Fri Jun 12 17:57:13 2009 @@ -128,6 +128,7 @@ } } +*socketDescriptor = *ESLc::ESLconnection_socketDescriptor; *connected = *ESLc::ESLconnection_connected; *getInfo = *ESLc::ESLconnection_getInfo; *send = *ESLc::ESLconnection_send; Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp Fri Jun 12 17:57:13 2009 @@ -2745,6 +2745,34 @@ } +XS(_wrap_ESLconnection_socketDescriptor) { + { + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: ESLconnection_socketDescriptor(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_socketDescriptor" "', argument " "1"" of type '" "ESLconnection *""'"); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + result = (int)(arg1)->socketDescriptor(); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + XS(_wrap_ESLconnection_connected) { { ESLconnection *arg1 = (ESLconnection *) 0 ; @@ -3514,6 +3542,7 @@ {"ESLc::ESLevent_nextHeader", _wrap_ESLevent_nextHeader}, {"ESLc::new_ESLconnection", _wrap_new_ESLconnection}, {"ESLc::delete_ESLconnection", _wrap_delete_ESLconnection}, +{"ESLc::ESLconnection_socketDescriptor", _wrap_ESLconnection_socketDescriptor}, {"ESLc::ESLconnection_connected", _wrap_ESLconnection_connected}, {"ESLc::ESLconnection_getInfo", _wrap_ESLconnection_getInfo}, {"ESLc::ESLconnection_send", _wrap_ESLconnection_send}, Modified: freeswitch/trunk/libs/esl/php/ESL.php ============================================================================== --- freeswitch/trunk/libs/esl/php/ESL.php (original) +++ freeswitch/trunk/libs/esl/php/ESL.php Fri Jun 12 17:57:13 2009 @@ -121,6 +121,10 @@ $this->_cPtr=$r; } + function socketDescriptor() { + return ESLconnection_socketDescriptor($this->_cPtr); + } + function connected() { return ESLconnection_connected($this->_cPtr); } Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Fri Jun 12 17:57:13 2009 @@ -1821,6 +1821,32 @@ } +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_socketDescriptor) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + zval **args[1]; + + SWIG_ResetError(); + if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) { + WRONG_PARAM_COUNT; + } + + { + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLconnection, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLconnection_socketDescriptor. Expected SWIGTYPE_p_ESLconnection"); + } + } + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); + result = (int)(arg1)->socketDescriptor(); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg()); +} + + ZEND_NAMED_FUNCTION(_wrap_ESLconnection_connected) { ESLconnection *arg1 = (ESLconnection *) 0 ; int result; @@ -2454,6 +2480,7 @@ SWIG_ZEND_NAMED_FE(eslevent_firstheader,_wrap_ESLevent_firstHeader,NULL) SWIG_ZEND_NAMED_FE(eslevent_nextheader,_wrap_ESLevent_nextHeader,NULL) SWIG_ZEND_NAMED_FE(new_eslconnection,_wrap_new_ESLconnection,NULL) + SWIG_ZEND_NAMED_FE(eslconnection_socketdescriptor,_wrap_ESLconnection_socketDescriptor,NULL) SWIG_ZEND_NAMED_FE(eslconnection_connected,_wrap_ESLconnection_connected,NULL) SWIG_ZEND_NAMED_FE(eslconnection_getinfo,_wrap_ESLconnection_getInfo,NULL) SWIG_ZEND_NAMED_FE(eslconnection_send,_wrap_ESLconnection_send,NULL) Modified: freeswitch/trunk/libs/esl/php/php_ESL.h ============================================================================== --- freeswitch/trunk/libs/esl/php/php_ESL.h (original) +++ freeswitch/trunk/libs/esl/php/php_ESL.h Fri Jun 12 17:57:13 2009 @@ -50,6 +50,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_firstHeader); ZEND_NAMED_FUNCTION(_wrap_ESLevent_nextHeader); ZEND_NAMED_FUNCTION(_wrap_new_ESLconnection); +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_socketDescriptor); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_connected); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_getInfo); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_send); Modified: freeswitch/trunk/libs/esl/python/ESL.py ============================================================================== --- freeswitch/trunk/libs/esl/python/ESL.py (original) +++ freeswitch/trunk/libs/esl/python/ESL.py Fri Jun 12 17:57:13 2009 @@ -77,6 +77,7 @@ except: self.this = this __swig_destroy__ = _ESL.delete_ESLconnection __del__ = lambda self : None; + def socketDescriptor(*args): return apply(_ESL.ESLconnection_socketDescriptor, args) def connected(*args): return apply(_ESL.ESLconnection_connected, args) def getInfo(*args): return apply(_ESL.ESLconnection_getInfo, args) def send(*args): return apply(_ESL.ESLconnection_send, args) Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Fri Jun 12 17:57:13 2009 @@ -3659,6 +3659,28 @@ } +SWIGINTERN PyObject *_wrap_ESLconnection_socketDescriptor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:ESLconnection_socketDescriptor",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_socketDescriptor" "', argument " "1"" of type '" "ESLconnection *""'"); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + result = (int)(arg1)->socketDescriptor(); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_ESLconnection_connected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; ESLconnection *arg1 = (ESLconnection *) 0 ; @@ -4307,6 +4329,7 @@ { (char *)"ESLevent_swigregister", ESLevent_swigregister, METH_VARARGS, NULL}, { (char *)"new_ESLconnection", _wrap_new_ESLconnection, METH_VARARGS, NULL}, { (char *)"delete_ESLconnection", _wrap_delete_ESLconnection, METH_VARARGS, NULL}, + { (char *)"ESLconnection_socketDescriptor", _wrap_ESLconnection_socketDescriptor, METH_VARARGS, NULL}, { (char *)"ESLconnection_connected", _wrap_ESLconnection_connected, METH_VARARGS, NULL}, { (char *)"ESLconnection_getInfo", _wrap_ESLconnection_getInfo, METH_VARARGS, NULL}, { (char *)"ESLconnection_send", _wrap_ESLconnection_send, METH_VARARGS, NULL}, Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Fri Jun 12 17:57:13 2009 @@ -2781,6 +2781,30 @@ } SWIGINTERN VALUE +_wrap_ESLconnection_socketDescriptor(int argc, VALUE *argv, VALUE self) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLconnection *","socketDescriptor", 1, self )); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + result = (int)(arg1)->socketDescriptor(); + vresult = SWIG_From_int(static_cast< int >(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE _wrap_ESLconnection_connected(int argc, VALUE *argv, VALUE self) { ESLconnection *arg1 = (ESLconnection *) 0 ; int result; @@ -3729,6 +3753,7 @@ SWIG_TypeClientData(SWIGTYPE_p_ESLconnection, (void *) &cESLconnection); rb_define_alloc_func(cESLconnection.klass, _wrap_ESLconnection_allocate); rb_define_method(cESLconnection.klass, "initialize", VALUEFUNC(_wrap_new_ESLconnection), -1); + rb_define_method(cESLconnection.klass, "socketDescriptor", VALUEFUNC(_wrap_ESLconnection_socketDescriptor), -1); rb_define_method(cESLconnection.klass, "connected", VALUEFUNC(_wrap_ESLconnection_connected), -1); rb_define_method(cESLconnection.klass, "getInfo", VALUEFUNC(_wrap_ESLconnection_getInfo), -1); rb_define_method(cESLconnection.klass, "send", VALUEFUNC(_wrap_ESLconnection_send), -1); Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Fri Jun 12 17:57:13 2009 @@ -33,6 +33,16 @@ } +int ESLconnection::socketDescriptor() +{ + if (handle.connected) { + return (int) handle.sock; + } + + return -1; +} + + int ESLconnection::disconnect() { if (handle.connected) { Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Fri Jun 12 17:57:13 2009 @@ -76,6 +76,7 @@ ESLconnection(const char *host, const char *port, const char *password); ESLconnection(int socket); virtual ~ESLconnection(); + int socketDescriptor(); int connected(); ESLevent *getInfo(); int send(const char *cmd);

1 0

[commit] r13769 - in freeswitch/trunk/src: . include mod/applications/mod_voicemail
by FreeSWITCH SVN 12 Jun '09

12 Jun '09

Author: anthm Date: Fri Jun 12 11:06:34 2009 New Revision: 13769 Log: record_sample_rate variable influences the rate record app will use Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Jun 12 11:06:34 2009 @@ -86,6 +86,7 @@ return SWITCH_TRUE; } +#define switch_is_valid_rate(_tmp) (_tmp == 8000 || _tmp == 16000 || _tmp == 32000 || _tmp == 11025 || _tmp == 22050 || _tmp == 44100 || _tmp == 48000) static inline int switch_string_has_escaped_data(const char *in) { Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Jun 12 11:06:34 2009 @@ -587,7 +587,7 @@ if (!switch_strlen_zero(val)) { tmp = atoi(val); } - if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) { + if (switch_is_valid_rate(tmp)) { record_sample_rate = tmp; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid samplerate %s\n", val); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Jun 12 11:06:34 2009 @@ -979,7 +979,7 @@ tmp = atoi(vval); - if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) { + if (switch_is_valid_rate(tmp)) { rh->fh->samplerate = tmp; } } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Jun 12 11:06:34 2009 @@ -421,7 +421,7 @@ tmp = atoi(vval); - if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) { + if (switch_is_valid_rate(tmp)) { fh->samplerate = tmp; } }

1 0

[commit] r13768 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Jun '09

12 Jun '09

Author: anthm Date: Fri Jun 12 11:02:23 2009 New Revision: 13768 Log: record_sample_rate variable influences the rate record app will use Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Jun 12 11:02:23 2009 @@ -973,6 +973,17 @@ rh->file = switch_core_session_strdup(session, file); rh->lead_in = LEAD_IN; + + if ((vval = switch_channel_get_variable(channel, "record_sample_rate"))) { + int tmp = 0; + + tmp = atoi(vval); + + if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) { + rh->fh->samplerate = tmp; + } + } + if ((status = switch_core_media_bug_add(session, record_callback, rh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file); switch_core_file_close(fh);

1 0

[commit] r13767 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Jun '09

12 Jun '09

Author: anthm Date: Fri Jun 12 10:59:19 2009 New Revision: 13767 Log: record_sample_rate variable influences the rate record app will use Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Jun 12 10:59:19 2009 @@ -416,6 +416,17 @@ fh->channels = read_impl.number_of_channels; fh->native_rate = read_impl.actual_samples_per_second; + if ((vval = switch_channel_get_variable(channel, "record_sample_rate"))) { + int tmp = 0; + + tmp = atoi(vval); + + if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) { + fh->samplerate = tmp; + } + } + + if ((vval = switch_channel_get_variable(channel, "record_waste_resources"))) { if (switch_true(vval)) {

1 0

[commit] r13766 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: andrew Date: Thu Jun 11 18:48:08 2009 New Revision: 13766 Log: Huh, I guess that was a socket not a file descriptor Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj Thu Jun 11 18:48:08 2009 @@ -119,7 +119,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions=""C:\cygwin\home\andrew\otp_src_R13B01\lib\erl_interface\obj.debug\win32/ei.lib"" + AdditionalOptions=""C:\cygwin\home\andrew\otp_src_R13B01\lib\erl_interface\obj.debug\win32/ei.lib" /NODEFAULTLIB:libcmt" RandomizedBaseAddress="1" DataExecutionPrevention="0" /> Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Jun 11 18:48:08 2009 @@ -1586,7 +1586,7 @@ /* cleanup epmd registration */ ei_unpublish(&ec); - close(epmdfd); + close_socket(&epmdfd); init_failed: close_socket(&listen_list.sockfd);

1 0

[commit] r13765 - freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: jmesquita Date: Thu Jun 11 18:03:23 2009 New Revision: 13765 Log: Added <khomp show links> api command Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile Thu Jun 11 18:03:23 2009 @@ -1,5 +1,5 @@ MODNAME=mod_khomp -LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL -lboost_thread -lboost_regex +LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL LOCAL_OBJS= ./commons/k3lapi.o Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 11 18:03:23 2009 @@ -30,7 +30,7 @@ * */ -#define KHOMP_SYNTAX "khomp [show]" +#define KHOMP_SYNTAX "khomp show [info|links]" /* Our includes */ #include "k3lapi.hpp" @@ -38,6 +38,7 @@ extern "C" { #include <switch.h> + #include "k3l.h" } SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load); @@ -125,6 +126,7 @@ /* My function prototypes */ static void printBoardsInfo(switch_stream_handle_t*); +static const char* linkStatus(unsigned int device, unsigned int link); @@ -493,7 +495,7 @@ static switch_status_t load_config(void) { - char *cf = "khomp.conf"; + const char *cf = "khomp.conf"; switch_xml_t cfg, xml, settings, param; memset(&globals, 0, sizeof(globals)); @@ -620,10 +622,8 @@ } /* - khomp API - Only displays board information right now + khomp API definition */ - SWITCH_STANDARD_API(khomp) { char *argv[10] = { 0 }; @@ -640,13 +640,34 @@ return SWITCH_STATUS_FALSE; } - if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 1) { + if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); goto done; } - if (argv[0] && !strncasecmp(argv[0], "show", 6)) { - printBoardsInfo(stream); + /* Below show ... */ + if (argv[0] && !strncasecmp(argv[0], "show", 4)) { + /* Show the API summary and information */ + if (argv[1] && !strncasecmp(argv[1], "info", 4)) { + printBoardsInfo(stream); + } + /* Show all the links and their status */ + if (argv[1] && !strncasecmp(argv[1], "links", 5)) { + for(int device=0 ; device < k3l->device_count() ; device++) + { + stream->write_function(stream, "___________________________________________\n"); + stream->write_function(stream, "|--------------Khomp Links----------------|\n"); + stream->write_function(stream, "|----Board----|----Link----|----Status----|\n"); + for(int link=0 ; link < k3l->link_count(device) ; link++) + { + stream->write_function(stream, "|%13d|%12d|%s|\n" + , device + , link + , linkStatus(device, link)); + } + } + stream->write_function(stream, "-------------------------------------------\n"); + } } else { stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX); @@ -658,6 +679,64 @@ } +/* Helper functions */ +static const char * linkStatus(unsigned int device, unsigned int link) +{ + + K3L_LINK_CONFIG & config = k3l->link_config(device, link); + K3L_LINK_STATUS status; + + KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (device, link + ksoLink, &status, sizeof(status)); + + if (ret == ksSuccess) + { + switch (config.Signaling) + { + case ksigInactive: + return "[ksigInactive]"; + + case ksigAnalog: + return "[ksigAnalog]"; + + case ksigSIP: + return "[ksigSIP]"; + + case ksigOpenCAS: + case ksigOpenR2: + case ksigR2Digital: + case ksigUserR2Digital: + case ksigOpenCCS: + case ksigPRI_EndPoint: + case ksigPRI_Network: + case ksigPRI_Passive: + case ksigLineSide: + case ksigCAS_EL7: + case ksigAnalogTerminal: + if (kesOk == status.E1) + { + return "kesOk"; + } + else + { + if (kesSignalLost & status.E1) return "SignalLost"; + if (kesNetworkAlarm & status.E1) return "NetworkAlarm"; + if (kesFrameSyncLost & status.E1) return "FrameSyncLost"; + if (kesMultiframeSyncLost & status.E1) return "MultiframeSyncLost"; + if (kesRemoteAlarm & status.E1) return "RemoteAlarm"; + if (kesHighErrorRate & status.E1) return "HighErrorRate"; + if (kesUnknownAlarm & status.E1) return "UnknownAlarm"; + if (kesE1Error & status.E1) return "E1Error"; + + } + default: + return "NotImplementedBoard"; + } + } + + return "<unknown>"; +} + + static void printBoardsInfo(switch_stream_handle_t* stream) { K3L_API_CONFIG apiCfg; @@ -759,6 +838,7 @@ stream->write_function(stream, " ------------------------------------------------------------------\n"); } +/* End of helper functions */ /* For Emacs:

1 0

[commit] r13764 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: andrew Date: Thu Jun 11 17:29:37 2009 New Revision: 13764 Log: Add sorta working win32 support Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Thu Jun 11 17:29:37 2009 @@ -143,9 +143,9 @@ /* function to spawn a process on a remote node */ int ei_spawn(struct ei_cnode_s *ec, int sockfd, erlang_ref *ref, char *module, char *function, int argc, char **argv) { + int i; ei_x_buff buf; ei_x_new_with_version(&buf); - int i; ei_x_encode_tuple_header(&buf, 3); ei_x_encode_atom(&buf, "$gen_call"); @@ -323,7 +323,7 @@ memset(&server_addr, 0, sizeof(server_addr)); /* convert the configured IP to network byte order, handing errors */ - rv = inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr); + rv = switch_inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr); if (rv == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not parse invalid ip address: %s\n", prefs.ip); return SWITCH_STATUS_FALSE; @@ -336,7 +336,11 @@ server_addr.sin_family = AF_INET; server_addr.sin_port = htons(prefs.port); - if ((nodehost = gethostbyaddr(&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET))) +#ifdef WIN32 + if ((nodehost = gethostbyaddr((const char*)&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET))) +#else + if ((nodehost = gethostbyaddr((const char*)&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET))) +#endif memcpy(thishostname, nodehost->h_name, EI_MAXHOSTNAMELEN); if (switch_strlen_zero_buf(thishostname)) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Thu Jun 11 17:29:37 2009 @@ -79,10 +79,11 @@ switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) { + ei_x_buff ebuf; + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Job-UUID", acs->uuid_str); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Job-Command", acs->api_cmd); - ei_x_buff ebuf; ei_x_new_with_version(&ebuf); if (acs->arg) { @@ -250,20 +251,22 @@ else { int custom = 0; switch_event_types_t type; + int i = 0; if (!switch_test_flag(listener, LFLAG_EVENTS)) { switch_set_flag_locked(listener, LFLAG_EVENTS); } - for (int i = 1; i < arity; i++) { + for (i = 1; i < arity; i++) { if (!ei_decode_atom(buf->buff, &buf->index, atom)) { if (custom) { switch_core_hash_insert(listener->event_hash, atom, MARKER); } else if (switch_name_event(atom, &type) == SWITCH_STATUS_SUCCESS) { if (type == SWITCH_EVENT_ALL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ALL events enabled\n"); uint32_t x = 0; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ALL events enabled\n"); for (x = 0; x < SWITCH_EVENT_ALL; x++) { listener->event_list[x] = 1; } @@ -295,9 +298,10 @@ } else { int custom = 0; + int i = 0; switch_event_types_t type; - for (int i = 1; i < arity; i++) { + for (i = 1; i < arity; i++) { if (!ei_decode_atom(buf->buff, &buf->index, atom)) { if (custom) { Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj Thu Jun 11 17:29:37 2009 @@ -0,0 +1,299 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_erlang_event" + ProjectGUID="{024864AC-0022-45F0-AB06-915C3E2C0FF1}" + RootNamespace="mod_erlang_event" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/I "C:\Program Files\erl5.7.1\lib\erl_interface-3.6.1\include" /D "WIN32" /D "__WIN32__"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions=""C:\cygwin\home\andrew\otp_src_R13B01\lib\erl_interface\obj.debug\win32/ei.lib" /NODEFAULTLIB:libcmt" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/I "C:\Program Files\erl5.7.1\lib\erl_interface-3.6.1\include" /D "WIN32" /D "__WIN32__"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions=""C:\cygwin\home\andrew\otp_src_R13B01\lib\erl_interface\obj.debug\win32/ei.lib"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\ei_helpers.c" + > + </File> + <File + RelativePath=".\handle_msg.c" + > + </File> + <File + RelativePath=".\mod_erlang_event.c" + > + </File> + <File + RelativePath=".\mod_erlang_event.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Thu Jun 11 17:29:37 2009 @@ -240,14 +240,19 @@ } +#ifdef WIN32 +static void close_socket(SOCKET *sock) +#else static void close_socket(int *sock) +#endif { switch_mutex_lock(listen_list.sock_mutex); if (*sock) { - shutdown(*sock, SHUT_RDWR); #ifdef WIN32 + shutdown(*sock, SD_BOTH); closesocket(*sock); #else + shutdown(*sock, SHUT_RDWR); close(*sock); #endif sock = NULL; @@ -357,21 +362,22 @@ static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data) { - switch_xml_t xml = NULL; - struct erlang_binding *ptr; - switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1]; int type, size; int i = 0; void *p = NULL; char *xmlstr; + struct erlang_binding *ptr; + switch_uuid_t uuid; + switch_xml_section_t section; + switch_xml_t xml = NULL; ei_x_buff *rep; ei_x_buff buf; ei_x_new_with_version(&buf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "looking for bindings\n"); - switch_xml_section_t section = switch_xml_parse_section_string((char *) sectionstr); + section = switch_xml_parse_section_string((char *) sectionstr); for (ptr = bindings.head; ptr && ptr->section != section; ptr = ptr->next); /* just get the first match */ @@ -459,6 +465,7 @@ switch_core_session_t *session; switch_event_t *call_event=NULL; switch_channel_t *channel=NULL; + ei_x_buff lbuf; /* Send a message to the associated registered process to let it know there is a call. Message is a tuple of the form {call, <call-event>} @@ -480,7 +487,6 @@ switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Content-Type", "command/reply"); switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Reply-Text", "+OK\n"); - ei_x_buff lbuf; ei_x_new_with_version(&lbuf); ei_x_encode_tuple_header(&lbuf, 2); ei_x_encode_atom(&lbuf, "call"); @@ -709,11 +715,10 @@ while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN) && !prefs.done) { erlang_msg msg; - ei_x_buff buf; - ei_x_new(&buf); - ei_x_buff rbuf; + + ei_x_new(&buf); ei_x_new_with_version(&rbuf); /* do we need the mutex when reading? */ @@ -1464,7 +1469,7 @@ memset(&server_addr, 0, sizeof(server_addr)); /* convert the configured IP to network byte order, handing errors */ - rv = inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr); + rv = switch_inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr); if (rv == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not parse invalid ip address: %s\n", prefs.ip); goto init_failed; @@ -1485,7 +1490,11 @@ goto sock_fail; } +#ifdef WIN32 + if (setsockopt(listen_list.sockfd, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on))) { +#else if (setsockopt(listen_list.sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))) { +#endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to enable SO_REUSEADDR for socket on %s:%u : %s\n", prefs.ip, prefs.port, strerror(errno)); goto sock_fail; } @@ -1500,7 +1509,7 @@ goto sock_fail; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket %d up listening on %s:%u\n", listen_list.sockfd, prefs.ip, prefs.port); break; sock_fail: switch_yield(100000); @@ -1538,13 +1547,18 @@ #else errno = 0; #endif - if ((clientfd = ei_accept_tmo(&ec, listen_list.sockfd, &conn, 100)) == ERL_ERROR) { + if ((clientfd = ei_accept_tmo(&ec, (int)listen_list.sockfd, &conn, 100)) == ERL_ERROR) { if (prefs.done) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting Down\n"); } else if (erl_errno == ETIMEDOUT) { continue; +#ifdef WIN32 + } else if (WSAGetLastError()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error %d %d\n", erl_errno, WSAGetLastError()); +#else } else if (errno) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error %d %d\n", erl_errno, errno); +#endif } else { /* if errno didn't get set, assume nothing *too* horrible occured */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, @@ -1557,7 +1571,7 @@ listener = new_listener(&ec,clientfd); if (listener) { /* store the IP and node name we are talking with */ - inet_ntop(AF_INET, conn.ipadr, listener->remote_ip, sizeof(listener->remote_ip)); + switch_inet_ntop(AF_INET, conn.ipadr, listener->remote_ip, sizeof(listener->remote_ip)); listener->peer_nodename = switch_core_strdup(listener->pool,conn.nodename); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching listener, connection from node %s, ip %s\n", conn.nodename, listener->remote_ip); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Thu Jun 11 17:29:37 2009 @@ -81,7 +81,11 @@ 5 call sessions will be "attached" to the same listener. */ struct listener { +#ifdef WIN32 + SOCKET sockfd; +#else int sockfd; +#endif struct ei_cnode_s *ec; struct erlang_process log_process; struct erlang_process event_process; @@ -221,7 +225,7 @@ } #ifdef WIN32 /* MSDN suggested hack to fake errno for network operations */ -#define errno WSAGetLastError() +/*#define errno WSAGetLastError()*/ #endif /* mod_erlang_event.c */

1 0

[commit] r13761 - in freeswitch/trunk/libs: libnatpmp miniupnpc
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: mikej Date: Thu Jun 11 12:34:27 2009 New Revision: 13761 Log: fix braindead SLES 10 core build (FSBUILD-173) Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c freeswitch/trunk/libs/miniupnpc/miniupnpc.c Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c ============================================================================== --- freeswitch/trunk/libs/libnatpmp/natpmp.c (original) +++ freeswitch/trunk/libs/libnatpmp/natpmp.c Thu Jun 11 12:34:27 2009 @@ -14,6 +14,9 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef __linux__ +#define _BSD_SOURCE 1 +#endif #include <string.h> #include <time.h> #ifndef _MSC_VER Modified: freeswitch/trunk/libs/miniupnpc/miniupnpc.c ============================================================================== --- freeswitch/trunk/libs/miniupnpc/miniupnpc.c (original) +++ freeswitch/trunk/libs/miniupnpc/miniupnpc.c Thu Jun 11 12:34:27 2009 @@ -29,6 +29,7 @@ #include <arpa/inet.h> #include <poll.h> #include <netdb.h> +#include <strings.h> #define closesocket close #endif #include "miniupnpc.h"

1 0

[commit] r13760 - freeswitch/trunk/libs/portaudio
by FreeSWITCH SVN 11 Jun '09

11 Jun '09

Author: mikej Date: Thu Jun 11 12:21:52 2009 New Revision: 13760 Log: fix braindead portaudio trying to build with -shared when we specified --disable-shared Modified: freeswitch/trunk/libs/portaudio/Makefile.in Modified: freeswitch/trunk/libs/portaudio/Makefile.in ============================================================================== --- freeswitch/trunk/libs/portaudio/Makefile.in (original) +++ freeswitch/trunk/libs/portaudio/Makefile.in Thu Jun 11 12:21:52 2009 @@ -40,7 +40,9 @@ PALIB = libportaudio.la PAINC = include/portaudio.h -PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "(Pa|PaMacCore)_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +PA_LDFLAGS = $(LDFLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "(Pa|PaMacCore)_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +# we are building disable-shared but its still inserting flags for shared libs??? +# $(SHARED_FLAGS) #MAKEFILE = Makefile COMMON_OBJS = \

1 0

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

11 Jun '09

Author: anthm Date: Thu Jun 11 12:17:52 2009 New Revision: 13759 Log: increase compat on NDLB-to-in-200-contact to handle NAT Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Jun 11 12:17:52 2009 @@ -4758,7 +4758,8 @@ url_set_chanvars(session, sip->sip_to->a_url, sip_to); if (switch_channel_get_variable(channel, "sip_to_uri")) { const char *ipv6; - + const char *url = NULL; + host = switch_channel_get_variable(channel, "sip_to_host"); user = switch_channel_get_variable(channel, "sip_to_user"); @@ -4783,37 +4784,33 @@ port, sofia_glue_transport2str(transport)); - if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { - if (strchr(tech_pvt->to_uri, '>')) { - tech_pvt->reply_contact = tech_pvt->to_uri; - } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s>", tech_pvt->to_uri); + if (sofia_glue_check_nat(profile, tech_pvt->remote_ip)) { + url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_public_url : profile->public_url; + } else { + url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; + } + + if ((profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) || sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { + char *at; + char *tmp = sofia_overcome_sip_uri_weakness(session, url, transport, SWITCH_TRUE, NULL); + if ((at = strchr(tmp, '@'))) { + url = switch_core_session_sprintf(session, "sip:%s%s", user, at); } - } else { - if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<sip:%s@%s>", user, host); + } + + + if (url) { + if (strchr(url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, + sofia_glue_transport2str(transport)); } else { - const char *url = NULL; - - if (sofia_glue_check_nat(profile, tech_pvt->remote_ip)) { - url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_public_url : profile->public_url; - } else { - url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; - } - - if (url) { - if (strchr(url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, - sofia_glue_transport2str(transport)); - } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, - sofia_glue_transport2str(transport)); - } - } else { - switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - } + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, + sofia_glue_transport2str(transport)); } + } else { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } + } else { const char *url = NULL; if (sofia_glue_check_nat(profile, tech_pvt->remote_ip)) {

1 0