- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12073 - in freeswitch/trunk/libs/sofia-sip: libsofia-sip-ua/su m4
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 17:47:32 2009 New Revision: 12073 Log: fix sofia initstate correctly Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Mon Feb 16 17:47:32 2009 @@ -138,7 +138,7 @@ #if HAVE_INITSTATE /* Allow libsofia-sip-ua.so to unload. */ - uint32_t *seed = calloc(32, sizeof *seed); + uint32_t *seed = calloc(32, sizeof(uint32_t)); #else static uint32_t seed[32] = { 0 }; #endif @@ -171,7 +171,7 @@ } #if HAVE_INITSTATE - initstate(seed[0] ^ seed[1], (char *)&seed, sizeof(seed)); + initstate(seed[0] ^ seed[1], (char *)seed, 32 * sizeof(uint32_t)); #else srand(seed[0] ^ seed[1]); #endif Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Mon Feb 16 17:47:32 2009 @@ -526,7 +526,7 @@ AC_FUNC_ALLOCA -AC_CHECK_FUNCS([gettimeofday strerror random tcsetattr flock \ +AC_CHECK_FUNCS([gettimeofday strerror random tcsetattr initstate flock \ socketpair gethostname gethostbyname getipnodebyname \ poll epoll_create kqueue select if_nameindex \ signal alarm \

1 0

[commit] r12072 - in freeswitch/trunk/src: . include mod/say/mod_say_en
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 16:24:25 2009 New Revision: 12072 Log: mod_say_en: add short form date/time (MODAPP-180) Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Feb 16 16:24:25 2009 @@ -281,7 +281,8 @@ SST_POSTAL_ADDRESS, SST_ACCOUNT_NUMBER, SST_NAME_SPELLED, - SST_NAME_PHONETIC + SST_NAME_PHONETIC, + SST_SHORT_DATE_TIME } switch_say_type_t; typedef enum { Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Mon Feb 16 16:24:25 2009 @@ -263,9 +263,9 @@ switch_input_args_t *args) { int32_t t; - switch_time_t target = 0; - switch_time_exp_t tm; - uint8_t say_date = 0, say_time = 0; + switch_time_t target = 0, target_now = 0; + switch_time_exp_t tm, tm_now; + uint8_t say_date = 0, say_time = 0, say_year = 0, say_month = 0, say_dow = 0, say_day = 0, say_yesterday = 0, say_today = 0; switch_channel_t *channel = switch_core_session_get_channel(session); const char *tz = switch_channel_get_variable(channel, "timezone"); @@ -351,19 +351,24 @@ if ((t = atol(tosay)) > 0) { target = switch_time_make(t, 0); + target_now = switch_micro_time_now(); } else { target = switch_micro_time_now(); + target_now = switch_micro_time_now(); } if (tz) { int check = atoi(tz); if (check) { switch_time_exp_tz(&tm, target, check); + switch_time_exp_tz(&tm_now, target_now, check); } else { switch_time_exp_tz_name(tz, &tm, target); + switch_time_exp_tz_name(tz, &tm_now, target_now); } } else { switch_time_exp_lt(&tm, target); + switch_time_exp_lt(&tm_now, target_now); } switch (type) { @@ -376,14 +381,58 @@ case SST_CURRENT_TIME: say_time = 1; break; + case SST_SHORT_DATE_TIME: + say_time = 1; + if (tm.tm_year != tm_now.tm_year) { + say_date = 1; + break; + } + if (tm.tm_yday == tm_now.tm_yday) { + say_today = 1; + break; + } + if (tm.tm_yday == tm_now.tm_yday - 1) { + say_yesterday = 1; + break; + } + if (tm.tm_yday >= tm_now.tm_yday - 5) { + say_dow = 1; + break; + } + if (tm.tm_mon != tm_now.tm_mon) { + say_month = say_day = say_dow = 1; + break; + } + + say_month = say_day = say_dow = 1; + + break; default: break; } - if (say_date) { + if (say_today) { + say_file("time/today.wav"); + } + if (say_yesterday) { + say_file("time/yesterday.wav"); + } + if (say_dow) { say_file("time/day-%d.wav", tm.tm_wday); + } + + if (say_date) { + say_year = say_month = say_day = say_dow = 1; + say_today = say_yesterday = 0; + } + + if (say_month) { say_file("time/mon-%d.wav", tm.tm_mon); + } + if (say_day) { say_num(tm.tm_mday, SSM_COUNTED); + } + if (say_year) { say_num(tm.tm_year + 1900, SSM_PRONOUNCED); } @@ -495,6 +544,7 @@ case SST_CURRENT_DATE: case SST_CURRENT_TIME: case SST_CURRENT_DATE_TIME: + case SST_SHORT_DATE_TIME: say_cb = en_say_time; break; case SST_IP_ADDRESS: 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 Mon Feb 16 16:24:25 2009 @@ -62,6 +62,7 @@ "ACCOUNT_NUMBER", "NAME_SPELLED", "NAME_PHONETIC", + "SHORT_DATE_TIME", NULL };

1 0

[commit] r12071 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 15:53:48 2009 New Revision: 12071 Log: type tweak Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/mod_http.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Mon Feb 16 15:53:48 2009 @@ -355,7 +355,7 @@ json_response[m] = '\0'; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "RESERVED %ld BYTES, USED %ld BYTES, HTTP Response as JSON: %s\n", l, m, json_response); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "RESERVED %u BYTES, USED %u BYTES, HTTP Response as JSON: %s\n", (unsigned)l, (unsigned) m, json_response); stream->write_function(stream, "%s\n", json_response);

