- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4016 - freeswitch/trunk/src
by Freeswitch SVN 22 Jan '07

22 Jan '07

Author: mikej Date: Mon Jan 22 12:16:25 2007 New Revision: 4016 Modified: freeswitch/trunk/src/switch_core.c Log: rearrange a bit Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 22 12:16:25 2007 @@ -4237,13 +4237,6 @@ switch_yield(1000000); - if (runtime.memory_pool) { - apr_pool_destroy(runtime.memory_pool); - if (!vg) { - apr_terminate(); - } - } - #ifdef WIN32 free(SWITCH_GLOBAL_dirs.base_dir); free(SWITCH_GLOBAL_dirs.mod_dir); @@ -4256,6 +4249,13 @@ free(SWITCH_GLOBAL_dirs.temp_dir); #endif + if (runtime.memory_pool) { + apr_pool_destroy(runtime.memory_pool); + if (!vg) { + apr_terminate(); + } + } + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r4015 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 22 Jan '07

22 Jan '07

Author: mikej Date: Mon Jan 22 11:54:30 2007 New Revision: 4015 Modified: freeswitch/trunk/libs/iax/src/iax.c Log: use closesocket on sockets.. not close Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Mon Jan 22 11:54:30 2007 @@ -949,7 +949,7 @@ #ifdef WIN32 flags = 1; if (ioctlsocket(netfd,FIONBIO,(unsigned long *) &flags)) { - _close(netfd); + closesocket(netfd); netfd = -1; DEBU(G "Unable to set non-blocking mode."); IAXERROR "Unable to set non-blocking mode.");

1 0

[commit] r4014 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 21 Jan '07

21 Jan '07

Author: anthm Date: Sun Jan 21 14:36:55 2007 New Revision: 4014 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: let bgapi choose your own id Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Jan 21 14:36:55 2007 @@ -760,6 +760,7 @@ struct api_command_struct *acs; char *api_cmd = cmd + 6; char *arg = NULL; + char *uuid_str = NULL; strip_cr(api_cmd); if ((arg = strchr(api_cmd, ' '))) { @@ -784,8 +785,12 @@ switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, api_exec, acs, listener->pool); - switch_uuid_get(&uuid); - switch_uuid_format(acs->uuid_str, &uuid); + if ((uuid_str = switch_event_get_header(event, "job-uuid"))) { + switch_copy_string(acs->uuid_str, uuid_str, sizeof(acs->uuid_str)); + } else { + switch_uuid_get(&uuid); + switch_uuid_format(acs->uuid_str, &uuid); + } snprintf(reply, reply_len, "+OK Job-UUID: %s", acs->uuid_str); } else { snprintf(reply, reply_len, "-ERR memory error!");

1 0

[commit] r4010 - freeswitch/trunk/libs/libresample
by Freeswitch SVN 21 Jan '07

21 Jan '07

Author: mikej Date: Sat Jan 20 19:29:35 2007 New Revision: 4010 Modified: freeswitch/trunk/libs/libresample/configure (props changed) Log: make executable.

1 0

[commit] r4009 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Jan '07

20 Jan '07

Author: mikej Date: Sat Jan 20 17:32:20 2007 New Revision: 4009 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make r_sdp char * due to function w/ diff const qualifer. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Jan 20 17:32:20 2007 @@ -2574,7 +2574,7 @@ tagi_t tags[]) { - char const *l_sdp = NULL, *r_sdp = NULL; + char *l_sdp = NULL, *r_sdp = NULL; int offer_recv = 0, answer_recv = 0, offer_sent = 0, answer_sent = 0; int ss_state = nua_callstate_init; switch_channel_t *channel = NULL; @@ -2627,9 +2627,9 @@ if (r_sdp) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp); - tech_pvt->remote_sdp_str = switch_core_session_strdup(session, (char *)r_sdp); - switch_channel_set_variable(channel, SWITCH_R_SDP_VARIABLE, (char *) r_sdp); - pass_sdp(tech_pvt, (char *) r_sdp); + tech_pvt->remote_sdp_str = switch_core_session_strdup(session, r_sdp); + switch_channel_set_variable(channel, SWITCH_R_SDP_VARIABLE, r_sdp); + pass_sdp(tech_pvt, r_sdp); } }

1 0

[commit] r4008 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Jan '07

20 Jan '07

