March 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7910 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: mikej Date: Tue Mar 18 10:24:40 2008 New Revision: 7910 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: tweak help. Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Mar 18 10:24:40 2008 @@ -634,7 +634,7 @@ SWITCH_ADD_APP(app_interface, "db", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[get|set]/<realm>/<key>/<value>"); + SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[insert|delete|select]/<realm>/<key>/<value>"); SWITCH_ADD_API(commands_api_interface, "group", "group [insert|delete|call]", group_api_function, "[insert|delete|call]:<group name>:<url>"); /* indicate that the module should continue to be loaded */

1 0

[commit] r7909 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: anthm Date: Mon Mar 17 23:24:03 2008 New Revision: 7909 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: resolve MODAPP-80 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Mar 17 23:24:03 2008 @@ -279,46 +279,57 @@ const unsigned char *dend = rr->dnsrr_dend; unsigned char *dn = rr->dnsrr_dn; const unsigned char *c; - char *ptr; char flags; int order; int preference; - char *nme; char *service = NULL; char *regex = NULL; char *replace = NULL; int argc = 0; char *argv[4] = { 0 }; - int leap; + int n; + char string_arg[3][256] = {{0}}; switch (rr->dnsrr_typ) { - - case DNS_T_NAPTR: /* prio weight port targetDN */ + case DNS_T_NAPTR:/* prio weight port targetDN */ c = dptr; - c += 2 + 2 + 2; - if (dns_getdn(pkt, &c, end, dn, DNS_MAXDN) <= 0 || c != dend) + c += 4; /* order, pref */ + + for (n = 0; n < 3; ++n) { + if (c >= dend) { + goto xperr; + } else { + c += *c + 1; + } + } + + if (dns_getdn(pkt, &c, end, dn, DNS_MAXDN) <= 0 || c != dend) { goto xperr; + } + c = dptr; + order = dns_get16(c+0); + preference = dns_get16(c+2); + flags = (char) dns_get16(c + 4); + c += 4; - leap = *dn; - nme = (char *) dn + 1; + for(n = 0; n < 3; n++) { + uint32_t len = *c++, cpylen = len; + if (len > sizeof(string_arg[n]) - 1) { + cpylen = sizeof(string_arg[n]) - 1; + } + strncpy(string_arg[n], (char *)c, cpylen); + *(string_arg[n] + len) = '\0'; + c += len; + } - order = dns_get16(c + 0); - preference = dns_get16(c + 2); - flags = (char) dns_get16(c + 4); + service = string_arg[1]; - if ((ptr = nme + leap)) { - service = nme; - *ptr++ = '\0'; - argc = switch_separate_string(ptr, '!', argv, (sizeof(argv) / sizeof(argv[0]))); + if ((argc = switch_separate_string(string_arg[2], '!', argv, (sizeof(argv) / sizeof(argv[0]))))) { regex = argv[1]; replace = argv[2]; - } - - for (ptr = replace; ptr && *ptr; ptr++) { - if (*ptr == '\\') { - *ptr = '$'; - } + } else { + goto xperr; } if (flags && service && regex && replace) { @@ -350,7 +361,7 @@ } } } - + add_result(q, order, preference, service, uri); } @@ -365,7 +376,7 @@ return; - xperr: + xperr: //printf("<parse error>\n"); return; }

1 0

