May 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r8281 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 18:56:55 2008 New Revision: 8281 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix possible register memory leak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue May 6 18:56:55 2008 @@ -1899,6 +1899,7 @@ silence_frame.flags = SFF_CNG; memset(&mod_sofia_globals, 0, sizeof(mod_sofia_globals)); + mod_sofia_globals.destroy_private.destroy_nh = 1; mod_sofia_globals.pool = pool; switch_mutex_init(&mod_sofia_globals.mutex, SWITCH_MUTEX_NESTED, mod_sofia_globals.pool); 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 Tue May 6 18:56:55 2008 @@ -100,6 +100,7 @@ char uuid[SWITCH_UUID_FORMATTED_LENGTH + 1]; sofia_gateway_t *gateway; char gateway_name[512]; + int destroy_nh; }; #define set_param(ptr,val) if (ptr) {free(ptr) ; ptr = NULL;} if (val) {ptr = strdup(val);} @@ -194,6 +195,7 @@ char guess_ip[80]; switch_queue_t *presence_queue; switch_queue_t *mwi_queue; + struct sofia_private destroy_private; }; extern struct mod_sofia_globals mod_sofia_globals; 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 Tue May 6 18:56:55 2008 @@ -194,7 +194,7 @@ switch_channel_t *channel = NULL; sofia_gateway_t *gateway = NULL; - if (sofia_private) { + if (sofia_private && sofia_private != &mod_sofia_globals.destroy_private) { if ((gateway = sofia_private->gateway)) { if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile %s is locked\n", gateway->profile->name); @@ -356,6 +356,11 @@ done: + if (sofia_private && sofia_private->destroy_nh) { + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroy handle requested.\n"); + nua_handle_destroy(nh); + } + if (gateway) { sofia_reg_release_gateway(gateway); } 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 Tue May 6 18:56:55 2008 @@ -781,7 +781,8 @@ exptime = tmp - switch_timestamp(NULL); } } - + + //if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { if (!(nh = (nua_handle_t *) switch_core_hash_find(profile->sub_hash, call_id))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); return 0; @@ -1045,7 +1046,7 @@ switch_snprintf(exp, sizeof(exp), "active;expires=%ld", (long) exptime); nua_notify(nh, - NUTAG_NEWSUB(1), + //NUTAG_NEWSUB(1), SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(pl), TAG_END()); @@ -1090,6 +1091,7 @@ return 0; } + //if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { if (!(nh = (nua_handle_t *) switch_core_hash_find(profile->sub_hash, call_id))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); return 0; @@ -1103,7 +1105,7 @@ exp = switch_mprintf("active;expires=%ld", expire_sec); nua_notify(nh, - NUTAG_NEWSUB(1), + //NUTAG_NEWSUB(1), SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); @@ -1146,6 +1148,7 @@ SIPTAG_CONTACT_STR(profile->url), TAG_END()); + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); nua_notify(nh, NUTAG_NEWSUB(1), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); @@ -1347,6 +1350,7 @@ sent_reply++; #if 0 + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); nua_notify(nh, NUTAG_NEWSUB(1), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EVENT_STR(event),

1 0

[Freeswitch-svn] [commit] r8280 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: nta nta/sofia-sip nua nua/sofia-sip
by Freeswitch SVN 06 May '08

06 May '08