1 0

[commit] r12070 - freeswitch/trunk/src/mod/languages/mod_python
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: stkn Date: Mon Feb 16 14:42:51 2009 New Revision: 12070 Log: Use the autodetected PYTHON_SITE_DIR Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile.in Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile.in (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile.in Mon Feb 16 14:42:51 2009 @@ -11,7 +11,7 @@ LINK=$(CXXLINK) PYMOD=freeswitch -PYTHON_SITE_DIR=/usr/lib/python2.4/site-packages +PYTHON_SITE_DIR=@PYTHON_SITE_DIR@ SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i

1 0

[commit] r12069 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 14:34:46 2009 New Revision: 12069 Log: fix printf specifier bug Modified: freeswitch/trunk/src/mod/applications/mod_http/http_req.c Modified: freeswitch/trunk/src/mod/applications/mod_http/http_req.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/http_req.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/http_req.c Mon Feb 16 14:34:46 2009 @@ -245,7 +245,7 @@ else dprintf(s, "Host: %s\r\n", hostname); dprintf(s, "Connection: close\r\n"); - dprintf(s, "Content-Length: %ld\r\n", req->body_len); + dprintf(s, "Content-Length: %d\r\n", (int)req->body_len); for (i = 0; i < req->header_len; i++) { dprintf(s, "%s: %s\r\n", req->headers[i].field_name, req->headers[i].value);

1 0

[commit] r12068 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 14:25:05 2009 New Revision: 12068 Log: remove leak Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Feb 16 14:25:05 2009 @@ -270,7 +270,9 @@ } } else { if (switch_event_serialize(event, &serialized_string, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - serialized_string = switch_mprintf("'%s'", serialized_string); + char *new_serialized_string = switch_mprintf("'%s'", serialized_string); + free(serialized_string); + serialized_string = new_serialized_string; return serialized_string; } }

1 0

[commit] r12067 - freeswitch/trunk/libs/sofia-sip/rules
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 13:57:47 2009 New Revision: 12067 Log: fix sofia silent build on solaris Modified: freeswitch/trunk/libs/sofia-sip/rules/silent.am Modified: freeswitch/trunk/libs/sofia-sip/rules/silent.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/rules/silent.am (original) +++ freeswitch/trunk/libs/sofia-sip/rules/silent.am Mon Feb 16 13:57:47 2009 @@ -28,10 +28,12 @@ else if AMDEP ${SOFIA_SILENT}source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - ${SOFIA_SILENT}DEPDIR="$(DEPDIR)" $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -endif + DEPDIR="$(DEPDIR)" $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c -o $@ $< +else ${SOFIA_SILENT}$(COMPILE) -c -o $@ $< endif +endif .c.lo: @test "${SOFIA_SILENT}" != @ || echo ' LTCOMPILE $@' @@ -41,9 +43,11 @@ else if AMDEP ${SOFIA_SILENT}source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - ${SOFIA_SILENT}DEPDIR="$(DEPDIR)" $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -endif + DEPDIR="$(DEPDIR)" $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ $< +else ${SOFIA_SILENT}$(LTCOMPILE) -c -o $@ $< endif +endif # endif

1 0

[commit] r12066 - freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 13:40:58 2009 New Revision: 12066 Log: add makefile for ODBC define Added: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/Makefile Added: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/Makefile Mon Feb 16 13:40:58 2009 @@ -0,0 +1,3 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;`

1 0

[commit] r12065 - freeswitch/trunk/src/include
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 13:32:06 2009 New Revision: 12065 Log: visibility tweak Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/include/switch_platform.h Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Feb 16 13:32:06 2009 @@ -78,7 +78,7 @@ SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg); SWITCH_DECLARE(void) consoleCleanLog(char *msg); - class CoreSession; + class SWITCH_DECLARE_CLASS CoreSession; class IVRMenu { protected: @@ -185,7 +185,7 @@ SWITCH_DECLARE(Event *) pop(int block = 0); }; - class CoreSession { + class SWITCH_DECLARE_CLASS CoreSession { protected: switch_input_args_t args; // holds ptr to cb function and input_callback_state struct // which has a language specific callback function Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Feb 16 13:32:06 2009 @@ -162,6 +162,7 @@ #define S_IWUSR _S_IWRITE #endif #define SWITCH_THREAD_FUNC __stdcall +#define SWITCH_DECLARE_CLASS #else //not win32 #define O_BINARY 0 #if (defined(__GNUC__) || defined(__SUNCC__)) && defined(SWITCH_API_VISIBILITY) @@ -170,12 +171,14 @@ #define SWITCH_DECLARE_DATA __attribute__((visibility("default"))) #define SWITCH_MOD_DECLARE(type) __attribute__((visibility("default"))) type #define SWITCH_MOD_DECLARE_DATA __attribute__((visibility("default"))) +#define SWITCH_DECLARE_CLASS __attribute__((visibility("default"))) #else #define SWITCH_DECLARE(type) type #define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_DECLARE_DATA #define SWITCH_MOD_DECLARE(type) type #define SWITCH_MOD_DECLARE_DATA +#define SWITCH_DECLARE_CLASS #endif #define SWITCH_THREAD_FUNC #endif

1 0

[commit] r12064 - in freeswitch/trunk/conf: . dialplan
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 13:01:50 2009 New Revision: 12064 Log: force domain_name to simplify things Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 16 13:01:50 2009 @@ -20,28 +20,6 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> - -  - <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_sofia"/> - <condition field="${sip_auth_realm}" expression="^$"> - <action application="set" data="domain_name=$${domain}"/> - <anti-action application="set" data="domain_name=${sip_auth_realm}"/> - </condition> - </extension> - -  - <extension name="set_domain_openzap" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_openzap"> - <action application="set" data="domain_name=$${domain}"/> - </condition> - </extension>  <extension name="tod_example" continue="true"> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Mon Feb 16 13:01:50 2009 @@ -36,17 +36,6 @@ </condition> </extension> -  - <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_sofia"/> - <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)"> -  - <action application="export" data="domain_name=$1"/> - <anti-action application="export" data="domain_name=${sip_req_host}"/> - </condition> - </extension> - <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="transfer" data="$1 XML default"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Feb 16 13:01:50 2009 @@ -11,6 +11,7 @@ information on this topic. --> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> + <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/> <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> <!-- xmpp_client_profile and xmpp_server_profile

1 0