April 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4844 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 09:11:57 2007 New Revision: 4844 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Log: take 4 fixing dependencies for proper make -j build Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Tue Apr 3 09:11:57 2007 @@ -13,6 +13,7 @@ LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url LOCAL_OBJS=sofia.o sofia_glue.o sofia_presence.o sofia_reg.o +LOCAL_SOURCES=sofia.c sofia_glue.c sofia_presense.c sofia_reg.c mod_sofia.c SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la @@ -28,3 +29,6 @@ local_depend: $(SOFIALA) +../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) + +$(LOCAL_OBJS) $(LOCAL_SOURCES): ../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h

1 0

[commit] r4843 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 08:29:18 2007 New Revision: 4843 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Log: another try on proper deps Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Tue Apr 3 08:29:18 2007 @@ -14,8 +14,6 @@ LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url LOCAL_OBJS=sofia.o sofia_glue.o sofia_presence.o sofia_reg.o -$(LOCAL_OBJS): $(SOFIALA) - SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la LOCAL_LIBADD=$(SOFIALA) @@ -27,3 +25,6 @@ $(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update cd $(SOFIA_DIR) && $(MAKE) $(TOUCH_TARGET) + +local_depend: $(SOFIALA) +

1 0

[commit] r4842 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 08:04:14 2007 New Revision: 4842 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Log: fix dependencies to handle make -j Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Tue Apr 3 08:04:14 2007 @@ -14,6 +14,8 @@ LOCAL_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url LOCAL_OBJS=sofia.o sofia_glue.o sofia_presence.o sofia_reg.o +$(LOCAL_OBJS): $(SOFIALA) + SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la LOCAL_LIBADD=$(SOFIALA)

1 0

[commit] r4841 - freeswitch/trunk
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 07:57:57 2007 New Revision: 4841 Modified: freeswitch/trunk/Makefile.am Log: fix whoops from previous commit Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Apr 3 07:57:57 2007 @@ -242,7 +242,7 @@ @am__include@ @am__quote@./$(DEPDIR)/modules.targets@am__quote@ modules.conf: - if test -f $@; then touch $@; else cp build/modules.conf.in $@ + if test -f $@; then touch $@; else cp build/modules.conf.in $@ ;fi ./$(DEPDIR)/modules.targets: modules.conf mods=`cat modules.conf | sed -e 's|^.*/||'`; echo MODULE_TARGETS=\"$$mods\" > ./$(DEPDIR)/modules.targets

1 0

[commit] r4840 - in freeswitch/trunk: . src/mod
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 06:53:47 2007 New Revision: 4840 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/src/mod/Makefile.am Log: add auto generated mod_* targets (generated from modules.conf. A step towards make -j support for the module builds. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Apr 3 06:53:47 2007 @@ -113,7 +113,7 @@ MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h -BUILT_SOURCES = src/include/switch_version.h +BUILT_SOURCES = src/include/switch_version.h ./$(DEPDIR)/modules.targets bin_PROGRAMS = freeswitch freeswitch_SOURCES = src/switch.c @@ -122,7 +122,7 @@ freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool +$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool modules.conf $(switch_builddir)/quiet_libtool: $(switch_builddir)/libtool @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > quiet_libtool @@ -239,6 +239,19 @@ megaclean: eclean modclean rm -f `find ./libs -name \*.la` +@am__include@ @am__quote@./$(DEPDIR)/modules.targets@am__quote@ + +modules.conf: + if test -f $@; then touch $@; else cp build/modules.conf.in $@ + +./$(DEPDIR)/modules.targets: modules.conf + mods=`cat modules.conf | sed -e 's|^.*/||'`; echo MODULE_TARGETS=\"$$mods\" > ./$(DEPDIR)/modules.targets + +$(MODULE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + (cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + test -z "$$fail" # Special targets Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Tue Apr 3 06:53:47 2007 @@ -76,3 +76,15 @@ @echo @echo done Uninstalling Modules + +@am__include@ @am__quote@$(switch_builddir)/$(DEPDIR)/modules.targets@am__quote@ + +$(MODULE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + moddir=`grep $@ $(switch_builddir)/modules.conf | sed -e 's|#||'` ; \ + (if test -f $$moddir/Makefile ; then \ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS); else\ + cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules;\ + fi;)\ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + test -z "$$fail"

1 0

[commit] r4839 - freeswitch/trunk
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 00:55:26 2007 New Revision: 4839 Modified: freeswitch/trunk/bootstrap.sh Log: we don't need to bootstrap teletone anymore as we don't use it's build system anymore Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Tue Apr 3 00:55:26 2007 @@ -4,7 +4,7 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; SUBDIRS="codec/g7xx codec/g726 codec/gsm codec/ilbc codec/lpc10 curl iax iksemel \ - js js/nsprpub libdingaling libetpan libresample libsndfile libteletone pcre sofia-sip \ + js js/nsprpub libdingaling libetpan libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; # keep automake from making us magically GPL, and to stop complaining about missing files.

1 0

[commit] r4838 - in freeswitch/trunk: . libs/srtp
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: mikej Date: Tue Apr 3 00:42:48 2007 New Revision: 4838 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/libs/srtp/Makefile.am Log: fix make -j build (currently only is useful for the core and core libs. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Apr 3 00:42:48 2007 @@ -170,7 +170,7 @@ @cd libs/apr && $(MAKE) @$(TOUCH_TARGET) -libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update +libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/libapr-1.la @cd libs/apr-util && $(MAKE) @$(TOUCH_TARGET) Modified: freeswitch/trunk/libs/srtp/Makefile.am ============================================================================== --- freeswitch/trunk/libs/srtp/Makefile.am (original) +++ freeswitch/trunk/libs/srtp/Makefile.am Tue Apr 3 00:42:48 2007 @@ -1,5 +1,3 @@ -_DIST = -SUBDIRS = test AUTOMAKE_OPTS= gnu NAME=srtp @@ -46,7 +44,7 @@ noinst_PROGRAMS = aes_tables aes_tables_SOURCES = tables/aes_tables.c -aes_tables_LDFLAGS = -lcryptomath +aes_tables_LDADD = libcryptomath.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = srtp-1.42.pc

1 0

[commit] r4837 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: anthm Date: Mon Apr 2 21:24:24 2007 New Revision: 4837 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: wtf Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 2 21:24:24 2007 @@ -617,7 +617,11 @@ assert(nh != NULL); id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); - exp = switch_mprintf("active;expires=%ld", time(NULL) - expire_sec); + expire_sec -= time(NULL); + if (expire_sec < 0) { + expire_sec = 3600; + } + exp = switch_mprintf("active;expires=%ld", expire_sec); tmp = contact; contact = sofia_glue_get_url_from_contact(tmp, 0);

1 0

[commit] r4836 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: anthm Date: Mon Apr 2 21:08:14 2007 New Revision: 4836 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 2 21:08:14 2007 @@ -144,7 +144,7 @@ return; } - if ((sql = switch_mprintf("select user,host,'Registered','unknown','' from sofia_handle_sip_registrations"))) { + if ((sql = switch_mprintf("select user,host,'Registered','unknown','' sip_registrations"))) { switch_mutex_lock(profile->ireg_mutex); switch_core_db_exec(db, sql, sofia_presence_resub_callback, profile, &errmsg); switch_mutex_unlock(profile->ireg_mutex); @@ -383,7 +383,7 @@ if (euser && host && (sql = - switch_mprintf("select user,host,status,rpid,'' from sofia_handle_sip_registrations where user='%q' and host='%q'", + switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", euser, host)) && (profile = sofia_glue_find_profile(host))) { if (!(db = switch_core_db_open_file(profile->dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); @@ -872,7 +872,7 @@ } if ((sql = - switch_mprintf("update sofia_handle_sip_registrations set status='%q',rpid='%q' where user='%q' and host='%q'", + switch_mprintf("update sip_registrations set status='%q',rpid='%q' where user='%q' and host='%q'", note_txt, rpid, from_user, from_host))) { sofia_glue_execute_sql(profile->dbname, sql, profile->ireg_mutex); switch_safe_free(sql);

1 0

[commit] r4835 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 19:34:58 2007 New Revision: 4835 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update 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 Mon Apr 2 19:34:58 2007 @@ -2663,7 +2663,6 @@ for (y = 0; y < argc; y++) { snprintf(buf, sizeof(buf), "~argv[%d] = \"%s\";", x++, argv[y]); eval_some_js(buf, cx, javascript_global_object, &rval); - } } @@ -2764,10 +2763,13 @@ if (account) { char *text; - text = switch_mprintf("mwi.js %s", account); + text = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); assert(text != NULL); - js_thread_launch(text); + if (switch_file_exists(text) == SWITCH_STATUS_SUCCESS) { + js_thread_launch(text); + } + free(text); }

1 0