Author: mikej Date: Tue May 6 18:28:20 2008 New Revision: 8280 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua.h Log: add nua_handle_by_call_id 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 May 6 18:28:20 2008 @@ -4022,6 +4022,27 @@ return leg; } +/** Get dialog leg by @CallID. + * + * @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 *leg = NULL; + + if (call_id) { + sip_call_id_t id[1]; + sip_call_id_init(id); + + id->i_hash = msg_hash_string(id->i_id = call_id); + + leg = leg_find(sa, NULL, NULL, id, NULL, NULL); + } + + return leg; +} + /** Calculate a simple case-insensitive hash over a string */ su_inline hash_value_t hash_istring(char const *s, char const *term, hash_value_t hash) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h Tue May 6 18:28:20 2008 @@ -253,6 +253,10 @@ SOFIAPUBFUN nta_leg_t *nta_leg_by_replaces(nta_agent_t *, sip_replaces_t const *); +/** Get dialog leg by CallID */ +SOFIAPUBFUN +nta_leg_t *nta_leg_by_call_id(nta_agent_t *sa, const char *call_id); + /* ---------------------------------------------------------------------- * 6) Prototypes for incoming transactions */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c Tue May 6 18:28:20 2008 @@ -1005,6 +1005,21 @@ return 0; } +struct nua_stack_handle_by_call_id_args { + nua_handle_t *retval; + nua_t *nua; + const char *call_id; +}; + +static int nua_stack_handle_by_call_id_call(void *arg) +{ + struct nua_stack_handle_by_call_id_args *a = arg; + + a->retval = nua_stack_handle_by_call_id(a->nua, a->call_id); + + return 0; +} + /** Obtain a new reference to an existing handle based on @Replaces header. * * @since New in @VERSION_1_12_4. @@ -1039,3 +1054,38 @@ } return NULL; } + +/** Obtain a new reference to an existing handle based on @CallID. + * + * @since New in @VERSION_1_12_9. + * + * @note + * You should release the reference with nua_handle_unref() when you are + * done with the handle. + * + * @sa nua_handle_make_replaces(), @Replaces, @RFC3891, nua_refer(), + * #nua_i_refer, @ReferTo, nta_leg_by_replaces() + */ +nua_handle_t *nua_handle_by_call_id(nua_t *nua, const char *call_id) +{ + if (nua) { +#if HAVE_OPEN_C + struct nua_stack_handle_by_call_id_args a; + a.retval = NULL; + a.nua = nua; + a.call_id = call_id; +#else + struct nua_stack_handle_by_call_id_args a = { NULL, nua, call_id }; +#endif + + if (su_task_execute(nua->nua_server, + nua_stack_handle_by_call_id_call, (void *)&a, + NULL) == 0) { + nua_handle_t *nh = a.retval; + + if (nh && !NH_IS_DEFAULT(nh) && nh->nh_valid) + return nua_handle_ref(nh); + } + } + return NULL; +} Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Tue May 6 18:28:20 2008 @@ -1115,6 +1115,15 @@ return NULL; } +nua_handle_t *nua_stack_handle_by_call_id(nua_t *nua, const char *call_id) +{ + if (nua) { + nta_leg_t *leg = nta_leg_by_call_id(nua->nua_nta, call_id); + if (leg) + return nta_leg_magic(leg, nua_stack_process_request); + } + return NULL; +} /** @internal Add authorization data */ int nh_authorize(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h Tue May 6 18:28:20 2008 @@ -380,6 +380,9 @@ nua_handle_t *nua_stack_handle_by_replaces(nua_t *nua, sip_replaces_t const *r); +nua_handle_t *nua_stack_handle_by_call_id(nua_t *nua, const char *call_id); + + /* ---------------------------------------------------------------------- */ int nua_stack_set_defaults(nua_handle_t *nh, nua_handle_preferences_t *nhp); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua.h Tue May 6 18:28:20 2008 @@ -384,6 +384,7 @@ SOFIAPUBFUN nua_handle_t *nua_handle_by_replaces(nua_t *nua, sip_replaces_t const *rp); +nua_handle_t *nua_handle_by_call_id(nua_t *nua, const char *call_id); SOFIA_END_DECLS

1 0

[Freeswitch-svn] [commit] r8279 - in freeswitch/trunk/src: . mod/applications/mod_fifo
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 17:43:42 2008 New Revision: 8279 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: fix fifo logic bug Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue May 6 17:43:42 2008 @@ -452,7 +452,7 @@ if (!consumer && node) { switch_core_session_t *other_session; switch_channel_t *other_channel; - const char *uuid = strdup(switch_core_session_get_uuid(session)); + const char *uuid = switch_core_session_get_uuid(session); const char *pri; char tmp[25] = ""; int p = 0; @@ -510,7 +510,7 @@ node->start_waiting = switch_timestamp_now(); } - switch_queue_push(node->fifo_list[p], (void *)uuid); + switch_queue_push(node->fifo_list[p], (void *)strdup(uuid)); if (!pri) { switch_snprintf(tmp, sizeof(tmp), "%d", p); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue May 6 17:43:42 2008 @@ -424,7 +424,7 @@ switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); - if (!(v = switch_event_get_header(channel->variables, (char*)varname))) { + if (!channel->variables || !(v = switch_event_get_header(channel->variables, (char*)varname))) { switch_caller_profile_t *cp = channel->caller_profile; if (cp) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue May 6 17:43:42 2008 @@ -510,6 +510,7 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name) { switch_event_header_t *hp; + switch_assert(event); if (!header_name) return NULL; for (hp = event->headers; hp; hp = hp->next) {

1 0

[Freeswitch-svn] [commit] r8278 - in freeswitch/trunk/src: . include/private
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 17:05:38 2008 New Revision: 8278 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_io.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 Tue May 6 17:05:38 2008 @@ -186,6 +186,8 @@ char *mailer_app_args; uint32_t max_dtmf_duration; uint32_t default_dtmf_duration; + switch_frame_t dummy_cng_frame; + char dummy_data[5]; }; extern struct switch_runtime runtime; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue May 6 17:05:38 2008 @@ -842,6 +842,11 @@ memset(&runtime, 0, sizeof(runtime)); + runtime.dummy_cng_frame.data = runtime.dummy_data; + runtime.dummy_cng_frame.datalen= sizeof(runtime.dummy_data); + runtime.dummy_cng_frame.buflen= sizeof(runtime.dummy_data); + runtime.dummy_cng_frame.flags = SFF_CNG; + switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); runtime.hard_log_level = SWITCH_LOG_DEBUG; runtime.mailer_app = "sendmail"; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue May 6 17:05:38 2008 @@ -462,6 +462,10 @@ even_more_done: + if (!*frame) { + *frame = &runtime.dummy_cng_frame; + } + return status; }

1 0

[Freeswitch-svn] [commit] r8277 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 16:43:36 2008 New Revision: 8277 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.c Tue May 6 16:43:36 2008 @@ -165,7 +165,9 @@ if (error) { const char *err = lua_tostring(L, -1); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", switch_str_nil(err)); + if (!switch_strlen_zero(err)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", err); + } lua_pop(L, 1); /* pop error message from the stack */ } }

