- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

17 Mar '08

Author: anthm Date: Mon Mar 17 12:12:38 2008 New Revision: 7900 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix MODENDP-98 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 Mon Mar 17 12:12:38 2008 @@ -512,7 +512,7 @@ char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]); -void sofia_glue_execute_sql(sofia_profile_t *profile, char **sqlp, switch_bool_t dyn); +void sofia_glue_execute_sql(sofia_profile_t *profile, char **sqlp, switch_bool_t sql_already_dynamic); void sofia_glue_actually_execute_sql(sofia_profile_t *profile, switch_bool_t master, char *sql, switch_mutex_t *mutex); void sofia_reg_check_expire(sofia_profile_t *profile, time_t now); void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now); 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 12:12:38 2008 @@ -2487,7 +2487,7 @@ } -void sofia_glue_execute_sql(sofia_profile_t *profile, char **sqlp, switch_bool_t dyn) +void sofia_glue_execute_sql(sofia_profile_t *profile, char **sqlp, switch_bool_t sql_already_dynamic) { switch_status_t status = SWITCH_STATUS_FALSE; char *d_sql = NULL, *sql; @@ -2496,7 +2496,7 @@ sql = *sqlp; if (profile->sql_queue) { - if (dyn) { + if (sql_already_dynamic) { d_sql = sql; } else { d_sql = strdup(sql); @@ -2504,19 +2504,19 @@ switch_assert(d_sql); status = switch_queue_trypush(profile->sql_queue, d_sql); + } else if (sql_already_dynamic) { + d_sql = sql; } - if (status == SWITCH_STATUS_SUCCESS) { - if (dyn) { - *sqlp = NULL; - } - } else { - if (!dyn) { - switch_safe_free(d_sql); - } + if (status != SWITCH_STATUS_SUCCESS) { sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); } + switch_safe_free(d_sql); + + if (sql_already_dynamic) { + *sqlp = NULL; + } } void sofia_glue_actually_execute_sql(sofia_profile_t *profile, switch_bool_t master, char *sql, switch_mutex_t *mutex)

1 0

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

17 Mar '08

Author: brian Date: Mon Mar 17 12:00:18 2008 New Revision: 7899 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: ip auth example on user brian 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:00:18 2008 @@ -1,5 +1,6 @@ <include> - <user id="brian" mailbox="9999">  +  + <user ip="1.2.3.4" id="brian" mailbox="9999">  <gateways>

1 0

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

17 Mar '08

Author: anthm Date: Mon Mar 17 11:44:09 2008 New Revision: 7898 Modified: freeswitch/trunk/src/switch_core_db.c Log: yay wasim found a bug i can actually fix right away for once 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 11:44:09 2008 @@ -79,12 +79,13 @@ { int ret = 0; int sane = 100; + char *err = NULL; while(--sane > 0) { - ret = sqlite3_exec(db, sql, callback, data, errmsg); + ret = sqlite3_exec(db, sql, callback, data, &err); if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { - switch_safe_free(*errmsg); + switch_safe_free(err); switch_yield(1000); continue; } @@ -93,6 +94,10 @@ } } + if (err && errmsg) { + *errmsg = err; + } + return ret; }

1 0

[commit] r7897 - freeswitch/trunk/src
by Freeswitch SVN 16 Mar '08

16 Mar '08

Author: mikej Date: Sun Mar 16 14:31:27 2008 New Revision: 7897 Modified: freeswitch/trunk/src/switch_event.c Log: an array of any other size..... Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sun Mar 16 14:31:27 2008 @@ -47,7 +47,7 @@ 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[3] = { 0, 0, 0 }; +static switch_queue_t *EVENT_QUEUE[MAX_DISPATCH] = { 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; @@ -398,7 +398,7 @@ static void launch_dispatch_threads(int max, int len, switch_memory_pool_t *pool) { switch_thread_t *thread; - switch_threadattr_t *thd_attr;; + switch_threadattr_t *thd_attr; int index = 0; if (max > MAX_DISPATCH) {

1 0

[commit] r7896 - freeswitch/trunk/src
by Freeswitch SVN 14 Mar '08

14 Mar '08

Author: anthm Date: Fri Mar 14 16:08:58 2008 New Revision: 7896 Modified: freeswitch/trunk/src/switch_channel.c Log: update Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Mar 14 16:08:58 2008 @@ -1918,10 +1918,16 @@ switch_time_t uduration = 0, legbillusec = 0, billusec = 0; time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; - if (!(caller_profile = switch_channel_get_caller_profile(channel))) { + if (!(caller_profile = switch_channel_get_caller_profile(channel)) || !channel->variables) { return SWITCH_STATUS_FALSE; } + if ((app_log = switch_core_session_get_app_log(channel->session))) { + for (ap = app_log; ap && ap->next; ap = ap->next); + last_app = ap->app; + last_arg = ap->arg; + } + if (!(ocp = switch_channel_get_originatee_caller_profile(channel))) { ocp = switch_channel_get_originator_caller_profile(channel); } @@ -1933,11 +1939,6 @@ cid_buf = caller_profile->caller_id_number; } - if ((app_log = switch_core_session_get_app_log(channel->session))) { - for (ap = app_log; ap && ap->next; ap = ap->next); - last_app = ap->app; - last_arg = ap->arg; - } if (caller_profile->times) { switch_time_exp_t tm;

1 0