- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6375 - freeswitch/trunk/src/mod/languages/mod_java
by Freeswitch SVN 22 Nov '07

22 Nov '07

Author: mikej Date: Thu Nov 22 03:07:32 2007 New Revision: 6375 Added: freeswitch/trunk/src/mod/languages/mod_java/mod_java.cpp freeswitch/trunk/src/mod/languages/mod_java/modjava.c - copied unchanged from r6374, /freeswitch/trunk/src/mod/languages/mod_java/mod_java.c Removed: freeswitch/trunk/src/mod/languages/mod_java/mod_java.c Modified: freeswitch/trunk/src/mod/languages/mod_java/Makefile.in Log: fix osx build with a dirty hack Modified: freeswitch/trunk/src/mod/languages/mod_java/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/Makefile.in (original) +++ freeswitch/trunk/src/mod/languages/mod_java/Makefile.in Thu Nov 22 03:07:32 2007 @@ -6,7 +6,7 @@ JAVA_FLAGS=@JAVA_FLAGS@ # Without -fno-strict-aliasing, g++ generates invalid code for Java_org_freeswitch_freeswitchJNI_SWIGJavaSessionUpcast, which segfaults LOCAL_CFLAGS=$(JAVA_FLAGS) -fno-strict-aliasing -LOCAL_OBJS=freeswitch_java.o switch_swig_wrap.o +LOCAL_OBJS=freeswitch_java.o switch_swig_wrap.o modjava.o CLASSES=src/org/freeswitch/Launcher.java \ src/org/freeswitch/HangupHook.java \ src/org/freeswitch/DTMFCallback.java \ Added: freeswitch/trunk/src/mod/languages/mod_java/mod_java.cpp ==============================================================================

1 0

[commit] r6374 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 22 Nov '07

22 Nov '07