1 0

[Freeswitch-svn] [commit] r8276 - in freeswitch/trunk/src: . include
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 16:00:43 2008 New Revision: 8276 Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_core_sqldb.c Log: add dialplan and context to sql table Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue May 6 16:00:43 2008 @@ -158,6 +158,8 @@ */ _Ret_opt_z_ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name); +#define switch_event_get_header_nil(e, h) switch_str_nil(switch_event_get_header(e,h)) + /*! \brief Retrieve the body value from an event \param event the event to read the body from Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Tue May 6 16:00:43 2008 @@ -202,7 +202,7 @@ if (trans && ((itterations == target) || nothing_in_queue)) { - if (switch_core_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 1000) != SWITCH_STATUS_SUCCESS) { + if (switch_core_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 100) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread unable to commit transaction, records lost!\n"); } itterations = 0; @@ -237,50 +237,53 @@ switch (event->event_id) { case SWITCH_EVENT_ADD_SCHEDULE: sql = switch_mprintf("insert into tasks values('%q','%q','%q','%q')", - switch_event_get_header(event, "task-id"), - switch_event_get_header(event, "task-desc"), - switch_event_get_header(event, "task-group"), switch_event_get_header(event, "task-sql_manager") - ); + switch_event_get_header_nil(event, "task-id"), + switch_event_get_header_nil(event, "task-desc"), + switch_event_get_header_nil(event, "task-group"), + switch_event_get_header_nil(event, "task-sql_manager") + ); break; case SWITCH_EVENT_DEL_SCHEDULE: case SWITCH_EVENT_EXE_SCHEDULE: - sql = switch_mprintf("delete from tasks where task_id=%q", switch_event_get_header(event, "task-id")); + sql = switch_mprintf("delete from tasks where task_id=%q", switch_event_get_header_nil(event, "task-id")); break; case SWITCH_EVENT_RE_SCHEDULE: sql = switch_mprintf("update tasks set task_sql_manager='%q' where task_id=%q", - switch_event_get_header(event, "task-sql_manager"), switch_event_get_header(event, "task-id")); + switch_event_get_header_nil(event, "task-sql_manager"), switch_event_get_header_nil(event, "task-id")); break; case SWITCH_EVENT_CHANNEL_DESTROY: - sql = switch_mprintf("delete from channels where uuid='%q'", switch_event_get_header(event, "unique-id")); + sql = switch_mprintf("delete from channels where uuid='%q'", switch_event_get_header_nil(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_CREATE: - sql = switch_mprintf("insert into channels (uuid,created,created_epoch, name,state) values('%q','%q','%ld','%q','%q')", - switch_event_get_header(event, "unique-id"), - switch_event_get_header(event, "event-date-local"), + sql = switch_mprintf("insert into channels (uuid,created,created_epoch, name,state,dialplan,context) values('%q','%q','%ld','%q','%q','%q','%q')", + switch_event_get_header_nil(event, "unique-id"), + switch_event_get_header_nil(event, "event-date-local"), (long)switch_timestamp(NULL), - switch_event_get_header(event, "channel-name"), - switch_event_get_header(event, "channel-state") + switch_event_get_header_nil(event, "channel-name"), + switch_event_get_header_nil(event, "channel-state"), + switch_event_get_header_nil(event, "caller-dialplan"), + switch_event_get_header_nil(event, "caller-context") ); break; case SWITCH_EVENT_CODEC: sql = switch_mprintf ("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", - switch_event_get_header(event, "channel-read-codec-name"), switch_event_get_header(event, + switch_event_get_header_nil(event, "channel-read-codec-name"), switch_event_get_header_nil(event, "channel-read-codec-rate"), - switch_event_get_header(event, "channel-write-codec-name"), switch_event_get_header(event, + switch_event_get_header_nil(event, "channel-write-codec-name"), switch_event_get_header_nil(event, "channel-write-codec-rate"), - switch_event_get_header(event, "unique-id")); + switch_event_get_header_nil(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_EXECUTE: sql = switch_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", - switch_event_get_header(event, "application"), - switch_event_get_header(event, "application-data"), switch_event_get_header(event, "unique-id") + switch_event_get_header_nil(event, "application"), + switch_event_get_header_nil(event, "application-data"), switch_event_get_header_nil(event, "unique-id") ); break; case SWITCH_EVENT_CHANNEL_STATE: if (event) { - char *state = switch_event_get_header(event, "channel-state-number"); + char *state = switch_event_get_header_nil(event, "channel-state-number"); switch_channel_state_t state_i = atoi(state); switch (state_i) { @@ -288,18 +291,21 @@ case CS_DONE: break; case CS_ROUTING: - sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q' " + sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q',dialplan='%q',context='%q' " "where uuid='%s'", - switch_event_get_header(event, "channel-state"), - switch_event_get_header(event, "caller-caller-id-name"), - switch_event_get_header(event, "caller-caller-id-number"), - switch_event_get_header(event, "caller-network-addr"), - switch_event_get_header(event, "caller-destination-number"), switch_event_get_header(event, "unique-id") + switch_event_get_header_nil(event, "channel-state"), + switch_event_get_header_nil(event, "caller-caller-id-name"), + switch_event_get_header_nil(event, "caller-caller-id-number"), + switch_event_get_header_nil(event, "caller-network-addr"), + switch_event_get_header_nil(event, "caller-destination-number"), + switch_event_get_header_nil(event, "caller-dialplan"), + switch_event_get_header_nil(event, "caller-context"), + switch_event_get_header_nil(event, "unique-id") ); break; default: sql = switch_mprintf("update channels set state='%s' where uuid='%s'", - switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "unique-id") + switch_event_get_header_nil(event, "channel-state"), switch_event_get_header_nil(event, "unique-id") ); break; } @@ -308,22 +314,22 @@ break; case SWITCH_EVENT_CHANNEL_BRIDGE: sql = switch_mprintf("insert into calls values ('%s', '%ld', '%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", - switch_event_get_header(event, "event-date-local"), + switch_event_get_header_nil(event, "event-date-local"), (long)switch_timestamp(NULL), - switch_event_get_header(event, "event-calling-function"), - switch_event_get_header(event, "caller-caller-id-name"), - switch_event_get_header(event, "caller-caller-id-number"), - switch_event_get_header(event, "caller-destination-number"), - switch_event_get_header(event, "caller-channel-name"), - switch_event_get_header(event, "caller-unique-id"), - switch_event_get_header(event, "Other-Leg-caller-id-name"), - switch_event_get_header(event, "Other-Leg-caller-id-number"), - switch_event_get_header(event, "Other-Leg-destination-number"), - switch_event_get_header(event, "Other-Leg-channel-name"), switch_event_get_header(event, "Other-Leg-unique-id") + switch_event_get_header_nil(event, "event-calling-function"), + switch_event_get_header_nil(event, "caller-caller-id-name"), + switch_event_get_header_nil(event, "caller-caller-id-number"), + switch_event_get_header_nil(event, "caller-destination-number"), + switch_event_get_header_nil(event, "caller-channel-name"), + switch_event_get_header_nil(event, "caller-unique-id"), + switch_event_get_header_nil(event, "Other-Leg-caller-id-name"), + switch_event_get_header_nil(event, "Other-Leg-caller-id-number"), + switch_event_get_header_nil(event, "Other-Leg-destination-number"), + switch_event_get_header_nil(event, "Other-Leg-channel-name"), switch_event_get_header_nil(event, "Other-Leg-unique-id") ); break; case SWITCH_EVENT_CHANNEL_UNBRIDGE: - sql = switch_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header(event, "caller-unique-id")); + sql = switch_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header_nil(event, "caller-unique-id")); break; case SWITCH_EVENT_SHUTDOWN: sql = switch_mprintf("delete from channels;delete from interfaces;delete from calls"); @@ -332,10 +338,10 @@ return; case SWITCH_EVENT_MODULE_LOAD: { - const char *type = switch_event_get_header(event, "type"); - const char *name = switch_event_get_header(event, "name"); - const char *description = switch_event_get_header(event, "description"); - const char *syntax = switch_event_get_header(event, "syntax"); + const char *type = switch_event_get_header_nil(event, "type"); + const char *name = switch_event_get_header_nil(event, "name"); + const char *description = switch_event_get_header_nil(event, "description"); + const char *syntax = switch_event_get_header_nil(event, "syntax"); if (!switch_strlen_zero(type) && !switch_strlen_zero(name)) { sql = switch_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", @@ -401,6 +407,8 @@ " dest VARCHAR(255),\n" " application VARCHAR(255),\n" " application_data VARCHAR(255),\n" + " dialplan VARCHAR(255),\n" + " context VARCHAR(255),\n" " read_codec VARCHAR(255),\n" " read_rate VARCHAR(255),\n" " write_codec VARCHAR(255),\n"