[commit] r7908 - in freeswitch/trunk/src: . include include/private
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 19:26:38 2008 New Revision: 7908 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c Log: update Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Mon Mar 17 19:26:38 2008 @@ -138,6 +138,7 @@ switch_frame_t enc_read_frame; uint8_t raw_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; uint8_t enc_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_codec_t bug_codec; }; struct switch_media_bug { Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Mar 17 19:26:38 2008 @@ -1025,6 +1025,8 @@ int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec, switch_memory_pool_t *pool); + /*! \brief Encode data using a codec handle \param codec the codec handle to use Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Mon Mar 17 19:26:38 2008 @@ -154,6 +154,35 @@ } +SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec, switch_memory_pool_t *pool) +{ + switch_status_t status; + + switch_assert(codec != NULL); + switch_assert(new_codec != NULL); + + if (pool) { + new_codec->memory_pool = pool; + } else { + if ((status = switch_core_new_memory_pool(&new_codec->memory_pool)) != SWITCH_STATUS_SUCCESS) { + return status; + } + switch_set_flag(new_codec, SWITCH_CODEC_FLAG_FREE_POOL); + } + + new_codec->codec_interface = codec->codec_interface; + new_codec->implementation = codec->implementation; + new_codec->flags = codec->flags; + + if (codec->fmtp_in) { + new_codec->fmtp_in = switch_core_strdup(new_codec->memory_pool, codec->fmtp_in); + } + + new_codec->implementation->init(new_codec, new_codec->flags, NULL); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, char *codec_name, char *fmtp, uint32_t rate, int ms, int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool) @@ -305,6 +334,8 @@ switch_core_destroy_memory_pool(&codec->memory_pool); } + memset(codec, 0, sizeof(*codec)); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Mar 17 19:26:38 2008 @@ -186,7 +186,7 @@ if (read_frame->codec || is_cng) { session->raw_read_frame.datalen = session->raw_read_frame.buflen; - + if (is_cng) { memset(session->raw_read_frame.data, 255, read_frame->codec->implementation->bytes_per_frame); session->raw_read_frame.datalen = read_frame->codec->implementation->bytes_per_frame; @@ -194,7 +194,15 @@ read_frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; } else { - status = switch_core_codec_decode(read_frame->codec, + switch_codec_t *use_codec = read_frame->codec; + if (do_bugs) { + if (!session->bug_codec.implementation) { + switch_core_codec_copy(read_frame->codec, &session->bug_codec, switch_core_session_get_pool(session)); + } + use_codec = &session->bug_codec; + } + + status = switch_core_codec_decode(use_codec, session->read_codec, read_frame->data, read_frame->datalen, Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Mon Mar 17 19:26:38 2008 @@ -288,6 +288,10 @@ return SWITCH_STATUS_SUCCESS; } + if (session->bug_codec.implementation) { + switch_core_codec_destroy(&session->bug_codec); + } + return SWITCH_STATUS_FALSE; } @@ -342,6 +346,10 @@ switch_thread_rwlock_unlock(session->bug_rwlock); status = switch_core_media_bug_close(&bp); } + + if (!session->bugs && session->bug_codec.implementation) { + switch_core_codec_destroy(&session->bug_codec); + } return status; }

1 0

[commit] r7907 - freeswitch/trunk/src
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 15:45:39 2008 New Revision: 7907 Modified: freeswitch/trunk/src/switch_time.c Log: do less work in timer thread to meet silly new kernels half way Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 17 15:45:39 2008 @@ -39,7 +39,7 @@ #endif #define MAX_TICK UINT32_MAX - 1024 - +#define MS_PER_TICK 10 static switch_memory_pool_t *module_pool = NULL; static struct { @@ -364,25 +364,19 @@ tick = 0; } - - for (x = 0; x <= MAX_ELEMENTS; x++) { - int i = x, index; - - if (i == 0) { - i = 1; - } - - index = (current_ms % i == 0) ? i : 0; - - if (TIMER_MATRIX[index].count) { - TIMER_MATRIX[index].tick++; - if (TIMER_MATRIX[x].tick == MAX_TICK) { - TIMER_MATRIX[x].tick = 0; - TIMER_MATRIX[x].roll++; + if ((current_ms % MS_PER_TICK) == 0) { + for (x = MS_PER_TICK; x <= MAX_ELEMENTS; x += MS_PER_TICK) { + if ((current_ms % x) == 0) { + if (TIMER_MATRIX[x].count) { + TIMER_MATRIX[x].tick++; + if (TIMER_MATRIX[x].tick == MAX_TICK) { + TIMER_MATRIX[x].tick = 0; + TIMER_MATRIX[x].roll++; + } + } } } } - if (current_ms == MAX_ELEMENTS) { current_ms = 0; }

1 0

[commit] r7906 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 13:43:51 2008 New Revision: 7906 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: wtf Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Mar 17 13:43:51 2008 @@ -436,7 +436,6 @@ void *pop; switch_mutex_lock(profile->ireg_mutex); while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { - printf("WTF [%s]\n", (char *)pop); sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); free(pop); }

1 0

[commit] r7905 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 13:43:25 2008 New Revision: 7905 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: doh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Mar 17 13:43:25 2008 @@ -436,6 +436,7 @@ void *pop; switch_mutex_lock(profile->ireg_mutex); while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + printf("WTF [%s]\n", (char *)pop); sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); free(pop); } 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 Mon Mar 17 13:43:25 2008 @@ -2503,16 +2503,18 @@ } switch_assert(d_sql); - status = switch_queue_trypush(profile->sql_queue, d_sql); + if ((status = switch_queue_trypush(profile->sql_queue, d_sql)) == SWITCH_STATUS_SUCCESS) { + d_sql = NULL; + } } else if (sql_already_dynamic) { d_sql = sql; } - + if (status != SWITCH_STATUS_SUCCESS) { sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); } - switch_safe_free(d_sql); + switch_safe_free(d_sql); if (sql_already_dynamic) { *sqlp = NULL;

1 0

[commit] r7904 - freeswitch/trunk/src
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 13:26:22 2008 New Revision: 7904 Modified: freeswitch/trunk/src/switch_core_db.c Log: doh Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Mon Mar 17 13:26:22 2008 @@ -94,7 +94,7 @@ } } - if (err && errmsg) { + if (errmsg) { *errmsg = err; }

1 0

[commit] r7903 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: brian Date: Mon Mar 17 13:09:22 2008 New Revision: 7903 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: tweak Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Mar 17 13:09:22 2008 @@ -1,6 +1,6 @@ <include>  -  +  <user id="brian" mailbox="9999">  <gateways>

1 0

[commit] r7902 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: brian Date: Mon Mar 17 12:54:10 2008 New Revision: 7902 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: cleanup Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Mar 17 12:54:10 2008 @@ -1,6 +1,7 @@ <include> -  - <user ip="1.2.3.4" id="brian" mailbox="9999"> +  +  + <user id="brian" mailbox="9999">  <gateways>

1 0

[commit] r7901 - freeswitch/trunk/src
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: mikej Date: Mon Mar 17 12:25:53 2008 New Revision: 7901 Modified: freeswitch/trunk/src/switch_event.c Log: tweak Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 17 12:25:53 2008 @@ -47,7 +47,8 @@ static switch_mutex_t *POOL_LOCK = NULL; static switch_memory_pool_t *RUNTIME_POOL = NULL; static switch_memory_pool_t *THRUNTIME_POOL = NULL; -static switch_queue_t *EVENT_QUEUE[MAX_DISPATCH] = { 0 }; +#define NUMBER_OF_QUEUES 3 +static switch_queue_t *EVENT_QUEUE[NUMBER_OF_QUEUES] = { 0 }; static switch_queue_t *EVENT_DISPATCH_QUEUE[MAX_DISPATCH] = { 0 }; static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN; static switch_mutex_t *EVENT_QUEUE_MUTEX = NULL; @@ -179,7 +180,7 @@ THREAD_COUNT++; switch_mutex_unlock(EVENT_QUEUE_MUTEX); - for (my_id = 0; my_id < MAX_DISPATCH; my_id++) { + for (my_id = 0; my_id < NUMBER_OF_QUEUES; my_id++) { if (EVENT_DISPATCH_QUEUE[my_id] == queue) { break; } @@ -222,7 +223,7 @@ THREAD_COUNT++; switch_mutex_unlock(EVENT_QUEUE_MUTEX); - for (my_id = 0; my_id < MAX_DISPATCH; my_id++) { + for (my_id = 0; my_id < NUMBER_OF_QUEUES; my_id++) { if (EVENT_QUEUE[my_id] == queue) { break; }

1 0