March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12551 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mikej Date: Tue Mar 10 14:52:07 2009 New Revision: 12551 Log: Wed Mar 4 12:27:19 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta.c: removed spurios SOFIAPUBFUNs Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 10 14:52:07 2009 @@ -1 +1 @@ -Tue Mar 10 14:49:50 CDT 2009 +Tue Mar 10 14:50:56 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 10 14:52:07 2009 @@ -4542,10 +4542,10 @@ * * @since New in @VERSION_1_12_2. */ -SOFIAPUBFUN -sip_replaces_t *nta_leg_make_replaces(nta_leg_t *leg, - su_home_t *home, - int early_only) +sip_replaces_t * +nta_leg_make_replaces(nta_leg_t *leg, + su_home_t *home, + int early_only) { char const *from_tag, *to_tag; @@ -4566,8 +4566,8 @@ * * @since New in @VERSION_1_12_2. */ -SOFIAPUBFUN -nta_leg_t *nta_leg_by_replaces(nta_agent_t *sa, sip_replaces_t const *rp) +nta_leg_t * +nta_leg_by_replaces(nta_agent_t *sa, sip_replaces_t const *rp) { nta_leg_t *leg = NULL; @@ -4593,9 +4593,9 @@ * Find a leg corresponding to the request message. * */ -static -nta_leg_t *leg_find_call_id(nta_agent_t const *sa, - sip_call_id_t const *i) +static nta_leg_t * +leg_find_call_id(nta_agent_t const *sa, + sip_call_id_t const *i) { hash_value_t hash = i->i_hash; leg_htable_t const *lht = sa->sa_dialogs; @@ -4625,8 +4625,8 @@ * * @since New in @VERSION_1_12_9. */ -SOFIAPUBFUN -nta_leg_t *nta_leg_by_call_id(nta_agent_t *sa, const char *call_id) +nta_leg_t * +nta_leg_by_call_id(nta_agent_t *sa, const char *call_id) { nta_leg_t *leg = NULL; @@ -7390,7 +7390,7 @@ return NULL; } -/**Bind callback and application context to an client transaction. +/**Bind callback and application context to a client transaction. * * @param orq outgoing client transaction * @param callback callback function (may be NULL) @@ -7399,9 +7399,10 @@ * * @NEW_1_12_9 */ -SOFIAPUBFUN int nta_outgoing_bind(nta_outgoing_t *orq, - nta_response_f *callback, - nta_outgoing_magic_t *magic) +int +nta_outgoing_bind(nta_outgoing_t *orq, + nta_response_f *callback, + nta_outgoing_magic_t *magic) { if (orq && !orq->orq_destroyed) { if (callback == NULL)

1 0

[commit] r12550 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg libsofia-sip-ua/msg/sofia-sip
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mikej Date: Tue Mar 10 14:50:46 2009 New Revision: 12550 Log: Wed Mar 4 13:35:37 CST 2009 Fabio Margarido <fabiomargarido AT gmail DOT com> * msg: allow compact headers inside multipart payload Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 10 14:50:46 2009 @@ -1 +1 @@ -Wed Mar 4 14:42:12 CST 2009 +Tue Mar 10 14:49:50 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am Tue Mar 10 14:50:46 2009 @@ -87,7 +87,7 @@ AWK_MSG_AWK = LC_ALL=C $(AWK) -f $(MSG_PARSER_AWK) -${GENERATED_HC}: ${MSG_PARSER_AWK} +${GENERATED_HC}: ${MSG_PARSER_AWK} Makefile.am TEST_CLASS_H = ${srcdir}/test_class.h Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_mime.h Tue Mar 10 14:50:46 2009 @@ -168,13 +168,13 @@ msg_error_t *mp_error; /* === Headers start here */ - msg_content_type_t *mp_content_type; /**< Content-Type */ + msg_content_type_t *mp_content_type; /**< Content-Type (c) */ msg_content_disposition_t *mp_content_disposition; /**< Content-Disposition */ msg_content_location_t *mp_content_location; /**< Content-Location */ msg_content_id_t *mp_content_id; /**< Content-ID */ msg_content_language_t *mp_content_language; /**< Content-Language */ - msg_content_encoding_t *mp_content_encoding; /**< Content-Encoding */ + msg_content_encoding_t *mp_content_encoding; /**< Content-Encoding (e) */ msg_content_transfer_encoding_t *mp_content_transfer_encoding; /**< Content-Transfer-Encoding */ #if 0 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/test_msg.c Tue Mar 10 14:50:46 2009 @@ -1193,8 +1193,15 @@ CRLF /* 13 */ #define BODY3 "<html><body>part 3</body></html>" CRLF BODY3 /* 14 */ - CRLF /* 15 */ - "--LaGqGt4BI6Ho--" CRLF; + CRLF "--LaGqGt4BI6Ho" /* 15 */ + "c: text/html" CRLF /* 16 */ + "l: 9" CRLF /* 17 */ + "e: identity" CRLF /* 18 */ + CRLF /* 19 */ +#define BODY4 "<html/>" CRLF + BODY4 /* 20 */ + CRLF "--LaGqGt4BI6Ho--" /* 21 */ + CRLF; BEGIN(); @@ -1275,6 +1282,18 @@ TEST_SIZE(strlen(BODY3), pl->pl_len); TEST(memcmp(pl->pl_data, BODY3, pl->pl_len), 0); + TEST_1(mp = mp->mp_next); + + TEST_1(mp->mp_data); + TEST_M(mp->mp_data, CRLF "--" "LaGqGt4BI6Ho" CRLF, mp->mp_len); + + TEST_1(mp->mp_content_encoding); + TEST_1(mp->mp_content_type); + + TEST_1(pl = mp->mp_payload); TEST_1(pl->pl_data); + TEST_SIZE(strlen(BODY4), pl->pl_len); + TEST(memcmp(pl->pl_data, BODY4, pl->pl_len), 0); + mpX = mp; TEST_1(!(mp = mp->mp_next)); @@ -1293,7 +1312,7 @@ h->sh_succ = NULL; } - TEST(n, 15); + TEST(n, 21); head = NULL; TEST_1(h = msg_multipart_serialize(&head, mp0)); @@ -1304,7 +1323,7 @@ h_succ = h->sh_succ; } - TEST(n, 15); + TEST(n, 21); /* Add a new part to multipart */ mpnew = su_zalloc(home, sizeof(*mpnew)); TEST_1(mpnew); @@ -1324,7 +1343,7 @@ TEST_1(h != removed); } - TEST(n, 19); + TEST(n, 21 + 4); #define remove(h) \ (((*((msg_header_t*)(h))->sh_prev = ((msg_header_t*)(h))->sh_succ) ? \ @@ -1336,7 +1355,7 @@ remove(mp0->mp_separator); remove(mp0->mp_next->mp_payload); remove(mp0->mp_next->mp_next->mp_content_type); - remove(mp0->mp_next->mp_next->mp_next->mp_close_delim); + remove(mp0->mp_next->mp_next->mp_next->mp_next->mp_close_delim); TEST_1(!msg_chain_errors((msg_header_t *)mp0)); @@ -1352,7 +1371,7 @@ TEST_1(h != removed); } - TEST(n, 19); + TEST(n, 21 + 4); /* Add an recursive multipart */ mpnew = su_zalloc(home, sizeof(*mpnew)); TEST_1(mpnew); @@ -1371,7 +1390,7 @@ for (h = (msg_header_t *)mp0, n = 0; h; h = h_succ, n++) h_succ = h->sh_succ; - TEST(n, 24); + TEST(n, 21 + 9); su_home_check(home); su_home_zap(home);

1 0

[commit] r12549 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: andrew Date: Tue Mar 10 14:06:19 2009 New Revision: 12549 Log: Move some variable declarations to a more correct place Modified: 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.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 Tue Mar 10 14:06:19 2009 @@ -353,6 +353,11 @@ 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; + ei_x_buff *rep; ei_x_buff buf; ei_x_new_with_version(&buf); @@ -394,10 +399,6 @@ ei_sendto(ptr->listener->ec, ptr->listener->sockfd, &ptr->process, &buf); switch_mutex_unlock(ptr->listener->sock_mutex); - int i = 0; - ei_x_buff *rep; - void *p = NULL; - while (!(p = switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response\n"); @@ -409,14 +410,12 @@ } rep = (ei_x_buff *) p; - int type, size; ei_get_type(rep->buff, &rep->index, &type, &size); if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ return NULL; - char *xmlstr; if (!(xmlstr = malloc(size + 1))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error\n");

1 0

[commit] r12548 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: andrew Date: Tue Mar 10 12:47:35 2009 New Revision: 12548 Log: oops Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c 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 Tue Mar 10 12:47:35 2009 @@ -191,6 +191,7 @@ switch_core_hash_delete(listener->fetch_reply_hash, uuid_str); switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf); ei_x_encode_atom(rbuf, "ok"); + return SWITCH_STATUS_SUCCESS; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", uuid_str); ei_x_encode_tuple_header(rbuf, 2); @@ -206,6 +207,8 @@ } /*switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf);*/ + free(nbuf->buff); + free(nbuf); } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12547 - in freeswitch/trunk/libs/libteletone: . src
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mikej Date: Tue Mar 10 10:45:29 2009 New Revision: 12547 Log: update api visibility macros for windows Modified: freeswitch/trunk/libs/libteletone/libteletone.2008.vcproj freeswitch/trunk/libs/libteletone/libteletone.vcproj freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/trunk/libs/libteletone/src/libteletone_detect.h freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Modified: freeswitch/trunk/libs/libteletone/libteletone.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/libteletone/libteletone.2008.vcproj (original) +++ freeswitch/trunk/libs/libteletone/libteletone.2008.vcproj Tue Mar 10 10:45:29 2009 @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -199,7 +199,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="src" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" @@ -272,7 +272,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="src" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Modified: freeswitch/trunk/libs/libteletone/libteletone.vcproj ============================================================================== --- freeswitch/trunk/libs/libteletone/libteletone.vcproj (original) +++ freeswitch/trunk/libs/libteletone/libteletone.vcproj Tue Mar 10 10:45:29 2009 @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -119,7 +119,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="src" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;TELETONE_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Tue Mar 10 10:45:29 2009 @@ -110,10 +110,30 @@ #define teletone_assert(expr) assert(expr) #endif +#ifdef _MSC_VER +#if defined(TT_DECLARE_STATIC) +#define TELETONE_API(type) type __stdcall +#define TELETONE_API_NONSTD(type) type __cdecl +#define TELETONE_API_DATA +#elif defined(TELETONE_EXPORTS) +#define TELETONE_API(type) __declspec(dllexport) type __stdcall +#define TELETONE_API_NONSTD(type) __declspec(dllexport) type __cdecl +#define TELETONE_API_DATA __declspec(dllexport) +#else +#define TELETONE_API(type) __declspec(dllimport) type __stdcall +#define TELETONE_API_NONSTD(type) __declspec(dllimport) type __cdecl +#define TELETONE_API_DATA __declspec(dllimport) +#endif +#else #if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) -#define TELETONE_API __attribute__((visibility("default"))) +#define TELETONE_API(type) __attribute__((visibility("default"))) type +#define TELETONE_API_NONSTD(type) __attribute__((visibility("default"))) type +#define TELETONE_API_DATA __attribute__((visibility("default"))) #else -#define TELETONE_API +#define TELETONE_API(type) type +#define TELETONE_API_NONSTD(type) type +#define TELETONE_API_DATA +#endif #endif #include <libteletone_generate.h> Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Tue Mar 10 10:45:29 2009 @@ -116,7 +116,7 @@ goertzel_state->fac = tdesc->fac; } -TELETONE_API void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, +TELETONE_API(void) teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, int16_t sample_buffer[], int samples) { @@ -135,7 +135,7 @@ #define teletone_goertzel_result(gs) (double)(((gs)->v3 * (gs)->v3 + (gs)->v2 * (gs)->v2 - (gs)->v2 * (gs)->v3 * (gs)->fac)) -TELETONE_API void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate) +TELETONE_API(void) teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate) { int i; float theta; @@ -169,7 +169,7 @@ dtmf_detect_state->mhit = 0; } -TELETONE_API void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map) +TELETONE_API(void) teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map) { float theta = 0; int x = 0; @@ -209,7 +209,7 @@ } -TELETONE_API int teletone_multi_tone_detect (teletone_multi_tone_t *mt, +TELETONE_API(int) teletone_multi_tone_detect (teletone_multi_tone_t *mt, int16_t sample_buffer[], int samples) { @@ -299,7 +299,7 @@ } -TELETONE_API int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API(int) teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, int16_t sample_buffer[], int samples) { @@ -430,7 +430,7 @@ } -TELETONE_API int teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API(int) teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, char *buf, int max) { Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.h Tue Mar 10 10:45:29 2009 @@ -202,7 +202,7 @@ \param mt the multi-frequency tone descriptor \param map a representation of the multi-frequency tone */ -TELETONE_API void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map); +TELETONE_API(void) teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map); /*! \brief Check a sample buffer for the presence of the mulit-frequency tone described by mt @@ -211,7 +211,7 @@ \param samples the number of samples present in sample_buffer \return true when the tone was detected or false when it is not */ -TELETONE_API int teletone_multi_tone_detect (teletone_multi_tone_t *mt, +TELETONE_API(int) teletone_multi_tone_detect (teletone_multi_tone_t *mt, int16_t sample_buffer[], int samples); @@ -220,7 +220,7 @@ \param dtmf_detect_state the DTMF detection state to initilize \param sample_rate the desired sample rate */ -TELETONE_API void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate); +TELETONE_API(void) teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate); /*! \brief Check a sample buffer for the presence of DTMF digits @@ -229,7 +229,7 @@ \param samples the number of samples present in sample_buffer \return true when DTMF was detected or false when it is not */ -TELETONE_API int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API(int) teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, int16_t sample_buffer[], int samples); /*! @@ -239,7 +239,7 @@ \param max the maximum length of buf \return the number of characters written to buf */ -TELETONE_API int teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API(int) teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, char *buf, int max); @@ -249,7 +249,7 @@ \param sample_buffer an array aof 16 bit signed linear samples \param samples the number of samples present in sample_buffer */ -TELETONE_API void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, +TELETONE_API(void) teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, int16_t sample_buffer[], int samples); Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Tue Mar 10 10:45:29 2009 @@ -79,7 +79,7 @@ #pragma warning(disable:4706) #endif -TELETONE_API int16_t TELETONE_SINES[SINE_TABLE_MAX] = { +TELETONE_API_DATA int16_t TELETONE_SINES[SINE_TABLE_MAX] = { 0x00c9, 0x025b, 0x03ed, 0x057f, 0x0711, 0x08a2, 0x0a33, 0x0bc4, 0x0d54, 0x0ee4, 0x1073, 0x1201, 0x138f, 0x151c, 0x16a8, 0x1833, 0x19be, 0x1b47, 0x1cd0, 0x1e57, 0x1fdd, 0x2162, 0x22e5, 0x2467, @@ -99,7 +99,7 @@ }; -TELETONE_API int teletone_set_tone(teletone_generation_session_t *ts, int index, ...) +TELETONE_API(int) teletone_set_tone(teletone_generation_session_t *ts, int index, ...) { va_list ap; int i = 0; @@ -115,7 +115,7 @@ } -TELETONE_API int teletone_set_map(teletone_tone_map_t *map, ...) +TELETONE_API(int) teletone_set_map(teletone_tone_map_t *map, ...) { va_list ap; int i = 0; @@ -131,7 +131,7 @@ } -TELETONE_API int teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data) +TELETONE_API(int) teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data) { memset(ts, 0, sizeof(*ts)); ts->rate = 8000; @@ -174,7 +174,7 @@ return 0; } -TELETONE_API int teletone_destroy_session(teletone_generation_session_t *ts) +TELETONE_API(int) teletone_destroy_session(teletone_generation_session_t *ts) { if (ts->buffer) { free(ts->buffer); @@ -203,7 +203,7 @@ return 0; } -TELETONE_API int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map) +TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map) { /*teletone_process_t period = (1.0 / ts->rate) / ts->channels;*/ int i, c; @@ -318,7 +318,7 @@ return (char *) memcpy (new, s, len); } -TELETONE_API int teletone_run(teletone_generation_session_t *ts, const char *cmd) +TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cmd) { char *data = NULL, *cur = NULL, *end = NULL; int var = 0, LOOPING = 0; Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Tue Mar 10 10:45:29 2009 @@ -137,7 +137,7 @@ /* 3.02 represents twice the power */ #define DBM0_MAX_POWER (3.14f + 3.02f) -TELETONE_API extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; +TELETONE_API_DATA extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; static __inline__ int32_t teletone_dds_phase_rate(teletone_process_t tone, uint32_t rate) { @@ -255,7 +255,7 @@ \param ... up to TELETONE_MAX_TONES frequencies terminated by 0.0 \return 0 */ -TELETONE_API int teletone_set_tone(teletone_generation_session_t *ts, int index, ...); +TELETONE_API(int) teletone_set_tone(teletone_generation_session_t *ts, int index, ...); /*! \brief Assign a set of tones to a single tone map @@ -263,7 +263,7 @@ \param ... up to TELETONE_MAX_TONES frequencies terminated by 0.0 \return 0 */ -TELETONE_API int teletone_set_map(teletone_tone_map_t *map, ...); +TELETONE_API(int) teletone_set_map(teletone_tone_map_t *map, ...); /*! \brief Initilize a tone generation session @@ -273,14 +273,14 @@ \param user_data optional user data to send \return 0 */ -TELETONE_API int teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data); +TELETONE_API(int) teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data); /*! \brief Free the buffer allocated by a tone generation session \param ts the tone generation session to destroy \return 0 */ -TELETONE_API int teletone_destroy_session(teletone_generation_session_t *ts); +TELETONE_API(int) teletone_destroy_session(teletone_generation_session_t *ts); /*! \brief Execute a single tone generation instruction @@ -288,7 +288,7 @@ \param map the tone mapping to use for the frequencies \return 0 */ -TELETONE_API int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map); +TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map); /*! \brief Execute a tone generation script and call callbacks after each instruction @@ -296,7 +296,7 @@ \param cmd the script to execute \return 0 */ -TELETONE_API int teletone_run(teletone_generation_session_t *ts, const char *cmd); +TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cmd); #ifdef __cplusplus }

1 0

[commit] r12546 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: anthm Date: Tue Mar 10 08:16:14 2009 New Revision: 12546 Log: add origination_pricacy var to originate api Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Mar 10 08:16:14 2009 @@ -381,6 +381,7 @@ #define SWITCH_ACCEPTABLE_INTERVAL(_i) (_i && _i <= SWITCH_MAX_INTERVAL && (_i % 10) == 0) typedef enum { + SWITCH_CPF_NONE = 0, SWITCH_CPF_SCREEN = (1 << 0), SWITCH_CPF_HIDE_NAME = (1 << 1), SWITCH_CPF_HIDE_NUMBER = (1 << 2) Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Mar 10 08:16:14 2009 @@ -916,7 +916,6 @@ const char *cid_tmp; originate_global_t oglobals = { 0 }; - oglobals.idx = IDX_NADA; oglobals.early_ok = 1; oglobals.session = session; @@ -1422,6 +1421,35 @@ new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_uuid", tmp); } + + + if (vdata && (var_begin = switch_stristr("origination_privacy=", vdata))) { + char tmp[512] = ""; + var_begin += strlen("origination_privacy="); + var_end = strchr(var_begin, '|'); + if (var_end) { + strncpy(tmp, var_begin, var_end-var_begin); + } else { + strncpy(tmp, var_begin, strlen(var_begin)); + } + + new_profile->flags = SWITCH_CPF_NONE; + + if (switch_stristr(tmp, "screen")) { + switch_set_flag(new_profile, SWITCH_CPF_SCREEN); + } + + if (switch_stristr(tmp, "hide_name")) { + switch_set_flag(new_profile, SWITCH_CPF_HIDE_NAME); + } + + if (switch_stristr(tmp, "hide_number")) { + switch_set_flag(new_profile, SWITCH_CPF_HIDE_NUMBER); + } + + new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_privacy", tmp); + } switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false");

1 0

[commit] r12545 - freeswitch/trunk/scripts/contrib/seven/sip
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: seven Date: Mon Mar 9 22:53:19 2009 New Revision: 12545 Log: script to parse sip messages and insert to Mysql Added: freeswitch/trunk/scripts/contrib/seven/sip/ freeswitch/trunk/scripts/contrib/seven/sip/sip2db.rb Added: freeswitch/trunk/scripts/contrib/seven/sip/sip2db.rb ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/seven/sip/sip2db.rb Mon Mar 9 22:53:19 2009 @@ -0,0 +1,207 @@ +#!/usr/bin/env ruby + +# read SIP messages from a plain text file(FreeSWITCH with TPORT_DUMP=/tmp/xxxx.log), +# and write to a Mysql database +# +# There are lots of ways to monitor sip messages. However, not all of them are convinient +# as we want. Let's say a simple example: +# +# FreeSWITCH :> originate sofia/gateways/carrier1/5550000|sofia/gateways/carrier2/5550000|sofia/carrier3... +# +# It's hard to tell what happend if the call fails. Because it's different sip sessions. +# The idea is to group them in one super session and see what happend. I do this by +# adding an arbitary sip header to do cross reference. And by parse the sip messages to +# a DB we can easily show it as html. I even can build a simple graph based on the DB data: +# +# http://skitch.com/seven1240/b8xj2/voip-master-idapted +# +# You can easily add a sip header to INVITE by(I use x_interaction): +# FreeSWITCH :> originate {sip_h_x_interaction=TEST0001}sofia/gateways/..... +# +# And I can get all the messages from DB: +# SELECT * FROM `sip_messages` WHERE (call_id IN +# (SELECT distinct call_id FROM sip_messages WHERE x_interaction = 'TEST0001')) ORDER BY created_at; +# +# There are two aproches to get sip packets: +# 1) tcpdump/tshark +# 2) FreeSWITCH +# +# I use the second. Note, there is no way to actually get sip messages from FS currently, but sofia-sip +# has the ability to log all sip messages to a disk file by using TPORT_DUMP +# +# And you can use this script to parse them to a DB. I know it hurt performance, +# but we don't have tons of traffic and you know there are only 5-10 messages for each +# sip call. While we get about 1G bytes each day in the sip log, most of them are OPTIONS/NOTIFY etc. +# I filtered them before inserting to DB, but it will be better if sofia-sip can filter that :) +# +# The script will monitor the log file and parse and insert to DB in real time. It's written in +# the Ruby on Rails framework, however, I think it can run out of Rails with or without +# modification. But you still need ruby and rubygems if you want to use it. +# +# on Ubuntu/Debian +# # apt-get install ruby rubygems +# # gem install mysql file-tail yaml +# +# It's just an idea, you may like to write your own tools to parse the sip log file. Also +# the log file need to be rotated regularly. And I think it maybe possible to store the log +# file on a memory disk, whatever... :) +# +# By default, it will go to the end of a log file and follow(like tail), +# if you want to parse the existing part, comment line: f.backward(0) +# +# Sample mysql DB DDL: +# CREATE TABLE `sip_messages` ( +# `id` int(11) NOT NULL auto_increment, +# `message_type` varchar(255) default NULL, +# `sip_to` varchar(255) default NULL, +# `call_id` varchar(255) default NULL, +# `message_bytes` int(11) default NULL, +# `content_length` int(11) default NULL, +# `message_body` text, +# `created_at` datetime default NULL, +# `x_interaction` varchar(255) default NULL, +# PRIMARY KEY (`id`), +# KEY `index_sip_messages_on_x_interaction` (`x_interaction`) +# ) ENGINE=InnoDB; +# +# Author: seven_at_idapted.com +# Lisense: Free of use + +require 'rubygems' +require "file/tail" +require "mysql" +require "yaml" + + +RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) +# Uncomment the following line and comment the above to make it work withouth rails framework +# RAILS_ROOT = "." +DB_CONFIG_FILENAME = File.join(RAILS_ROOT, "config/database.yml") +LOG_FILE = File.join(RAILS_ROOT, 'log/sip2db.log') +# FILENAME="/tmp/tport_sip.log" +FILENAME="/usr/local/freeswitch/log/tport_sip.log" +@debug = true + +if File.writable?(LOG_FILE) + @log_file = File.open(LOG_FILE, "a+") + puts "Writing logs to #{LOG_FILE}" +else + @log_file = STDOUT +end + +def log(msg) + @log_file.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}: #{msg}" +end + +def db_config + if File.readable?(DB_CONFIG_FILENAME) + conf = YAML.load_file(DB_CONFIG_FILENAME) + return conf["production"] + else + conf["host"] = "localhost" + conf["username"] = "root" + conf["password"] = "" + conf["database"] = "freeswitch_sip_db" + end +end + +#connect to Mysql +@dbh = nil +@debug = true +@call_id_array = [] #use as a queue to filter related messages + +def mysql_connect + Mysql.real_connect(db_config["host"] || db_config["server"], db_config["username"], db_config["password"], db_config["database"]) +end + +def ignore_message?(call_id, message_type) + #we do not care about certain types of messages and it's related ones + + # log @call_id_array.size.to_s + @call_id_array.shift if @call_id_array.size > 10000 + return true if @call_id_array.include?(call_id) + if message_type =~ /(REGISTER|OPTIONS|NOTIFY)/ + @call_id_array << call_id + return true + end + return false +end + +def insert_to_db(message_body) + + # puts message_body + message_body =~ /(recv|sent) (\d+)[^\n]*\n(\S+).*To: ([^\n]+).*Call-ID: (\S+).*Content-Length: (\d+)[^(x_int)]*(x_interaction: ([A-Z0-9]+))*/m + message_bytes, message_type, sip_to, call_id, content_length, x_interaction = $2, $3, $4, $5, $6, $8 + sip_to.sub!(/^.*<([^;>]+).*/, '\1') unless sip_to.nil? + + return if call_id.nil? + + call_id = call_id[0,100] + "_TRUNCATED" if call_id.length > 100 + return if ignore_message?(call_id, message_type) + + message_body = @dbh.escape_string(message_body) + sql = "INSERT INTO sip_messages (message_type, sip_to, call_id, message_bytes, x_interaction, content_length, message_body, created_at) + VALUES('#{message_type}', '#{sip_to}', '#{call_id}', '#{message_bytes}', '#{x_interaction}', #{content_length || 0 }, '#{message_body}', now())" + log sql if @debug + + begin + @dbh.query(sql) + rescue Mysql::Error => e + log "Error code #{e.errno}" + log "Error message: #{e.error}" + log "Error SQLSTATE: #{e.sqlstate}" if e.respond_to?("sqlstate") + end +end + + +#start here +begin + # connect to the MySQL server + # get server version string and display it + @dbh = mysql_connect + log "Server version: " + @dbh.get_server_info +rescue Mysql::Error => e + log "Error code: #{e.errno}" + log "Error message: #{e.error}" + log "Error SQLSTATE: #{e.sqlstate}" if e.respond_to?("sqlstate") +ensure + # disconnect from server + # @dbh.close if @dbh +end + + + +File.open(FILENAME) do |f| + message_type_expecting = true + message_body = '' + message_started = false + call_id = nil + line_count = 0 + + f.extend(File::Tail) + f.interval = 10 + f.backward(0) + f.tail do |line| + + if line_count > 1000 # crazy? + line_count = 0 + message_started = false + end + + if !message_started && line =~ /^(recv|sent) (\d+)/ + message_started = true + end + + if line =~ /\013/ # \v - seperator in dump file + insert_to_db message_body + message_body = '' + message_started = false + else + message_body << line + end + + end +end + + +

1 0

[commit] r12544 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 17:51:31 2009 New Revision: 12544 Log: declinatio mortuus obfirmo in fsctl hupall Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Mar 9 17:51:31 2009 @@ -81,6 +81,12 @@ switch_hash_index_t *hi; void *val; switch_core_session_t *session; + switch_memory_pool_t *pool; + switch_queue_t *queue; + void *pop; + + switch_core_new_memory_pool(&pool); + switch_queue_create(&queue, 250000, pool); if (!var_val) return; @@ -93,13 +99,25 @@ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { if (switch_channel_up(session->channel) && (this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) { - switch_channel_hangup(session->channel, cause); + switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str)); } switch_core_session_rwunlock(session); } } } switch_mutex_unlock(runtime.session_hash_mutex); + + while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + char *uuid = (char *) pop; + + if ((session = switch_core_session_locate(uuid))) { + switch_channel_hangup(session->channel, cause); + switch_core_session_rwunlock(session); + } + } + + switch_core_destroy_memory_pool(&pool); + } SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_interface_t *endpoint_interface, switch_call_cause_t cause) @@ -107,6 +125,12 @@ switch_hash_index_t *hi; void *val; switch_core_session_t *session; + switch_memory_pool_t *pool; + switch_queue_t *queue; + void *pop; + + switch_core_new_memory_pool(&pool); + switch_queue_create(&queue, 250000, pool); switch_mutex_lock(runtime.session_hash_mutex); for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { @@ -115,13 +139,25 @@ session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { if (session->endpoint_interface == endpoint_interface) { - switch_channel_hangup(switch_core_session_get_channel(session), cause); + switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str)); } switch_core_session_rwunlock(session); } } } switch_mutex_unlock(runtime.session_hash_mutex); + + while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + char *uuid = (char *) pop; + + if ((session = switch_core_session_locate(uuid))) { + switch_channel_hangup(session->channel, cause); + switch_core_session_rwunlock(session); + } + } + + switch_core_destroy_memory_pool(&pool); + } SWITCH_DECLARE(void) switch_core_session_hupall(switch_call_cause_t cause) @@ -129,28 +165,37 @@ switch_hash_index_t *hi; void *val; switch_core_session_t *session; - uint32_t loops = 0; + switch_memory_pool_t *pool; + switch_queue_t *queue; + void *pop; - while (session_manager.session_count > 0) { - switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); - if (val) { - session = (switch_core_session_t *) val; - if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { - switch_channel_hangup(switch_core_session_get_channel(session), cause); - switch_core_session_rwunlock(session); - } + switch_core_new_memory_pool(&pool); + switch_queue_create(&queue, 250000, pool); + + switch_mutex_lock(runtime.session_hash_mutex); + for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + if (val) { + session = (switch_core_session_t *) val; + if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { + switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str)); + switch_core_session_rwunlock(session); } } - switch_mutex_unlock(runtime.session_hash_mutex); - switch_yield(1000000); - if (++loops == 30) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up with %d session%s remaining\n", - session_manager.session_count, session_manager.session_count == 1 ? "" : "s"); - break; + } + switch_mutex_unlock(runtime.session_hash_mutex); + + while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + char *uuid = (char *) pop; + + if ((session = switch_core_session_locate(uuid))) { + switch_channel_hangup(session->channel, cause); + switch_core_session_rwunlock(session); } } + + switch_core_destroy_memory_pool(&pool); + }