1 0

[Freeswitch-svn] [commit] r8275 - in freeswitch/trunk/conf/sip_profiles: default nat outbound
by Freeswitch SVN 06 May '08

06 May '08

Author: brian Date: Tue May 6 12:08:04 2008 New Revision: 8275 Modified: freeswitch/trunk/conf/sip_profiles/default/example.xml freeswitch/trunk/conf/sip_profiles/nat/example.xml freeswitch/trunk/conf/sip_profiles/outbound/example.xml Log: clarify Modified: freeswitch/trunk/conf/sip_profiles/default/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default/example.xml Tue May 6 12:08:04 2008 @@ -10,8 +10,6 @@    -  -     Modified: freeswitch/trunk/conf/sip_profiles/nat/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat/example.xml Tue May 6 12:08:04 2008 @@ -10,8 +10,6 @@    -  -     Modified: freeswitch/trunk/conf/sip_profiles/outbound/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound/example.xml Tue May 6 12:08:04 2008 @@ -10,8 +10,6 @@    -  -

1 0

[Freeswitch-svn] [commit] r8274 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 06 May '08

06 May '08

Author: mikej Date: Tue May 6 12:06:17 2008 New Revision: 8274 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Log: whoops Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Tue May 6 12:06:17 2008 @@ -43,7 +43,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_WIN32" UsePrecompiledHeader="0" DisableSpecificWarnings="4127, 4505" - EnablePREfast="true" + EnablePREfast="false" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[Freeswitch-svn] [commit] r8273 - freeswitch/trunk/src/mod/xml_int/mod_xml_ldap
by Freeswitch SVN 06 May '08

06 May '08

Author: stkn Date: Tue May 6 12:03:02 2008 New Revision: 8273 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Log: mod_xml_ldap: strip -std=c99 from CFLAGS during openldap build (fixes problems w/ arpa/nameser.h on linux) and stop building openldap server components Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Tue May 6 12:03:02 2008 @@ -8,7 +8,8 @@ LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic +DEFAULT_ARGS= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd +DEFAULT_ARGS+= --disable-slurpd --disable-relay --disable-bdb --disable-hdb LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) @@ -16,7 +17,7 @@ $(LDAP_DIR): $(GETLIB) $(LDAP).tgz - cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb --disable-slapd + cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR) cd $(LDAP_DIR) && $(MAKE)

1 0

[Freeswitch-svn] [commit] r8272 - freeswitch/trunk/scripts/contrib/jpalley
by Freeswitch SVN 06 May '08

06 May '08

Author: brian Date: Tue May 6 11:47:45 2008 New Revision: 8272 Added: freeswitch/trunk/scripts/contrib/jpalley/ Log: welcome to the jungle

1 0