Author: anthm Date: Sat Jan 20 13:51:57 2007 New Revision: 4008 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add late negotiation mode for sofia Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Sat Jan 20 13:51:57 2007 @@ -161,6 +161,9 @@   +  +  +   <param name="accept-blind-reg" value="true"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Jan 20 13:51:57 2007 @@ -168,7 +168,8 @@ TFLAG_NOMEDIA = (1 << 20), TFLAG_BUGGY_2833 = (1 << 21), TFLAG_SIP_HOLD = (1 << 22), - TFLAG_INB_NOMEDIA = (1 << 23) + TFLAG_INB_NOMEDIA = (1 << 23), + TFLAG_LATE_NEGOTIATION = (1 << 24) } TFLAGS; static struct { @@ -1495,6 +1496,45 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t tech_media(private_object_t *tech_pvt, char *r_sdp) +{ + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); + sdp_session_t *sdp; + uint8_t match = 0; + switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); + + assert(tech_pvt != NULL); + + if (switch_strlen_zero(r_sdp)) { + return SWITCH_STATUS_FALSE; + } + + if (tech_pvt->num_codecs) { + if ((sdp = sdp_session(parser))) { + match = negotiate_sdp(tech_pvt->session, sdp); + } + } + + if (parser) { + sdp_parser_free(parser); + } + + if (match) { + if (tech_choose_port(tech_pvt) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + activate_rtp(tech_pvt); + switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); + switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); + switch_channel_set_flag(channel, CF_EARLY_MEDIA); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + + + static switch_status_t sofia_answer_channel(switch_core_session_t *session) { private_object_t *tech_pvt; @@ -1508,6 +1548,17 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); + + + if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + if (tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, "endpoint_disposition", "CODEC NEGOTIATION ERROR"); + nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + return SWITCH_STATUS_FALSE; + } + switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + } if (switch_channel_test_flag(channel, CF_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_NOMEDIA); @@ -1916,6 +1967,17 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); + + if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + if (tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, "endpoint_disposition", "CODEC NEGOTIATION ERROR"); + nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + return SWITCH_STATUS_FALSE; + } + switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + } + if (!switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA) && !switch_test_flag(tech_pvt, TFLAG_ANS)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); @@ -2502,7 +2564,6 @@ } } - static void sip_i_state(int status, char const *phrase, nua_t *nua, @@ -2617,35 +2678,15 @@ switch_core_session_rwunlock(other_session); } goto done; - } else { - sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); - sdp_session_t *sdp; - uint8_t match = 0; - - if (tech_pvt->num_codecs) { - if ((sdp = sdp_session(parser))) { - match = negotiate_sdp(session, sdp); - } - } - - if (parser) { - sdp_parser_free(parser); - } - - if (match) { - if (tech_choose_port(tech_pvt) != SWITCH_STATUS_SUCCESS) { - goto done; - } - activate_rtp(tech_pvt); - switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); - switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); - switch_channel_set_flag(channel, CF_EARLY_MEDIA); - goto done; - } - switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, - TAG_END()); - } + } else if (!switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + if (tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, "endpoint_disposition", "CODEC NEGOTIATION ERROR"); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + } + goto done; + } else { + switch_channel_set_variable(channel, "endpoint_disposition", "DELAYED NEGOTIATION"); + } } } break; @@ -4876,6 +4917,8 @@ switch_set_flag(profile, TFLAG_TIMER); } else if (!strcasecmp(var, "inbound-no-media") && switch_true(val)) { switch_set_flag(profile, TFLAG_INB_NOMEDIA); + } else if (!strcasecmp(var, "inbound-late-negotiation") && switch_true(val)) { + switch_set_flag(profile, TFLAG_LATE_NEGOTIATION); } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "sip-port")) {

1 0

[commit] r4007 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 20 Jan '07

20 Jan '07

Author: mikej Date: Fri Jan 19 19:22:43 2007 New Revision: 4007 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: "pa_dtmf" -> "pa dtmf" in api help text. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 19 19:22:43 2007 @@ -1623,7 +1623,7 @@ "pa hangup [<call_id>]\n" "pa list\n" "pa switch [<call_id>|none]\n" - "pa_dtmf <digit string>\n" + "pa dtmf <digit string>\n" "--------------------------------------------------------------------------------\n"; if (switch_strlen_zero(cmd)) {

1 0

[commit] r4006 - freeswitch/trunk/src/include
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: mikej Date: Fri Jan 19 17:47:51 2007 New Revision: 4006 Modified: freeswitch/trunk/src/include/switch_utils.h Log: doxygen Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Jan 19 17:47:51 2007 @@ -79,7 +79,13 @@ !strcasecmp(expr, "true") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE - +/*! + \brief find local ip of the box + \param buf the buffer to write the ip adress found into + \param len the length of the buf + \param family the address family to return (AF_INET or AF_INET6) + \return SWITCH_STATUS_SUCCESSS for success, otherwise failure +*/ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family); #define SWITCH_STATUS_IS_BREAK(x) (x == SWITCH_STATUS_BREAK || x == 730035 || x == 35)

1 0

[commit] r4005 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: mikej Date: Fri Jan 19 17:47:23 2007 New Revision: 4005 Modified: freeswitch/trunk/src/switch.c Log: whoops.. cr/lf -> lf Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Jan 19 17:47:23 2007 @@ -195,10 +195,10 @@ { char pid_path[256] = ""; // full path to the pid file const char *err = NULL; // error value for return from freeswitch initialization -#ifndef WIN32 - int nf = 0; // TRUE if we are running in nofork mode -#endif - int nc = 0; // TRUE if we are running in noconsole mode +#ifndef WIN32 + int nf = 0; // TRUE if we are running in nofork mode +#endif + int nc = 0; // TRUE if we are running in noconsole mode int vg = 0; // TRUE if we are running in vg mode FILE *f; // file handle to the pid file pid_t pid = 0; // @@ -259,9 +259,9 @@ } } #else - - if (argv[x] && !strcmp(argv[x], "-nf")) { - nf++; + + if (argv[x] && !strcmp(argv[x], "-nf")) { + nf++; } #endif if (argv[x] && !strcmp(argv[x], "-hp")) { @@ -273,8 +273,8 @@ } if (argv[x] && !strcmp(argv[x], "-nc")) { - nc++; - } + nc++; + } if (argv[x] && !strcmp(argv[x], "-vg")) { vg++; @@ -293,7 +293,7 @@ #ifdef WIN32 FreeConsole(); #else - if (!nf && (pid = fork())) { + if (!nf && (pid = fork())) { fprintf(stderr, "%d Backgrounding.\n", (int)pid); exit(0); }

1 0

[commit] r4004 - in freeswitch/trunk: libs/iksemel/include libs/iksemel/src libs/iksemel/test scripts/js_modules src/mod/languages/mod_spidermonkey
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: anthm Date: Fri Jan 19 16:56:31 2007 New Revision: 4004 Modified: freeswitch/trunk/libs/iksemel/include/Makefile.in freeswitch/trunk/libs/iksemel/src/Makefile.in freeswitch/trunk/libs/iksemel/test/Makefile.in freeswitch/trunk/scripts/js_modules/SpeechTools.jm freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/libs/iksemel/include/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iksemel/include/Makefile.in (original) +++ freeswitch/trunk/libs/iksemel/include/Makefile.in Fri Jan 19 16:56:31 2007 @@ -100,7 +100,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -173,7 +173,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: Modified: freeswitch/trunk/libs/iksemel/src/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iksemel/src/Makefile.in (original) +++ freeswitch/trunk/libs/iksemel/src/Makefile.in Fri Jan 19 16:56:31 2007 @@ -92,9 +92,21 @@ lib_LTLIBRARIES = libiksemel.la -@DO_POSIX_TRUE@posix_c = io-posix.c +@DO_POSIX_TRUE@posix_c = @DO_POSIX_TRUE@io-posix.c -libiksemel_la_SOURCES = ikstack.c utility.c iks.c sax.c dom.c $(posix_c) stream.c sha.c jabber.c filter.c md5.c base64.c +libiksemel_la_SOURCES = \ + ikstack.c \ + utility.c \ + iks.c \ + sax.c \ + dom.c \ + $(posix_c) \ + stream.c \ + sha.c \ + jabber.c \ + filter.c \ + md5.c \ + base64.c libiksemel_la_LDFLAGS = -version-info 3:0:0 -no-undefined @@ -127,7 +139,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(libiksemel_la_SOURCES) OBJECTS = $(libiksemel_la_OBJECTS) @@ -233,7 +245,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: Modified: freeswitch/trunk/libs/iksemel/test/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iksemel/test/Makefile.in (original) +++ freeswitch/trunk/libs/iksemel/test/Makefile.in Fri Jan 19 16:56:31 2007 @@ -164,7 +164,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(tst_ikstack_SOURCES) $(tst_iks_SOURCES) $(tst_sax_SOURCES) $(tst_dom_SOURCES) $(tst_sha_SOURCES) $(tst_md5_SOURCES) $(tst_filter_SOURCES) $(tst_jid_SOURCES) OBJECTS = $(tst_ikstack_OBJECTS) $(tst_iks_OBJECTS) $(tst_sax_OBJECTS) $(tst_dom_OBJECTS) $(tst_sha_OBJECTS) $(tst_md5_OBJECTS) $(tst_filter_OBJECTS) $(tst_jid_OBJECTS) @@ -283,7 +283,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm ============================================================================== --- freeswitch/trunk/scripts/js_modules/SpeechTools.jm (original) +++ freeswitch/trunk/scripts/js_modules/SpeechTools.jm Fri Jan 19 16:56:31 2007 @@ -311,7 +311,7 @@ if (!files[x] || files[x] == "noop") { continue; } - rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , "", this.asr.onInput, this.asr); + rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , this.asr.onInput, this.asr); if (rv) { break; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Jan 19 16:56:31 2007 @@ -402,11 +402,36 @@ static void js_error(JSContext *cx, const char *message, JSErrorReport *report) { - if (message) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, report->filename ? (char *)report->filename : "mod_spidermonkey.c", modname, report->lineno, SWITCH_LOG_ERROR, - "%s %s%s\n", message, report->linebuf ? "near " : "", report->linebuf ? report->linebuf : ""); + const char *filename = __FILE__; + int line = __LINE__; + const char *text = ""; + char *ex = ""; + + if (message && report) { + if (report->filename) { + filename = report->filename; + } + line = report->lineno; + if (report->linebuf) { + text = report->linebuf; + ex = "near "; + } } - + + if (!message) { + message = "(N/A)"; + } + + switch_log_printf(SWITCH_CHANNEL_ID_LOG, + filename, + modname, + line, + SWITCH_LOG_ERROR, + "%s %s%s\n", + ex, + message, + text); + }

1 0