Author: mikej Date: Thu Nov 22 01:56:02 2007 New Revision: 6374 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix for MODENDP-31, send stop-talking events after CNG packets as well as silent frames. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Nov 22 01:56:02 2007 @@ -1356,6 +1356,22 @@ } if (switch_test_flag(read_frame, SFF_CNG)) { + if (hangunder_hits) { + hangunder_hits--; + } + if (talking) { + switch_event_t *event; + if (++hangover_hits >= hangover) { + hangover_hits = hangunder_hits = 0; + talking = 0; + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking"); + switch_event_fire(&event); + } + } + } continue; }

1 0

[commit] r6373 - freeswitch/trunk
by Freeswitch SVN 22 Nov '07

22 Nov '07

Author: anthm Date: Thu Nov 22 01:24:24 2007 New Revision: 6373 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Log: detect ncurses or curses instead of hardcoding ncurses, fixing libedit build on some platforms Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Nov 22 01:24:24 2007 @@ -134,7 +134,6 @@ if ADD_LIBEDIT CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT CORE_LIBS += libs/libedit/src/.libs/libedit.a -freeswitch_LDADD += -lcurses endif if ADD_ODBC Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Nov 22 01:24:24 2007 @@ -393,6 +393,12 @@ AC_ARG_ENABLE(core-libedit-support, [ --enable-core-libedit-support Compile with libedit Support],,[enable_core_libedit_support="no"]) +if test "$enable_core_libedit_support" = "yes" ; then + AC_CHECK_LIB(ncurses, tgetent,, + [AC_CHECK_LIB(curses, tgetent,, + [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] ) +fi + #AX_LIB_MYSQL([MINIMUM-VERSION]) AX_LIB_MYSQL AX_CHECK_JAVA

1 0

[commit] r6372 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Nov '07

22 Nov '07

Author: mikej Date: Wed Nov 21 21:42:42 2007 New Revision: 6372 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: remove grouchy debug message. 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 Wed Nov 21 21:42:42 2007 @@ -327,7 +327,7 @@ session_timeout = v_session_timeout; } } - printf("GRRXXXXXXXXXXXXX\n%s\n", tech_pvt->local_sdp_str); + nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact),

1 0

[commit] r6371 - freeswitch/trunk/libs/js
by Freeswitch SVN 21 Nov '07

21 Nov '07

Author: anthm Date: Wed Nov 21 14:09:37 2007 New Revision: 6371 Modified: freeswitch/trunk/libs/js/Makefile.in Log: don't install extra stuff we don't need in our build Modified: freeswitch/trunk/libs/js/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/Makefile.in (original) +++ freeswitch/trunk/libs/js/Makefile.in Wed Nov 21 14:09:37 2007 @@ -178,25 +178,25 @@ .PHONY: install install: all $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix) - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3 - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/js - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig - $(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/ - $(SHTOOL) install -c -m 644 js-config.1 $(DESTDIR)$(mandir)/man1/ - $(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/ - $(SHTOOL) install -c -m 644 src/js*.h $(DESTDIR)$(includedir)/js/ - $(SHTOOL) install -c -m 644 src/jsopcode.tbl $(DESTDIR)$(includedir)/js/ - $(SHTOOL) install -c -m 644 src/js.msg $(DESTDIR)$(includedir)/js/ +# $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) +# $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 +# $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3 +# $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/js +# $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig +# $(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/ +# $(SHTOOL) install -c -m 644 js-config.1 $(DESTDIR)$(mandir)/man1/ +# $(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/ +# $(SHTOOL) install -c -m 644 src/js*.h $(DESTDIR)$(includedir)/js/ +# $(SHTOOL) install -c -m 644 src/jsopcode.tbl $(DESTDIR)$(includedir)/js/ +# $(SHTOOL) install -c -m 644 src/js.msg $(DESTDIR)$(includedir)/js/ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/ - $(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/ - $(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config - @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/ - $(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jslint.js $(DESTDIR)$(bindir)/jslint - @if [ ".$(WITH_PERL)" = ".yes" ]; then \ - (cd src/perlconnect; $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ - fi +# $(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/ +# $(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config +# @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/ +# $(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jslint.js $(DESTDIR)$(bindir)/jslint +# @if [ ".$(WITH_PERL)" = ".yes" ]; then \ +# (cd src/perlconnect; $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ +# fi .PHONY: clean clean:

1 0

[commit] r6370 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Nov '07

21 Nov '07

Author: anthm Date: Wed Nov 21 12:07:41 2007 New Revision: 6370 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix FSCORE-62 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 Wed Nov 21 12:07:41 2007 @@ -327,7 +327,7 @@ session_timeout = v_session_timeout; } } - + printf("GRRXXXXXXXXXXXXX\n%s\n", tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Nov 21 12:07:41 2007 @@ -299,6 +299,7 @@ char *rpid; char *gateway_from_str; char *rm_encoding; + char *iananame; char *rm_fmtp; char *fmtp_out; char *remote_sdp_str; 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 Wed Nov 21 12:07:41 2007 @@ -868,7 +868,7 @@ if (!force) { return SWITCH_STATUS_SUCCESS; } - if (strcasecmp(tech_pvt->read_codec.implementation->iananame, tech_pvt->rm_encoding) || + if (strcasecmp(tech_pvt->read_codec.implementation->iananame, tech_pvt->iananame) || tech_pvt->read_codec.implementation->samples_per_second != tech_pvt->rm_rate) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Changing Codec from %s to %s\n", @@ -882,13 +882,13 @@ } } - if (!tech_pvt->rm_encoding) { + if (!tech_pvt->iananame) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec with no name?\n"); return SWITCH_STATUS_FALSE; } if (switch_core_codec_init(&tech_pvt->read_codec, - tech_pvt->rm_encoding, + tech_pvt->iananame, tech_pvt->rm_fmtp, tech_pvt->rm_rate, tech_pvt->codec_ms, @@ -899,7 +899,7 @@ return SWITCH_STATUS_FALSE; } else { if (switch_core_codec_init(&tech_pvt->write_codec, - tech_pvt->rm_encoding, + tech_pvt->iananame, tech_pvt->rm_fmtp, tech_pvt->rm_rate, tech_pvt->codec_ms, @@ -913,7 +913,7 @@ tech_pvt->read_frame.rate = tech_pvt->rm_rate; ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n", - switch_channel_get_name(tech_pvt->channel), tech_pvt->rm_encoding, tech_pvt->rm_rate, tech_pvt->codec_ms, + switch_channel_get_name(tech_pvt->channel), tech_pvt->iananame, tech_pvt->rm_rate, tech_pvt->codec_ms, tech_pvt->read_codec.implementation->samples_per_frame ); tech_pvt->read_frame.codec = &tech_pvt->read_codec; @@ -1371,21 +1371,20 @@ } if (mimp) { - if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) rm_encoding))) { - char tmp[50]; - tech_pvt->pt = (switch_payload_t) map->rm_pt; - tech_pvt->rm_rate = map->rm_rate; - tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; - tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *) connection->c_address); - tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp); - tech_pvt->remote_sdp_audio_port = (switch_port_t) m->m_port; - tech_pvt->agreed_pt = (switch_payload_t) map->rm_pt; - snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); - switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); - switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); - } else { - match = 0; - } + char tmp[50]; + tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) map->rm_encoding); + tech_pvt->iananame = switch_core_session_strdup(session, (char *) mimp->iananame); + tech_pvt->pt = (switch_payload_t) map->rm_pt; + tech_pvt->rm_rate = map->rm_rate; + tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; + tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *) connection->c_address); + tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp); + tech_pvt->remote_sdp_audio_port = (switch_port_t) m->m_port; + tech_pvt->agreed_pt = (switch_payload_t) map->rm_pt; + snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); + switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); + switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); + } if (match) {

1 0

[commit] r6369 - freeswitch/trunk/build
by Freeswitch SVN 21 Nov '07

21 Nov '07

Author: mikej Date: Tue Nov 20 22:30:18 2007 New Revision: 6369 Modified: freeswitch/trunk/build/freeswitch.spec Log: update to match new config file directories. Modified: freeswitch/trunk/build/freeswitch.spec ============================================================================== --- freeswitch/trunk/build/freeswitch.spec (original) +++ freeswitch/trunk/build/freeswitch.spec Tue Nov 20 22:30:18 2007 @@ -2,7 +2,7 @@ Summary: FreeSWITCH open source telephony platform License: MPL Group: Productivity/Telephony/Servers -Version: 6012 +Version: 6365 Release: 0 URL: http://www.freeswitch.org/ Packager: Peter Nixon @@ -181,7 +181,35 @@ %dir %attr(750,root,root) /opt/freeswitch/scripts #%dir %attr(750,root,root) /opt/freeswitch/grammer %dir %attr(750,root,root) /opt/freeswitch/conf +%dir %attr(750,root,root) /opt/freeswitch/conf/autoload_configs +%dir %attr(750,root,root) /opt/freeswitch/conf/dialplan +%dir %attr(750,root,root) /opt/freeswitch/conf/directory +%dir %attr(750,root,root) /opt/freeswitch/conf/lang +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/en +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/en/demo +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/en/vm +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/de +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/de/demo +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/de/vm +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/fr +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/fr/demo +%dir %attr(750,root,root) /opt/freeswitch/conf/lang/fr/vm +%dir %attr(750,root,root) /opt/freeswitch/conf/sip_profiles %config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/*.conf +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/autoload_configs/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/dialplan/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/directory/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/en/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/en/demo/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/en/vm/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/de/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/de/demo/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/de/vm/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/fr/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/fr/demo/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/lang/fr/vm/*.xml +%config(noreplace) %attr(750,root,root) /opt/freeswitch/conf/sip_profiles/*.xml /etc/ld.so.conf.d/* %{_bindir}/freeswitch #/opt/freeswitch/bin/freeswitch

1 0

[commit] r6368 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Nov '07

21 Nov '07

Author: anthm Date: Tue Nov 20 19:56:41 2007 New Revision: 6368 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: will it never end? Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Nov 20 19:56:41 2007 @@ -1485,6 +1485,7 @@ } profile = gateway_ptr->profile; + if (!switch_test_flag(gateway_ptr, REG_FLAG_CALLERID)) { tech_pvt->gateway_from_str = switch_core_session_strdup(nsession, gateway_ptr->register_from); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Nov 20 19:56:41 2007 @@ -296,6 +296,7 @@ char *far_end_contact; char *contact_url; char *from_str; + char *rpid; char *gateway_from_str; char *rm_encoding; char *rm_fmtp; 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 Tue Nov 20 19:56:41 2007 @@ -476,7 +476,6 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) { - char *rpid = NULL; char *alert_info = NULL; char *max_forwards = NULL; const char *alertbuf; @@ -539,30 +538,12 @@ switch_set_flag_locked(tech_pvt, TFLAG_READY); - /* TODO: We should use the new tags for making an rpid and add profile options to turn this on/off */ - if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { - const char *priv = "off"; - const char *screen = "no"; - if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { - priv = "name"; - if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { - priv = "full"; - } - } else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { - priv = "full"; - } - if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { - screen = "yes"; - } - - rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: %s;screen=%s;privacy=%s", tech_pvt->from_str, screen, priv); - } - if (!tech_pvt->nh) { char *d_url = NULL, *url = NULL; sofia_private_t *sofia_private; char *invite_contact = NULL, *to_str, *use_from_str, *from_str, *url_str; const char *transport = "udp", *t_var; + char *rpid_domain = "cluecon.com", *p; if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); @@ -587,6 +568,19 @@ use_from_str = tech_pvt->from_str; } + rpid_domain = switch_core_session_strdup(session, use_from_str); + sofia_glue_get_url_from_contact(rpid_domain, 0); + if ((rpid_domain = strchr(rpid_domain, '@'))) { + rpid_domain++; + if ((p = strchr(rpid_domain, ';'))) { + *p = '\0'; + } + } + + if (!rpid_domain) { + rpid_domain = "cluecon.com"; + } + if (switch_stristr("port=tcp", url)) { transport = "tcp"; } else { @@ -616,6 +610,30 @@ SIPTAG_CONTACT_STR(invite_contact), TAG_END()); + + /* TODO: We should use the new tags for making an rpid and add profile options to turn this on/off */ + if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { + const char *priv = "off"; + const char *screen = "no"; + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { + priv = "name"; + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { + priv = "full"; + } + } else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { + priv = "full"; + } + if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { + screen = "yes"; + } + + tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: \"%s\"<%s@%s>;screen=%s;privacy=%s", + tech_pvt->caller_profile->caller_id_name, + tech_pvt->caller_profile->caller_id_number, + rpid_domain, + screen, priv); + } + switch_safe_free(d_url); if (!(sofia_private = malloc(sizeof(*sofia_private)))) { @@ -680,7 +698,7 @@ nua_invite(tech_pvt->nh, NUTAG_SESSION_TIMER(session_timeout), - TAG_IF(!switch_strlen_zero(rpid), SIPTAG_HEADER_STR(rpid)), + TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_HEADER_STR(tech_pvt->rpid)), TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),

1 0

[commit] r6367 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Nov '07

21 Nov '07

Author: mikej Date: Tue Nov 20 19:36:49 2007 New Revision: 6367 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: lets pull this for now. Scream if this breaks you. 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 Tue Nov 20 19:36:49 2007 @@ -555,7 +555,7 @@ screen = "yes"; } - rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: %s;party=calling;screen=%s;privacy=%s", tech_pvt->from_str, screen, priv); + rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: %s;screen=%s;privacy=%s", tech_pvt->from_str, screen, priv); } if (!tech_pvt->nh) {

1 0

[commit] r6366 - freeswitch/trunk/build
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: mikej Date: Tue Nov 20 18:39:44 2007 New Revision: 6366 Added: freeswitch/trunk/build/curses.patch freeswitch/trunk/build/freeswitch.init freeswitch/trunk/build/freeswitch.ld.so.conf freeswitch/trunk/build/freeswitch.sysconfig Log: add more stuff for rpm's Added: freeswitch/trunk/build/curses.patch ============================================================================== --- (empty file) +++ freeswitch/trunk/build/curses.patch Tue Nov 20 18:39:44 2007 @@ -0,0 +1,13 @@ +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 5682) ++++ Makefile.am (working copy) +@@ -133,7 +133,7 @@ + if ADD_LIBEDIT + CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT + CORE_LIBS += libs/libedit/src/.libs/libedit.a +-freeswitch_LDADD += -lcurses ++freeswitch_LDADD += -lncurses + endif + + Added: freeswitch/trunk/build/freeswitch.init ============================================================================== --- (empty file) +++ freeswitch/trunk/build/freeswitch.init Tue Nov 20 18:39:44 2007 @@ -0,0 +1,283 @@ +#!/bin/sh +# +# Template SUSE system startup script for example service/daemon FREESWITCH +# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, +# USA. +# +# /etc/init.d/freeswitch +# and its symbolic link +# /(usr/)sbin/rcfreeswitch +# +# Template system startup script for some example service/daemon FREESWITCH +# +# LSB compatible service control script; see http://www.linuxbase.org/spec/ +# +# Note: This template uses functions rc_XXX defined in /etc/rc.status on +# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your +# script on this template and ensure that it works on non UL based LSB +# compliant Linux distributions, you either have to provide the rc.status +# functions from UL or change the script to work without them. +# See skeleton.compat for a template that works with other distros as well. +# +### BEGIN INIT INFO +# Provides: freeswitch +# Required-Start: $syslog $remote_fs +# Should-Start: $time ypbind sendmail mysql postgresql +# Required-Stop: $syslog $remote_fs +# Should-Stop: $time ypbind sendmail +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: FREESWITCH XYZ daemon providing ZYX +# Description: Start FREESWITCH to allow XY and provide YZ +# continued on second line by '#<TAB>' +# should contain enough info for the runlevel editor +# to give admin some idea what this service does and +# what it's needed for ... +# (The Short-Description should already be a good hint.) +### END INIT INFO +# +# Any extensions to the keywords given above should be preceeded by +# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. +# +# Notes on Required-Start/Should-Start: +# * There are two different issues that are solved by Required-Start +# and Should-Start +# (a) Hard dependencies: This is used by the runlevel editor to determine +# which services absolutely need to be started to make the start of +# this service make sense. Example: nfsserver should have +# Required-Start: $portmap +# Also, required services are started before the dependent ones. +# The runlevel editor will warn about such missing hard dependencies +# and suggest enabling. During system startup, you may expect an error, +# if the dependency is not fulfilled. +# (b) Specifying the init script ordering, not real (hard) dependencies. +# This is needed by insserv to determine which service should be +# started first (and at a later stage what services can be started +# in parallel). The tag Should-Start: is used for this. +# It tells, that if a service is available, it should be started +# before. If not, never mind. +# * When specifying hard dependencies or ordering requirements, you can +# use names of services (contents of their Provides: section) +# or pseudo names starting with a $. The following ones are available +# according to LSB (1.1): +# $local_fs all local file systems are mounted +# (most services should need this!) +# $remote_fs all remote file systems are mounted +# (note that /usr may be remote, so +# many services should Require this!) +# $syslog system logging facility up +# $network low level networking (eth card, ...) +# $named hostname resolution available +# $netdaemons all network daemons are running +# The $netdaemons pseudo service has been removed in LSB 1.2. +# For now, we still offer it for backward compatibility. +# These are new (LSB 1.2): +# $time the system time has been set correctly +# $portmap SunRPC portmapping service available +# UnitedLinux extensions: +# $ALL indicates that a script should be inserted +# at the end +# * The services specified in the stop tags +# (Required-Stop/Should-Stop) +# specify which services need to be still running when this service +# is shut down. Often the entries there are just copies or a subset +# from the respective start tag. +# * Should-Start/Stop are now part of LSB as of 2.0, +# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. +# insserv does support both variants. +# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time +# (%fillup_and_insserv macro in %post of many RPMs) to specify whether +# a startup script should default to be enabled after installation. +# It's not used by insserv. +# +# Note on runlevels: +# 0 - halt/poweroff 6 - reboot +# 1 - single user 2 - multiuser without network exported +# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) +# +# Note on script names: +# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html +# A registry has been set up to manage the init script namespace. +# http://www.lanana.org/ +# Please use the names already registered or register one or use a +# vendor prefix. + + +# Check for missing binaries (stale symlinks should not happen) +# Note: Special treatment of stop for LSB conformance +FREESWITCH_BIN=/usr/bin/freeswitch +test -x $FREESWITCH_BIN || { echo "$FREESWITCH_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } + +# Check for existence of needed config file and read it +FREESWITCH_CONFIG=/etc/sysconfig/freeswitch +test -r $FREESWITCH_CONFIG || { echo "$FREESWITCH_CONFIG not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + +# Read config +. $FREESWITCH_CONFIG + +# Source LSB init functions +# providing start_daemon, killproc, pidofproc, +# log_success_msg, log_failure_msg and log_warning_msg. +# This is currently not used by UnitedLinux based distributions and +# not needed for init scripts for UnitedLinux only. If it is used, +# the functions from rc.status should not be sourced or used. +#. /lib/lsb/init-functions + +# Shell functions sourced from /etc/rc.status: +# rc_check check and set local and overall rc status +# rc_status check and set local and overall rc status +# rc_status -v be verbose in local rc status and clear it afterwards +# rc_status -v -r ditto and clear both the local and overall rc status +# rc_status -s display "skipped" and exit with status 3 +# rc_status -u display "unused" and exit with status 3 +# rc_failed set local and overall rc status to failed +# rc_failed <num> set local and overall rc status to <num> +# rc_reset clear both the local and overall rc status +# rc_exit exit appropriate to overall rc status +# rc_active checks whether a service is activated by symlinks +. /etc/rc.status + +# Reset status of this service +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - user had insufficient privileges +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signaling is not supported) are +# considered a success. + +case "$1" in + start) + echo -n "Starting FreeSWITCH " + ## Start daemon with startproc(8). If this fails + ## the return value is set appropriately by startproc. + /sbin/startproc $FREESWITCH_BIN $FREESWITCH_PARAMS + + # Remember status and be verbose + rc_status -v + ;; + stop) + echo -n "Shutting down FreeSWITCH " + ## Stop daemon with killproc(8) and if this fails + ## killproc sets the return value according to LSB. + + /sbin/killproc -TERM $FREESWITCH_BIN + + # Remember status and be verbose + rc_status -v + ;; + try-restart|condrestart) + ## Do a restart only if the service was active before. + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status + ;; + restart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; + force-reload) + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart the service if it + ## is running. + + echo -n "Reload service FreeSWITCH " + ## if it supports it: + /sbin/killproc -HUP $FREESWITCH_BIN + #touch /var/run/FREESWITCH.pid + rc_status -v + + ## Otherwise: + #$0 try-restart + #rc_status + ;; + reload) + ## Like force-reload, but if daemon does not support + ## signaling, do nothing (!) + + # If it supports signaling: + echo -n "Reload service FreeSWITCH " + /sbin/killproc -HUP $FREESWITCH_BIN + #touch /var/run/FREESWITCH.pid + rc_status -v + + ## Otherwise if it does not support reload: + #rc_failed 3 + #rc_status -v + ;; + status) + echo -n "Checking for service FreeSWITCH " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Return value is slightly different for the status command: + # 0 - service up and running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running (unused) + # 4 - service status unknown :-( + # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) + + # NOTE: checkproc returns LSB compliant status values. + /sbin/checkproc $FREESWITCH_BIN + # NOTE: rc_status knows that we called this init script with + # "status" option and adapts its messages accordingly. + rc_status -v + ;; + probe) + ## Optional: Probe for the necessity of a reload, print out the + ## argument to this init script which is required for a reload. + ## Note: probe is not (yet) part of LSB (as of 1.9) + + test /opt/freeswitch/conf/freeswitch.xml -nt /opt/freeswitch/log/freeswitch.pid && echo reload + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" + exit 1 + ;; +esac +rc_exit Added: freeswitch/trunk/build/freeswitch.ld.so.conf ============================================================================== --- (empty file) +++ freeswitch/trunk/build/freeswitch.ld.so.conf Tue Nov 20 18:39:44 2007 @@ -0,0 +1 @@ +/opt/freeswitch/lib Added: freeswitch/trunk/build/freeswitch.sysconfig ============================================================================== --- (empty file) +++ freeswitch/trunk/build/freeswitch.sysconfig Tue Nov 20 18:39:44 2007 @@ -0,0 +1,9 @@ +## Type: string +## Default: "" +## Config: "" +## ServiceRestart: freeswitch +# +# if not empty: parameters for freeswitch +# for example FREESWITCH_PARAMS="-nc" +# +FREESWITCH_PARAMS="-nc"

1 0