1 0

[commit] r12543 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: andrew Date: Mon Mar 9 15:22:42 2009 New Revision: 12543 Log: Some more memory management tweaks Modified: 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 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 Mon Mar 9 15:22:42 2009 @@ -165,20 +165,47 @@ static switch_status_t handle_msg_fetch_reply(listener_t *listener, ei_x_buff *buf, ei_x_buff *rbuf) { char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + void *p; if (ei_decode_string_or_binary(buf->buff, &buf->index, SWITCH_UUID_FORMATTED_LENGTH, uuid_str)) { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badarg"); } else { - ei_x_buff *nbuf = switch_core_alloc(listener->pool, sizeof(nbuf)); - nbuf->buff = switch_core_alloc(listener->pool, buf->buffsz); + ei_x_buff *nbuf = malloc(sizeof(nbuf)); + nbuf->buff = malloc(buf->buffsz); memcpy(nbuf->buff, buf->buff, buf->buffsz); nbuf->index = buf->index; nbuf->buffsz = buf->buffsz; - - switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf); - ei_x_encode_atom(rbuf, "ok"); + + if ((p = switch_core_hash_find(listener->fetch_reply_hash, uuid_str))) { + if (p == &globals.TIMEOUT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handler for %s timed out\n", uuid_str); + switch_core_hash_delete(listener->fetch_reply_hash, uuid_str); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "timeout"); + } else if (p == &globals.WAITING) { + /* update the key to point at a pid */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found waiting slot for %s\n", uuid_str); + switch_core_hash_delete(listener->fetch_reply_hash, uuid_str); + switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf); + ei_x_encode_atom(rbuf, "ok"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found filled slot for %s\n", uuid_str); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "duplicate_response"); + } + } else { + /* nothin in the hash */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Empty slot for %s\n", uuid_str); + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "invalid_uuid"); + } + + /*switch_core_hash_insert(listener->fetch_reply_hash, uuid_str, nbuf);*/ } return SWITCH_STATUS_SUCCESS; } @@ -700,7 +727,7 @@ static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { erlang_ref ref; - erlang_pid *pid;/* = switch_core_alloc(listener->pool, sizeof(erlang_pid));*/ + erlang_pid *pid; void *p; char hash[100]; int arity; 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 Mon Mar 9 15:22:42 2009 @@ -388,7 +388,7 @@ _ei_x_encode_string(&buf, uuid_str); ei_encode_switch_event_headers(&buf, params); - /*switch_core_hash_insert(ptr->reply_hash, uuid_str, );*/ + switch_core_hash_insert(ptr->listener->fetch_reply_hash, uuid_str, &globals.WAITING); switch_mutex_lock(ptr->listener->sock_mutex); ei_sendto(ptr->listener->ec, ptr->listener->sockfd, &ptr->process, &buf); @@ -396,16 +396,19 @@ int i = 0; ei_x_buff *rep; - /*int index = 3;*/ - while (!(rep = (ei_x_buff *) switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str))) { + void *p = NULL; + + while (!(p = switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str)) || p == &globals.WAITING) { if (i > 50) { /* half a second timeout */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response\n"); + switch_core_hash_insert(ptr->listener->fetch_reply_hash, uuid_str, &globals.TIMEOUT); /* TODO lock this? */ return NULL; } i++; switch_yield(10000); /* 10ms */ } + rep = (ei_x_buff *) p; int type, size; ei_get_type(rep->buff, &rep->index, &type, &size); @@ -432,10 +435,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XML parsed OK!\n"); } + /* cleanup */ switch_core_hash_delete(ptr->listener->fetch_reply_hash, uuid_str); - - /*switch_safe_free(rep->buff);*/ - /*switch_safe_free(rep);*/ + free(rep->buff); + free(rep); free(xmlstr); return xml;

1 0

[commit] r12542 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Mar '09

09 Mar '09

Author: anthm Date: Mon Mar 9 14:48:17 2009 New Revision: 12542 Log: dont fire presence event for the reporting state Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Mar 9 14:48:17 2009 @@ -968,7 +968,7 @@ switch_channel_clear_flag(channel, CF_TAGGED); - if (channel->state >= CS_ROUTING) { + if (channel->state >= CS_ROUTING && channel->state <= CS_HANGUP) { switch_channel_presence(channel, "unknown", (char *) state_names[state], NULL); }

1 0