-CS_NEW - Channel is newly created -CS_INIT - Channel has been initilized -CS_ROUTING - Channel is looking for an extension to execute -CS_SOFT_EXECUTE - Channel is ready to execute from 3rd party control -CS_EXECUTE - Channel is executing it's dialplan +CS_NEW - Channel is newly created. +CS_INIT - Channel has been initilized. +CS_ROUTING - Channel is looking for an extension to execute. +CS_SOFT_EXECUTE - Channel is ready to execute from 3rd party control. +CS_EXECUTE - Channel is executing it's dialplan. CS_EXCHANGE_MEDIA - Channel is exchanging media with another channel. CS_PARK - Channel is accepting media awaiting commands. CS_CONSUME_MEDIA - Channel is consuming all media and dropping it. -CS_HIBERNATE - Channel is in a sleep state -CS_RESET - Channel is in a reset state -CS_HANGUP - Channel is flagged for hangup and ready to end +CS_HIBERNATE - Channel is in a sleep state. +CS_RESET - Channel is in a reset state. +CS_HANGUP - Channel is flagged for hangup and ready to end. +CS_HANGUP - Channel is ready to collect call detail. CS_DONE - Channel is ready to be destroyed and out of the state machine

\n". @@ -28,16 +28,29 @@ die(); } -$db_user = $fsd->getDirUsersByDomainUidByUsername($db_domain['uid'], $user); -$db_user_settings = $fsd->getDirUser($db_user['uid']); +$db_domain_settings = $fsd->getDirDomain($db_domain['uid']); + + +$db_user = $fsd->getDirUsersByDomainUidByUsername($db_domain['uid'], $user); +$db_user_settings = $fsd->getDirUser($db_user['uid']); $db_groups = $fsd->getDirGroupsByDomianUidByUserUid($db_domain['uid'], $db_user['uid']); printf(" \n"); printf(" \n"); printf("

\n"); printf(" \n", $db_domain['name']); +printf(" \n"); +foreach($db_domain_settings['params'] as $db_params) { + printf(" \n", $db_params['name'], $db_params['value']); +} +printf(" \n"); +printf(" \n"); +foreach($db_domain_settings['variables'] as $db_variables) { + printf(" \n", $db_variables['name'], $db_variables['value']); +} +printf(" \n"); printf(" \n"); printf(" \n"); printf(" \n"); From anthm at freeswitch.org Sat Mar 21 22:15:17 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 00:15:17 -0500 Subject: [Freeswitch-svn] [commit] r12708 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Sun Mar 22 00:15:17 2009 New Revision: 12708 Log: clean up dialog stuff on presence for sla and other stuff 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_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c 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 Sun Mar 22 00:15:17 2009 @@ -2703,6 +2703,8 @@ 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(es), @@ -2902,6 +2904,8 @@ memset(&mod_sofia_globals, 0, sizeof(mod_sofia_globals)); mod_sofia_globals.destroy_private.destroy_nh = 1; + mod_sofia_globals.destroy_private.is_static = 1; + mod_sofia_globals.keep_private.is_static = 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 Sun Mar 22 00:15:17 2009 @@ -122,10 +122,12 @@ int destroy_nh; int destroy_me; int is_call; + int is_static; }; #define set_param(ptr,val) if (ptr) {free(ptr) ; ptr = NULL;} if (val) {ptr = strdup(val);} #define set_anchor(t,m) if (t->Anchor) {delete t->Anchor;} t->Anchor = new SipMessage(m); +#define sofia_private_free(_pvt) if (_pvt && ! _pvt->is_static) {free(_pvt); _pvt = NULL;} /* Local Structures */ /*************************************************************************************************************************************************************/ @@ -321,6 +323,7 @@ struct sofia_gateway { sofia_private_t *sofia_private; nua_handle_t *nh; + nua_handle_t *sub_nh; sofia_profile_t *profile; char *name; char *register_scheme; @@ -810,10 +813,12 @@ * SLA (shared line appearance) entrypoints */ -void sofia_sla_handle_register(nua_t *nua, sofia_profile_t *profile, sip_t const *sip); +void sofia_sla_handle_register(nua_t *nua, sofia_profile_t *profile, sip_t const *sip, long exptime, const char *full_contact); void sofia_sla_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); void sofia_sla_handle_sip_i_subscribe(nua_t *nua, const char *contact_str, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); -void sofia_sla_handle_sip_r_subscribe(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); +void sofia_sla_handle_sip_r_subscribe(int status, + 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_sla_handle_sip_i_notify(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]); /* 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 Sun Mar 22 00:15:17 2009 @@ -111,6 +111,7 @@ sofia_sla_handle_sip_i_notify(nua, profile, nh, sip, tags); if (sub_state == nua_substate_terminated) { + sofia_private_free(sofia_private); nua_handle_bind(nh, NULL); nua_handle_destroy(nh); } @@ -544,8 +545,7 @@ nua_handle_bind(nh, NULL); } sofia_private->destroy_me = 12; - free(sofia_private); - sofia_private = NULL; + sofia_private_free(sofia_private); } if (gateway) { @@ -4721,7 +4721,7 @@ } nua_handle_bind(nh, NULL); - free(sofia_private); + sofia_private_free(sofia_private); switch_core_session_destroy(&session); nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); } 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 Sun Mar 22 00:15:17 2009 @@ -3265,6 +3265,15 @@ " contact_str VARCHAR(255)\n" ");\n"; + char shared_appearance_dialogs_sql[] = + "CREATE TABLE sip_shared_appearance_dialogs (\n" + " profile_name VARCHAR(255),\n" + " hostname VARCHAR(255),\n" + " contact_str VARCHAR(255),\n" + " call_id VARCHAR(255),\n" + " expires INTEGER\n" + ");\n"; + if (profile->odbc_dsn) { #ifdef SWITCH_HAVE_ODBC int x; @@ -3298,6 +3307,13 @@ "create index ssa_subscriber on sip_shared_appearance_subscriptions (subscriber)", "create index ssa_profile_name on sip_shared_appearance_subscriptions (profile_name)", "create index ssa_aor on sip_shared_appearance_subscriptions (aor)", + + "create index ssd_profile_name on sip_shared_appearance_dialogs (profile_name)", + "create index ssd_hostname on sip_shared_appearance_dialogs (hostname)", + "create index ssd_contact_str on sip_shared_appearance_dialogs (contact_str)", + "create index ssd_call_id on sip_shared_appearance_dialogs (call_id)", + "create index ssd_expires on sip_shared_appearance_dialogs (expires)", + NULL }; @@ -3361,6 +3377,15 @@ } free(test_sql); + + test_sql = switch_mprintf("delete from sip_shared_appearance_dialogs where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); + if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { + switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_dialogs", NULL); + switch_odbc_handle_exec(profile->master_odbc, shared_appearance_dialogs_sql, NULL); + } + free(test_sql); + + for (x = 0; indexes[x]; x++) { switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL); } @@ -3402,6 +3427,10 @@ test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); free(test_sql); + + test_sql = switch_mprintf("delete from sip_shared_appearance_dialogs where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); + switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_dialogs", shared_appearance_dialogs_sql); + free(test_sql); switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", NULL, NULL, NULL); @@ -3412,6 +3441,18 @@ switch_core_db_exec(profile->master_db, "create index if not exists ssa_aor on sip_shared_appearance_subscriptions (aor)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssd_profile_name on sip_shared_appearance_dialogs (profile_name)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssd_hostname on sip_shared_appearance_dialogs (hostname)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssd_contact_str on sip_shared_appearance_dialogs (contact_str)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssd_call_id on sip_shared_appearance_dialogs (call_id)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssd_expires on sip_shared_appearance_dialogs (expires)", + NULL, NULL, NULL); + + switch_core_db_exec(profile->master_db, "create index if not exists sr_call_id on sip_registrations (call_id)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_sip_user on sip_registrations (sip_user)", NULL, NULL, NULL); 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 Sun Mar 22 00:15:17 2009 @@ -177,7 +177,7 @@ SIPTAG_FROM_STR(from), NUTAG_URL(contact), SIPTAG_TO_STR(clean_to), SIPTAG_CONTACT_STR(profile->url), TAG_END()); - + nua_handle_bind(msg_nh, &mod_sofia_globals.destroy_private); nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(body), TAG_END()); end: @@ -1827,7 +1827,7 @@ /* the following could possibly be refactored back towards the calling event handler in sofia.c XXX MTK */ if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { if (!strcasecmp(o->o_type, "dialog") && msg_params_find(o->o_params, "sla")) { - sofia_sla_handle_sip_r_subscribe(nua, profile, nh, sip, tags); + sofia_sla_handle_sip_r_subscribe(status, phrase, nua, profile, nh, sofia_private, sip, tags); return; } } @@ -1860,6 +1860,16 @@ default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "status (%d) != 200, updated state to SUB_STATE_FAILED.\n", status); gw_sub_ptr->state = SUB_STATE_FAILED; + + if (sofia_private) { + nua_handle_destroy(sofia_private->gateway->sub_nh); + sofia_private->gateway->sub_nh = NULL; + nua_handle_bind(sofia_private->gateway->sub_nh, NULL); + sofia_private_free(sofia_private); + } else { + nua_handle_destroy(nh); + } + break; } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Mar 22 00:15:17 2009 @@ -37,24 +37,54 @@ */ #include "mod_sofia.h" -static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg) +static void sofia_reg_new_handle(sofia_gateway_t *gateway_ptr) { + int ss_state = nua_callstate_authenticating; + if (gateway_ptr->nh) { - if (unreg) { - nua_unregister(gateway_ptr->nh, - NUTAG_URL(gateway_ptr->register_url), - SIPTAG_FROM_STR(gateway_ptr->register_from), - SIPTAG_TO_STR(gateway_ptr->register_from), - SIPTAG_CONTACT_STR(gateway_ptr->register_contact), - SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), - NUTAG_REGISTRAR(gateway_ptr->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); - } nua_handle_bind(gateway_ptr->nh, NULL); nua_handle_destroy(gateway_ptr->nh); gateway_ptr->nh = NULL; + sofia_private_free(gateway_ptr->sofia_private); } + gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, + SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), + NUTAG_URL(gateway_ptr->register_proxy), + SIPTAG_TO_STR(gateway_ptr->register_to), + NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()); + + + if (!gateway_ptr->sofia_private) { + gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); + switch_assert(gateway_ptr->sofia_private); + } + memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); + + gateway_ptr->sofia_private->gateway = gateway_ptr; + nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); +} + +static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr) +{ + + if (!gateway_ptr->nh) { + sofia_reg_new_handle(gateway_ptr); + + } + + if (gateway_ptr->nh) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "UN-Registering %s\n", gateway_ptr->name); + nua_unregister(gateway_ptr->nh, + NUTAG_URL(gateway_ptr->register_url), + SIPTAG_FROM_STR(gateway_ptr->register_from), + SIPTAG_TO_STR(gateway_ptr->register_from), + SIPTAG_CONTACT_STR(gateway_ptr->register_contact), + SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + } + } static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway) { @@ -71,10 +101,9 @@ sofia_gateway_t *gateway_ptr; for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { if (gateway_ptr->sofia_private) { - free(gateway_ptr->sofia_private); - gateway_ptr->sofia_private = NULL; + sofia_private_free(gateway_ptr->sofia_private); } - sofia_reg_kill_reg(gateway_ptr, 1); + sofia_reg_kill_reg(gateway_ptr); } } @@ -108,7 +137,7 @@ break; case SUB_STATE_UNSUBSCRIBE: gw_sub_ptr->state = SUB_STATE_NOSUB; - + /* not tested .. */ nua_unsubscribe(gateway_ptr->nh, NUTAG_URL(gateway_ptr->register_url), @@ -121,24 +150,23 @@ break; case SUB_STATE_UNSUBED: - if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, - NUTAG_URL(gateway_ptr->register_proxy), - SIPTAG_TO_STR(gateway_ptr->register_to), - NUTAG_CALLSTATE_REF(ss_state), - SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "subscribing to [%s] on gateway [%s]\n", gw_sub_ptr->event, gateway_ptr->name); - } + gateway_ptr->sub_nh = nua_handle(gateway_ptr->profile->nua, NULL, + NUTAG_URL(gateway_ptr->register_proxy), + SIPTAG_TO_STR(gateway_ptr->register_to), + NUTAG_CALLSTATE_REF(ss_state), + SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "subscribing to [%s] on gateway [%s]\n", gw_sub_ptr->event, gateway_ptr->name); gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); switch_assert(gateway_ptr->sofia_private); - + memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); gateway_ptr->sofia_private->gateway = gateway_ptr; nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); if (now) { - nua_subscribe(gateway_ptr->nh, + nua_subscribe(gateway_ptr->sub_nh, NUTAG_URL(gateway_ptr->register_url), SIPTAG_EVENT_STR(gw_sub_ptr->event), SIPTAG_ACCEPT_STR(gw_sub_ptr->content_type), @@ -149,7 +177,7 @@ TAG_NULL()); gw_sub_ptr->retry = now + gw_sub_ptr->retry_seconds; } else { - nua_unsubscribe(gateway_ptr->nh, + nua_unsubscribe(gateway_ptr->sub_nh, NUTAG_URL(gateway_ptr->register_url), SIPTAG_EVENT_STR(gw_sub_ptr->event), SIPTAG_ACCEPT_STR(gw_sub_ptr->content_type), @@ -207,7 +235,6 @@ } for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { - int ss_state = nua_callstate_authenticating; reg_state_t ostate = gateway_ptr->state; if (!now) { @@ -223,6 +250,7 @@ switch_assert(pvt); memset(pvt, 0, sizeof(*pvt)); pvt->destroy_nh = 1; + pvt->destroy_me = 1; switch_copy_string(pvt->gateway_name, gateway_ptr->name, sizeof(pvt->gateway_name)); nua_handle_bind(nh, pvt); @@ -254,64 +282,46 @@ break; case REG_STATE_UNREGISTER: - sofia_reg_kill_reg(gateway_ptr, 1); + sofia_reg_kill_reg(gateway_ptr); gateway_ptr->state = REG_STATE_NOREG; break; case REG_STATE_UNREGED: gateway_ptr->status = SOFIA_GATEWAY_DOWN; - sofia_reg_kill_reg(gateway_ptr, 0); - - if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, - SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), - NUTAG_URL(gateway_ptr->register_proxy), - SIPTAG_TO_STR(gateway_ptr->register_to), - NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name); - - if (!gateway_ptr->sofia_private) { - gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); - switch_assert(gateway_ptr->sofia_private); - } - memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); - gateway_ptr->sofia_private->gateway = gateway_ptr; - nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); - - if (now) { - nua_register(gateway_ptr->nh, - NUTAG_URL(gateway_ptr->register_url), - TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)), - SIPTAG_TO_STR(gateway_ptr->register_from), - SIPTAG_FROM_STR(gateway_ptr->register_from), - SIPTAG_CONTACT_STR(gateway_ptr->register_contact), - SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), - NUTAG_REGISTRAR(gateway_ptr->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); - gateway_ptr->retry = now + gateway_ptr->retry_seconds; - } else { - nua_unregister(gateway_ptr->nh, - NUTAG_URL(gateway_ptr->register_url), - SIPTAG_FROM_STR(gateway_ptr->register_from), - SIPTAG_TO_STR(gateway_ptr->register_from), - SIPTAG_CONTACT_STR(gateway_ptr->register_contact), - SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), - NUTAG_REGISTRAR(gateway_ptr->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); - } + sofia_reg_new_handle(gateway_ptr); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name); + + if (now) { + nua_register(gateway_ptr->nh, + NUTAG_URL(gateway_ptr->register_url), + TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)), + SIPTAG_TO_STR(gateway_ptr->register_from), + SIPTAG_FROM_STR(gateway_ptr->register_from), + SIPTAG_CONTACT_STR(gateway_ptr->register_contact), + SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); gateway_ptr->retry = now + gateway_ptr->retry_seconds; - gateway_ptr->state = REG_STATE_TRYING; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error registering %s failure #%d\n", gateway_ptr->name, ++gateway_ptr->failures); - gateway_ptr->state = REG_STATE_FAILED; + nua_unregister(gateway_ptr->nh, + NUTAG_URL(gateway_ptr->register_url), + SIPTAG_FROM_STR(gateway_ptr->register_from), + SIPTAG_TO_STR(gateway_ptr->register_from), + SIPTAG_CONTACT_STR(gateway_ptr->register_contact), + SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); } + gateway_ptr->retry = now + gateway_ptr->retry_seconds; + gateway_ptr->state = REG_STATE_TRYING; + break; case REG_STATE_FAILED: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Failed Registration, setting retry to %d seconds.\n", gateway_ptr->name, gateway_ptr->retry_seconds * (gateway_ptr->failures + 1)); gateway_ptr->retry = now + (gateway_ptr->retry_seconds * (gateway_ptr->failures + 1)); - sofia_reg_kill_reg(gateway_ptr, 0); gateway_ptr->status = SOFIA_GATEWAY_DOWN; gateway_ptr->state = REG_STATE_FAIL_WAIT; break; @@ -408,6 +418,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), @@ -422,6 +433,17 @@ switch_safe_free(id); } +int sofia_sla_dialog_del_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + sofia_profile_t *profile = (sofia_profile_t *) pArg; + nua_handle_t *nh = NULL; + + if ((nh = nua_handle_by_call_id(profile->nua, argv[0]))) { + nua_handle_destroy(nh); + } + + return 0; +} int sofia_reg_del_callback(void *pArg, int argc, char **argv, char **columnNames) { @@ -522,6 +544,21 @@ sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); + + if (now) { + switch_snprintf(sql, sizeof(sql), "select call_id from sip_shared_appearance_dialogs where hostname='%s' " + "and profile_name='%s' and expires <= %ld", + mod_sofia_globals.hostname, profile->name, (long) now); + + sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_sla_dialog_del_callback, profile); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and hostname='%s' and expires <= %ld", + mod_sofia_globals.hostname, (long) now); + + + sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); + } + + if (now) { switch_snprintf(sql, sizeof(sql), "delete from sip_presence where expires > 0 and expires <= %ld and hostname='%s'", (long) now, mod_sofia_globals.hostname); @@ -1018,7 +1055,7 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "user-agent", (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, reg_host); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "UNRegistered"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "Unregistered"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_fire(&event); } @@ -1112,7 +1149,11 @@ } if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { - sofia_sla_handle_register(nua, profile, sip); + char *full_contact = sip_header_as_string(nh->nh_home, (void *) sip->sip_contact); + if (full_contact && switch_stristr("SUBSCRIBE", full_contact)) { + sofia_sla_handle_register(nua, profile, sip, exptime, full_contact); + su_free(nh->nh_home, full_contact); + } } return 1; @@ -1275,6 +1316,23 @@ if (ostate != sofia_private->gateway->state) { sofia_reg_fire_custom_gateway_state_event(sofia_private->gateway); } + + + if (status >= 200) { + if (sofia_private) { + if (sofia_private->gateway) { + nua_handle_destroy(sofia_private->gateway->nh); + sofia_private->gateway->nh = NULL; + nua_handle_bind(sofia_private->gateway->nh, NULL); + sofia_private->gateway->sofia_private = NULL; + } else { + nua_handle_destroy(nh); + } + sofia_private_free(sofia_private); + } else { + nua_handle_destroy(nh); + } + } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c Sun Mar 22 00:15:17 2009 @@ -39,37 +39,81 @@ static int sofia_sla_sub_callback(void *pArg, int argc, char **argv, char **columnNames); -void sofia_sla_handle_register(nua_t *nua, sofia_profile_t *profile, sip_t const *sip) +struct sla_helper { + char call_id[1024]; +}; + + +static int get_call_id_callback(void *pArg, int argc, char **argv, char **columnNames) { - nua_handle_t *nh; + struct sla_helper *sh = (struct sla_helper *) pArg; - /* TODO: - * check to see if it says in the group or extension xml that we are handling SLA for this AOR - * check to see if we're already subscribed and the call-id in the subscribe matches. if so, - * we can skip this, which would keep us from re-subscribing which would also keep us from - * leaking so horribly much memory like we do now - */ + switch_set_string(sh->call_id, argv[0]); + + return 0; +} - nh = nua_handle(nua, NULL, NUTAG_URL(sip->sip_contact->m_url), TAG_NULL()); +char *strip_uri(const char *str) +{ + char *p; + char *r; - /* we make up and bind a sofia_private so that the existing event handler destruction code won't be confused by us */ - /* (though it isn't clear that this is sufficient... we still have break cases for nua_i_notify and nua_r_notify - * in sofia_event_callback's destruction end because if we don't, the handle gets destroyed. or maybe it is - * something else i'm doing wrong? MTK + if ((p = strchr(str, '<'))) { + p++; + r = strdup(p); + if ((p = strchr(r, '>'))) { + *p = '\0'; + } + } else { + r = strdup(str); + } - mod_sofia_globals.keep_private is a magic static private things can share for this purpose: ACM - */ + return r; +} + +void sofia_sla_handle_register(nua_t *nua, sofia_profile_t *profile, sip_t const *sip, long exptime, const char *full_contact) +{ + nua_handle_t *nh = NULL; + char exp_str[256] = ""; + char my_contact[256] = ""; + char *sql; + struct sla_helper sh = { { 0 } }; + char *contact_str = strip_uri(full_contact); + + + sql = switch_mprintf("select call_id from sip_shared_appearance_dialogs where hostname='%q' and profile_name='%q' and contact_str='%q'", + mod_sofia_globals.hostname, profile->name, contact_str); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, get_call_id_callback, &sh); + + free(sql); + + if (*sh.call_id) { + if (!(nh = nua_handle_by_call_id(profile->nua, sh.call_id))) { + if ((sql = switch_mprintf("delete from sip_shared_appearance_dialogs where hostname='%q' and profile_name='%q' and contact_str='%q'", + mod_sofia_globals.hostname, profile->name, contact_str))) { + sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); + } + } + } + + if (!nh) { + nh = nua_handle(nua, NULL, NUTAG_URL(sip->sip_contact->m_url), TAG_NULL()); + } nua_handle_bind(nh, &mod_sofia_globals.keep_private); + switch_snprintf(exp_str, sizeof(exp_str), "%ld", exptime + 30); + switch_snprintf(my_contact, sizeof(my_contact), "%s;expires=%s", profile->sla_contact, exp_str); nua_subscribe(nh, - SIPTAG_TO(sip->sip_to), - SIPTAG_FROM(sip->sip_to), // ? - SIPTAG_CONTACT_STR(profile->sla_contact), - SIPTAG_EXPIRES_STR("3500"), /* ok, this is totally fake here XXX MTK */ - SIPTAG_EVENT_STR("dialog;sla"), /* some phones want ;include-session-description too? */ - TAG_NULL()); + SIPTAG_TO(sip->sip_to), + SIPTAG_FROM(sip->sip_to), // ? + SIPTAG_CONTACT_STR(my_contact), + SIPTAG_EXPIRES_STR(exp_str), + SIPTAG_EVENT_STR("dialog;sla"), /* some phones want ;include-session-description too? */ + TAG_NULL()); + + free(contact_str); } void sofia_sla_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]) @@ -165,9 +209,32 @@ char *payload; }; -void sofia_sla_handle_sip_r_subscribe(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]) +void sofia_sla_handle_sip_r_subscribe(int status, + 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[]) { - /* apparently, we do nothing */ + if (status >= 300) { + nua_handle_destroy(nh); + sofia_private_free(sofia_private); + } else { + char *full_contact = sip_header_as_string(nh->nh_home, (void *) sip->sip_contact); + time_t expires = switch_epoch_time_now(NULL); + char *sql; + char *contact_str = strip_uri(full_contact); + + if (sip && sip->sip_expires) { + expires += sip->sip_expires->ex_delta + 30; + } + + if ((sql = switch_mprintf("insert into sip_shared_appearance_dialogs (profile_name, hostname, contact_str, call_id, expires) " + "values ('%q','%q','%q','%q','%ld')", + profile->name, mod_sofia_globals.hostname, contact_str, sip->sip_call_id->i_id, (long)expires))) { + sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); + } + + free(contact_str); + } + } void sofia_sla_handle_sip_i_notify(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, tagi_t tags[]) From brian at freeswitch.org Sun Mar 22 08:50:34 2009 From: brian at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 10:50:34 -0500 Subject: [Freeswitch-svn] [commit] r12709 - freeswitch/trunk/src Message-ID: Author: brian Date: Sun Mar 22 10:50:34 2009 New Revision: 12709 Log: fix ilbc snafu Modified: freeswitch/trunk/src/switch_core_codec.c Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Sun Mar 22 10:50:34 2009 @@ -437,7 +437,7 @@ return SWITCH_STATUS_GENERR; } - if (!strcasecmp(codec_name, "ilbc") && mode && strncasecmp(mode, "mode=", 5)) { + if (!strcasecmp(codec_name, "ilbc") && mode && !strncasecmp(mode, "mode=", 5)) { int mms; mode += 5; if (mode) { From mikej at freeswitch.org Sun Mar 22 09:53:29 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 11:53:29 -0500 Subject: [Freeswitch-svn] [commit] r12710 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc Message-ID: Author: mikej Date: Sun Mar 22 11:53:29 2009 New Revision: 12710 Log: remove unused vars Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sun Mar 22 11:53:29 2009 @@ -721,7 +721,7 @@ char *command = NULL, *arg = NULL; switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; - const char *x_command = "bgapi", x_arg= "unload mod_xml_rpc"; +// const char *x_command = "bgapi", x_arg = "unload mod_xml_rpc"; switch_bool_t freed = 0; From mikej at freeswitch.org Sun Mar 22 09:54:45 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 11:54:45 -0500 Subject: [Freeswitch-svn] [commit] r12711 - freeswitch/trunk/w32/Library Message-ID: Author: mikej Date: Sun Mar 22 11:54:45 2009 New Revision: 12711 Log: turn off code analysis for now Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Sun Mar 22 11:54:45 2009 @@ -60,7 +60,7 @@ WarnAsError="true" DebugInformationFormat="3" ForcedIncludeFiles="" - EnablePREfast="$(EnablePREfast)" + EnablePREfast="false" /> Author: mikej Date: Sun Mar 22 12:27:28 2009 New Revision: 12712 Log: tweak Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sun Mar 22 12:27:28 2009 @@ -721,7 +721,6 @@ char *command = NULL, *arg = NULL; switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; -// const char *x_command = "bgapi", x_arg = "unload mod_xml_rpc"; switch_bool_t freed = 0; From anthm at freeswitch.org Sun Mar 22 11:23:25 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 13:23:25 -0500 Subject: [Freeswitch-svn] [commit] r12713 - freeswitch/trunk/src/mod/languages/mod_lua Message-ID: Author: anthm Date: Sun Mar 22 13:23:24 2009 New Revision: 12713 Log: tweak lua hangup hook Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 13:23:24 2009 @@ -133,10 +133,18 @@ CoreSession *coresession = NULL; switch_channel_state_t state = switch_channel_get_state(channel); - if ((coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"))) { - if (coresession->hook_state != state) { + if (session_hungup) { + + channel = switch_core_session_get_channel(session_hungup); + + if (channel) { + coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"); + } + + if (coresession && coresession->allocated && (state == CS_HANGUP || state == CS_ROUTING) && coresession->hook_state != state) { coresession->hook_state = state; coresession->check_hangup_hook(); + switch_core_event_hook_remove_state_change(session_hungup, lua_hanguphook); } } From anthm at freeswitch.org Sun Mar 22 11:35:55 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 13:35:55 -0500 Subject: [Freeswitch-svn] [commit] r12714 - freeswitch/trunk/src/mod/languages/mod_lua Message-ID: Author: anthm Date: Sun Mar 22 13:35:55 2009 New Revision: 12714 Log: tweak lua hangup hook (part 2) Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 13:35:55 2009 @@ -24,6 +24,10 @@ Session::~Session() { + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + if (hangup_func_str) { if (session) { switch_core_event_hook_remove_state_change(session, lua_hanguphook); @@ -141,6 +145,10 @@ coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"); } + if (!(coresession && coresession->hook_state)) { + return SWITCH_STATUS_FALSE; + } + if (coresession && coresession->allocated && (state == CS_HANGUP || state == CS_ROUTING) && coresession->hook_state != state) { coresession->hook_state = state; coresession->check_hangup_hook(); From anthm at freeswitch.org Sun Mar 22 13:04:56 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 15:04:56 -0500 Subject: [Freeswitch-svn] [commit] r12715 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Sun Mar 22 15:04:56 2009 New Revision: 12715 Log: fix reg issue Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Sun Mar 22 15:04:56 2009 @@ -89,7 +89,10 @@ private_object_t *tech_pvt = NULL; switch_event_t *s_event = NULL; sofia_gateway_subscription_t *gw_sub_ptr; + int sub_state; + tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END()); + /* make sure we have a proper event */ if (!sip || !sip->sip_event) { goto error; @@ -105,18 +108,8 @@ if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { if (sip->sip_request->rq_url->url_user && !strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { - int sub_state; - tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END()); - sofia_sla_handle_sip_i_notify(nua, profile, nh, sip, tags); - - if (sub_state == nua_substate_terminated) { - sofia_private_free(sofia_private); - nua_handle_bind(nh, NULL); - nua_handle_destroy(nh); - } - - return; + goto end; } } @@ -124,7 +117,7 @@ if (!strcasecmp(sip->sip_event->o_type, "keep-alive")) { /* XXX MTK - is this right? in this case isn't sofia is already sending a 200 itself also? */ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - return; + goto end; } if (session) { @@ -214,7 +207,7 @@ switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); switch_ivr_session_transfer(session, "auto_answer", NULL, NULL); nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - return; + goto end; } } @@ -257,11 +250,20 @@ goto error; } - return; + goto end; error: + nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); - return; + + end: + + if (sub_state == nua_substate_terminated) { + sofia_private_free(sofia_private); + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); + } + } void sofia_handle_sip_i_bye(switch_core_session_t *session, int status, @@ -425,7 +427,6 @@ switch (event) { case nua_r_get_params: - case nua_r_unregister: case nua_i_fork: case nua_r_info: case nua_r_bye: @@ -463,6 +464,7 @@ sofia_handle_sip_i_notify(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_r_register: + case nua_r_unregister: sofia_reg_handle_sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_i_options: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Mar 22 15:04:56 2009 @@ -37,7 +37,7 @@ */ #include "mod_sofia.h" -static void sofia_reg_new_handle(sofia_gateway_t *gateway_ptr) +static void sofia_reg_new_handle(sofia_gateway_t *gateway_ptr, int attach) { int ss_state = nua_callstate_authenticating; @@ -54,23 +54,23 @@ SIPTAG_TO_STR(gateway_ptr->register_to), NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()); - - if (!gateway_ptr->sofia_private) { - gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); - switch_assert(gateway_ptr->sofia_private); - } - memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); + if (attach) { + if (!gateway_ptr->sofia_private) { + gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); + switch_assert(gateway_ptr->sofia_private); + } + memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); - gateway_ptr->sofia_private->gateway = gateway_ptr; - nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); + gateway_ptr->sofia_private->gateway = gateway_ptr; + nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); + } } static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr) { if (!gateway_ptr->nh) { - sofia_reg_new_handle(gateway_ptr); - + sofia_reg_new_handle(gateway_ptr, SWITCH_FALSE); } if (gateway_ptr->nh) { @@ -80,7 +80,7 @@ SIPTAG_FROM_STR(gateway_ptr->register_from), SIPTAG_TO_STR(gateway_ptr->register_from), SIPTAG_CONTACT_STR(gateway_ptr->register_contact), - SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), + SIPTAG_EXPIRES_STR("0"), NUTAG_REGISTRAR(gateway_ptr->register_proxy), NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); } @@ -100,10 +100,13 @@ { sofia_gateway_t *gateway_ptr; for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { + if (gateway_ptr->sofia_private) { sofia_private_free(gateway_ptr->sofia_private); } + sofia_reg_kill_reg(gateway_ptr); + } } @@ -288,7 +291,7 @@ case REG_STATE_UNREGED: gateway_ptr->status = SOFIA_GATEWAY_DOWN; - sofia_reg_new_handle(gateway_ptr); + sofia_reg_new_handle(gateway_ptr, now ? 1 : 0); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name); @@ -1318,7 +1321,7 @@ } - if (status >= 200) { + if (status >= 300) { if (sofia_private) { if (sofia_private->gateway) { nua_handle_destroy(sofia_private->gateway->nh); From anthm at freeswitch.org Sun Mar 22 13:52:41 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 15:52:41 -0500 Subject: [Freeswitch-svn] [commit] r12716 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Sun Mar 22 15:52:41 2009 New Revision: 12716 Log: fix killgw Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Sun Mar 22 15:52:41 2009 @@ -430,6 +430,7 @@ case nua_i_fork: case nua_r_info: case nua_r_bye: + case nua_r_unregister: case nua_r_unsubscribe: case nua_r_publish: case nua_i_cancel: @@ -464,7 +465,6 @@ sofia_handle_sip_i_notify(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_r_register: - case nua_r_unregister: sofia_reg_handle_sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_i_options: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Mar 22 15:52:41 2009 @@ -50,10 +50,8 @@ gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), - NUTAG_URL(gateway_ptr->register_proxy), SIPTAG_TO_STR(gateway_ptr->register_to), NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()); - if (attach) { if (!gateway_ptr->sofia_private) { gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); @@ -77,12 +75,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "UN-Registering %s\n", gateway_ptr->name); nua_unregister(gateway_ptr->nh, NUTAG_URL(gateway_ptr->register_url), - SIPTAG_FROM_STR(gateway_ptr->register_from), - SIPTAG_TO_STR(gateway_ptr->register_from), SIPTAG_CONTACT_STR(gateway_ptr->register_contact), - SIPTAG_EXPIRES_STR("0"), - NUTAG_REGISTRAR(gateway_ptr->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + TAG_END()); } } From anthm at freeswitch.org Sun Mar 22 14:19:25 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 16:19:25 -0500 Subject: [Freeswitch-svn] [commit] r12717 - freeswitch/trunk/src/mod/languages/mod_lua Message-ID: Author: anthm Date: Sun Mar 22 16:19:25 2009 New Revision: 12717 Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 16:19:25 2009 @@ -134,7 +134,7 @@ static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup) { switch_channel_t *channel = switch_core_session_get_channel(session_hungup); - CoreSession *coresession = NULL; + Session *coresession = NULL; switch_channel_state_t state = switch_channel_get_state(channel); if (session_hungup) { @@ -142,7 +142,7 @@ channel = switch_core_session_get_channel(session_hungup); if (channel) { - coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"); + coresession = (Session *) switch_channel_get_private(channel, "CoreSession"); } if (!(coresession && coresession->hook_state)) { From anthm at freeswitch.org Sun Mar 22 14:32:08 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 16:32:08 -0500 Subject: [Freeswitch-svn] [commit] r12718 - in freeswitch/trunk/src: . mod/languages/mod_lua Message-ID: Author: anthm Date: Sun Mar 22 16:32:08 2009 New Revision: 12718 Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 16:32:08 2009 @@ -32,7 +32,7 @@ if (session) { switch_core_event_hook_remove_state_change(session, lua_hanguphook); } - free(hangup_func_str); + switch_safe_free(hangup_func_str); } switch_safe_free(hangup_func_arg); @@ -128,6 +128,16 @@ if (!switch_strlen_zero(err)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", err); } + + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + + if (session) { + switch_core_event_hook_remove_state_change(session, lua_hanguphook); + } + switch_safe_free(hangup_func_str); + } } @@ -142,7 +152,10 @@ channel = switch_core_session_get_channel(session_hungup); if (channel) { - coresession = (Session *) switch_channel_get_private(channel, "CoreSession"); + void *vs = switch_channel_get_private(channel, "CoreSession"); + if (vs) { + coresession = (Session *) vs; + } } if (!(coresession && coresession->hook_state)) { Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Sun Mar 22 16:32:08 2009 @@ -888,6 +888,10 @@ { this_check_void(); + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + switch_safe_free(xml_cdr_text); switch_safe_free(uuid); switch_safe_free(tts_name); From silik0n at freeswitch.org Sun Mar 22 16:31:49 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 18:31:49 -0500 Subject: [Freeswitch-svn] [commit] r12719 - freeswitch/trunk/scripts/contrib/swk/php/amfphp Message-ID: Author: silik0n Date: Sun Mar 22 18:31:49 2009 New Revision: 12719 Log: ok really fix this crap Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Sun Mar 22 18:31:49 2009 @@ -38,41 +38,39 @@ require_once "ESL.php"; class FreeSWITCH { + + /* Edit these variables for your installation */ + var $esl_server = "127.0.0.1"; /* ESL Server */ + var $esl_port = "8021"; /* ESL Port */ + var $esl_secret = "ClueCon"; /* ESL Secret */ + + var $dbtype='mysql'; /* Set the Database type */ + var $db_hostname = '192.168.1.140'; /* Database Server hostname */ + var $db_port = '3306'; /* Database Server Port */ + var $db_username = 'root'; /* Database Server username */ + var $db_password = 'password'; /* Database Server password */ + var $db_database = 'shipment'; /* DataBase Name */ private function getDbh(){ - $dbtype='mysql'; /* Set the Database type */ - // $db_hostname = 'localhost'; /* Database Server hostname */ - $db_hostname = '192.168.1.140'; /* Database Server hostname */ - $db_port = '3306'; /* Database Server Port */ - $db_username = 'root'; /* Database Server username */ - $db_password = 'password'; /* Database Server password */ - $db_database = 'shipment'; /* DataBase Name */ - if ($dbtype == 'mysql') { + if ($this->dbtype == 'mysql') { $pdo_flags = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,); } - $dbh = new PDO("$dbtype:host=$db_hostname;port=$db_port;dbname=$db_database", $db_username, $db_password, $pdo_flags); + $dbh = new PDO($this->dbtype . ":host=" . $this->db_hostname . ";port=" . $this->db_port . ";dbname=" . $this->db_database, + $this->db_username, $this->db_password, $pdo_flags); return $dbh; } - private function getEsl(){ - $esl_server = "127.0.0.1"; /* ESL Server */ - $esl_port = "8021"; /* ESL Port */ - $esl_secret = "ClueCon"; /* ESL Secret */ - $esl = new eslConnection($esl_server, $esl_port, $esl_secret); - return $esl; - } - /*** General Whats happening Methods ***/ public function getStatus() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_ser"ver, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api status"); $body = $e->getBody(); return $body; } public function getChannels() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api show channels"); $body = $e->getBody(); $temp = explode ("\n", $body); @@ -102,7 +100,7 @@ } public function getCalls() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api show calls"); $body = $e->getBody(); $temp = explode ("\n", $body); @@ -131,14 +129,14 @@ public function originate($call_url, $exten, $dialplan = "XML", $context= "default", $cid_name = "amf_php", $cid_number = "888", $timeout="30"){ $dialstring = "api originate $call_url $exten $dialplan $context $cid_name $cid_number $timeout"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($dialstring); $body = $e->getBody(); return $body; } public function killUuid($uuid) { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api uuid_kill $uuid"); $body = $e->getBody(); return $body; @@ -147,14 +145,14 @@ /*** Conference Methods ***/ public function kickConferenceUser($conference, $member) { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api conference $conference kick $member"); $body = $e->getBody(); return $body; } public function getConferenceList() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api conference list"); $body = $e->getBody(); $data=explode("\n", $body); @@ -170,7 +168,7 @@ } public function getConferenceUsers($conference_name) { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api conference $conference_name list"); $body = $e->getBody(); $data=explode("\n", $body); @@ -225,7 +223,7 @@ public function confPlayfile($conference, $file_path){ $playfile = "api conference $conference play " . $file_path; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -233,7 +231,7 @@ public function confLock($conference){ $playfile = "api conference $conference lock"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -241,7 +239,7 @@ public function confUnlock($conference){ $playfile = "api conference $conference unlock"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -249,7 +247,7 @@ public function confMute($conference, $member){ $playfile = "api conference $conference mute $member"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -257,7 +255,7 @@ public function confUnmute($conference, $member){ $playfile = "api conference $conference unmute $member"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; From anthm at freeswitch.org Sun Mar 22 18:59:36 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Sun, 22 Mar 2009 20:59:36 -0500 Subject: [Freeswitch-svn] [commit] r12720 - freeswitch/trunk/src Message-ID: Author: anthm Date: Sun Mar 22 20:59:35 2009 New Revision: 12720 Log: make gaussian noise less noisy FSCORE-340 Modified: freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Mar 22 20:59:35 2009 @@ -1871,7 +1871,7 @@ silence = ringback.silence; } } else { - silence = 400; + silence = 600; } if ((ringback.fh || silence || ringback.audio_buffer) && write_frame.codec && write_frame.datalen) { Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sun Mar 22 20:59:35 2009 @@ -181,24 +181,22 @@ } } -#if SILENCE_METHOD_ONE +#if 1 SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) { int16_t x; uint32_t i; int sum_rnd = 0; - int16_t rnd2 = (int16_t) switch_micro_time_now(); + int16_t rnd2 = (int16_t) switch_micro_time_now() + (int16_t) (intptr_t) data; assert(divisor); - - for (i = 0; i < samples; i++, sum_rnd = 0) { for (x = 0; x < 6; x++) { rnd2 = rnd2 * 31821U + 13849U; - sum_rnd += rnd2; + sum_rnd += rnd2 ; } - switch_normalize_to_16bit(sum_rnd); + //switch_normalize_to_16bit(sum_rnd); *data = (int16_t) ((int16_t) sum_rnd / (int) divisor); data++; From rupa at freeswitch.org Mon Mar 23 08:34:46 2009 From: rupa at freeswitch.org (FreeSWITCH SVN) Date: Mon, 23 Mar 2009 10:34:46 -0500 Subject: [Freeswitch-svn] [commit] r12721 - freeswitch/trunk/src/mod/applications/mod_lcr Message-ID: Author: rupa Date: Mon Mar 23 10:34:46 2009 New Revision: 12721 Log: don't leak Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Mon Mar 23 10:34:46 2009 @@ -563,6 +563,8 @@ /* format the custom_sql */ safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy); if (!safe_sql) { + switch_event_safe_destroy(&cb_struct->event); + switch_core_hash_destroy(&cb_struct->dedup_hash); return SWITCH_STATUS_GENERR; } SWITCH_STANDARD_STREAM(sql_stream); @@ -577,6 +579,7 @@ lookup_status = lcr_execute_sql_callback((char *)sql_stream.data, route_add_callback, cb_struct); switch_safe_free(sql_stream.data); + switch_event_safe_destroy(&cb_struct->event); switch_core_hash_destroy(&cb_struct->dedup_hash); if (lookup_status) { From anthm at freeswitch.org Mon Mar 23 09:06:32 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Mon, 23 Mar 2009 11:06:32 -0500 Subject: [Freeswitch-svn] [commit] r12722 - in freeswitch/trunk/src: . include mod/applications/mod_fifo Message-ID: Author: anthm Date: Mon Mar 23 11:06:32 2009 New Revision: 12722 Log: add import vars to fifo Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon Mar 23 11:06:32 2009 @@ -550,10 +550,10 @@ /******************************************************************************************************/ - struct switch_ivr_digit_stream_parser; - typedef struct switch_ivr_digit_stream_parser switch_ivr_digit_stream_parser_t; - struct switch_ivr_digit_stream; - typedef struct switch_ivr_digit_stream switch_ivr_digit_stream_t; +struct switch_ivr_digit_stream_parser; +typedef struct switch_ivr_digit_stream_parser switch_ivr_digit_stream_parser_t; +struct switch_ivr_digit_stream; +typedef struct switch_ivr_digit_stream switch_ivr_digit_stream_t; /*! \brief Create a digit stream parser object \param pool the pool to use for the new hash @@ -639,25 +639,25 @@ * @{ */ - typedef enum { - SWITCH_IVR_MENU_FLAG_FALLTOMAIN = (1 << 0), - SWITCH_IVR_MENU_FLAG_FREEPOOL = (1 << 1), - SWITCH_IVR_MENU_FLAG_STACK = (1 << 2) - } switch_ivr_menu_flags; +typedef enum { + SWITCH_IVR_MENU_FLAG_FALLTOMAIN = (1 << 0), + SWITCH_IVR_MENU_FLAG_FREEPOOL = (1 << 1), + SWITCH_IVR_MENU_FLAG_STACK = (1 << 2) +} switch_ivr_menu_flags; /* Actions are either set in switch_ivr_menu_bind_function or returned by a callback */ - typedef enum { - SWITCH_IVR_ACTION_DIE, /* Exit the menu. */ - SWITCH_IVR_ACTION_EXECMENU, /* Goto another menu in the stack. */ - SWITCH_IVR_ACTION_EXECAPP, /* Execute an application. */ - SWITCH_IVR_ACTION_PLAYSOUND, /* Play a sound. */ - SWITCH_IVR_ACTION_BACK, /* Go back 1 menu. */ - SWITCH_IVR_ACTION_TOMAIN, /* Go back to the top level menu. */ - SWITCH_IVR_ACTION_NOOP /* No operation */ - } switch_ivr_action_t; - struct switch_ivr_menu; - typedef switch_ivr_action_t switch_ivr_menu_action_function_t (struct switch_ivr_menu *, char *, char *, size_t, void *); - typedef struct switch_ivr_menu switch_ivr_menu_t; - typedef struct switch_ivr_menu_action switch_ivr_menu_action_t; +typedef enum { + SWITCH_IVR_ACTION_DIE, /* Exit the menu. */ + SWITCH_IVR_ACTION_EXECMENU, /* Goto another menu in the stack. */ + SWITCH_IVR_ACTION_EXECAPP, /* Execute an application. */ + SWITCH_IVR_ACTION_PLAYSOUND, /* Play a sound. */ + SWITCH_IVR_ACTION_BACK, /* Go back 1 menu. */ + SWITCH_IVR_ACTION_TOMAIN, /* Go back to the top level menu. */ + SWITCH_IVR_ACTION_NOOP /* No operation */ +} switch_ivr_action_t; +struct switch_ivr_menu; +typedef switch_ivr_action_t switch_ivr_menu_action_function_t (struct switch_ivr_menu *, char *, char *, size_t, void *); +typedef struct switch_ivr_menu switch_ivr_menu_t; +typedef struct switch_ivr_menu_action switch_ivr_menu_action_t; /******************************************************************************************************/ /*! @@ -682,20 +682,20 @@ *\return SWITCH_STATUS_SUCCESS if the menu was created. */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_menu, - switch_ivr_menu_t *main, - const char *name, - const char *greeting_sound, - const char *short_greeting_sound, - const char *invalid_sound, - const char *exit_sound, - const char *confirm_macro, - const char *confirm_key, - const char *tts_engine, - const char *tts_voice, - int confirm_attempts, - int inter_timeout, int digit_len, int timeout, int max_failures, - int max_timeouts, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_menu, + switch_ivr_menu_t *main, + const char *name, + const char *greeting_sound, + const char *short_greeting_sound, + const char *invalid_sound, + const char *exit_sound, + const char *confirm_macro, + const char *confirm_key, + const char *tts_engine, + const char *tts_voice, + int confirm_attempts, + int inter_timeout, int digit_len, int timeout, int max_failures, + int max_timeouts, switch_memory_pool_t *pool); /*! *\brief switch_ivr_menu_bind_action: Bind a keystroke to an action. @@ -705,8 +705,8 @@ *\param bind KeyStrokes to bind the action to. *\return SWUTCH_STATUS_SUCCESS if the action was binded */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_action(switch_ivr_menu_t *menu, switch_ivr_action_t ivr_action, const char *arg, - const char *bind); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_action(switch_ivr_menu_t *menu, switch_ivr_action_t ivr_action, const char *arg, + const char *bind); /*! @@ -720,8 +720,8 @@ *\note The function returns an switch_ivr_action_t enum of what you want to do. and looks to your buffer for args. *\return SWUTCH_STATUS_SUCCESS if the function was binded */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_function(switch_ivr_menu_t *menu, - switch_ivr_menu_action_function_t *function, const char *arg, const char *bind); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_function(switch_ivr_menu_t *menu, + switch_ivr_menu_action_function_t *function, const char *arg, const char *bind); /*! @@ -732,17 +732,17 @@ *\param obj A void pointer to an object you want to make avaliable to your callback functions that you may have binded with switch_ivr_menu_bind_function. *\return SWITCH_STATUS_SUCCESS if all is well */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *session, switch_ivr_menu_t *stack, char *name, void *obj); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *session, switch_ivr_menu_t *stack, char *name, void *obj); /*! *\brief free a stack of menu objects. *\param stack The top level menu you wish to destroy. *\return SWITCH_STATUS_SUCCESS if the object was a top level menu and it was freed */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_free(switch_ivr_menu_t *stack); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_free(switch_ivr_menu_t *stack); - struct switch_ivr_menu_xml_ctx; - typedef struct switch_ivr_menu_xml_ctx switch_ivr_menu_xml_ctx_t; +struct switch_ivr_menu_xml_ctx; +typedef struct switch_ivr_menu_xml_ctx switch_ivr_menu_xml_ctx_t; /*! *\brief Build a menu stack from an xml source *\param xml_menu_ctx The XML menu parser context previously created by switch_ivr_menu_stack_xml_init @@ -751,10 +751,10 @@ *\param xml_menu The xml Menu source of the menu to be created *\return SWITCH_STATUS_SUCCESS if all is well */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, - switch_ivr_menu_t **menu_stack, switch_xml_t xml_menus, switch_xml_t xml_menu); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, + switch_ivr_menu_t **menu_stack, switch_xml_t xml_menus, switch_xml_t xml_menu); - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_str2action(const char *action_name, switch_ivr_action_t *action); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_str2action(const char *action_name, switch_ivr_action_t *action); /*! *\param xml_menu_ctx The XML menu parser context previously created by switch_ivr_menu_stack_xml_init @@ -762,46 +762,47 @@ *\param function The menu function callback that will be executed when menu digits are bound to this name *\return SWITCH_STATUS_SUCCESS if all is well */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_add_custom(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, - const char *name, switch_ivr_menu_action_function_t *function); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_add_custom(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, + const char *name, switch_ivr_menu_action_function_t *function); /*! *\param xml_menu_ctx A pointer of a XML menu parser context to be created *\param pool memory pool (NULL to create one) *\return SWITCH_STATUS_SUCCESS if all is well */ - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_init(switch_ivr_menu_xml_ctx_t **xml_menu_ctx, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_init(switch_ivr_menu_xml_ctx_t **xml_menu_ctx, switch_memory_pool_t *pool); - SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang, - switch_input_args_t *args); - SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms); - SWITCH_DECLARE(switch_status_t) switch_ivr_find_bridged_uuid(const char *uuid, char *b_uuid, switch_size_t blen); - SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg); - SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session); - SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t *session, switch_core_session_t *peer_session); - - SWITCH_DECLARE(switch_status_t) switch_ivr_read(switch_core_session_t *session, - uint32_t min_digits, - uint32_t max_digits, - const char *prompt_audio_file, - const char *var_name, - char *digit_buffer, - switch_size_t digit_buffer_length, uint32_t timeout, const char *valid_terminators); - - SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, - switch_bind_flag_t bind_flags, const char *app); - SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session, uint32_t key); - SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *session, const char *unhold_key, const char *moh_a, const char *moh_b); - SWITCH_DECLARE(switch_status_t) switch_ivr_say(switch_core_session_t *session, const char *tosay, const char *module_name, const char *say_type, - const char *say_method, switch_input_args_t *args); - - SWITCH_DECLARE(switch_say_method_t) switch_ivr_get_say_method_by_name(const char *name); - SWITCH_DECLARE(switch_say_type_t) switch_ivr_get_say_type_by_name(const char *name); - SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data); - SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_ivr_phrase_macro(switch_core_session_t *session, const char *macro_name, const char *data, const char *lang, + switch_input_args_t *args); +SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms); +SWITCH_DECLARE(switch_status_t) switch_ivr_find_bridged_uuid(const char *uuid, char *b_uuid, switch_size_t blen); +SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg); +SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t *session, switch_core_session_t *peer_session); + +SWITCH_DECLARE(switch_status_t) switch_ivr_read(switch_core_session_t *session, + uint32_t min_digits, + uint32_t max_digits, + const char *prompt_audio_file, + const char *var_name, + char *digit_buffer, + switch_size_t digit_buffer_length, uint32_t timeout, const char *valid_terminators); + +SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, + switch_bind_flag_t bind_flags, const char *app); +SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session, uint32_t key); +SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *session, const char *unhold_key, const char *moh_a, const char *moh_b); +SWITCH_DECLARE(switch_status_t) switch_ivr_say(switch_core_session_t *session, const char *tosay, const char *module_name, const char *say_type, + const char *say_method, switch_input_args_t *args); + +SWITCH_DECLARE(switch_say_method_t) switch_ivr_get_say_method_by_name(const char *name); +SWITCH_DECLARE(switch_say_type_t) switch_ivr_get_say_type_by_name(const char *name); +SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data); +SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session); +SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname); /** @} */ - SWITCH_END_EXTERN_C +SWITCH_END_EXTERN_C #endif /* For Emacs: * Local Variables: 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 Mon Mar 23 11:06:32 2009 @@ -1253,6 +1253,8 @@ switch_core_media_bug_resume(session); switch_core_media_bug_resume(other_session); + switch_process_import(session, other_channel, "fifo_caller_consumer_import"); + switch_process_import(other_session, channel, "fifo_consumer_caller_import"); switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); switch_core_media_bug_pause(session); switch_core_media_bug_pause(other_session); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Mar 23 11:06:32 2009 @@ -841,7 +841,7 @@ return (!caller_channel || switch_channel_ready(caller_channel)) ? status : SWITCH_STATUS_FALSE; } -static void process_import(switch_core_session_t *session, switch_channel_t *peer_channel) +SWITCH_DECLARE(void) switch_process_import(switch_core_session_t *session, switch_channel_t *peer_channel, const char *varname) { const char *import, *val; switch_channel_t *caller_channel; @@ -849,7 +849,7 @@ switch_assert(session && peer_channel); caller_channel = switch_core_session_get_channel(session); - if ((import = switch_channel_get_variable(caller_channel, "import"))) { + if ((import = switch_channel_get_variable(caller_channel, varname))) { char *mydata = switch_core_session_strdup(session, import); int i, argc; char *argv[64] = { 0 }; @@ -1956,7 +1956,7 @@ } else { status = SWITCH_STATUS_FALSE; if (caller_channel && peer_channel) { - process_import(oglobals.session, peer_channel); + switch_process_import(oglobals.session, peer_channel, "import"); } peer_channel = NULL; goto done; @@ -2007,7 +2007,7 @@ if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); if (peer_channel) { - process_import(oglobals.session, peer_channel); + switch_process_import(oglobals.session, peer_channel, "import"); } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); From anthm at freeswitch.org Mon Mar 23 12:53:57 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Mon, 23 Mar 2009 14:53:57 -0500 Subject: [Freeswitch-svn] [commit] r12723 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket Message-ID: Author: anthm Date: Mon Mar 23 14:53:57 2009 New Revision: 12723 Log: move connect command to always work on outbound socket not just the first time Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Mar 23 14:53:57 2009 @@ -1439,8 +1439,26 @@ } if (!strncasecmp(cmd, "connect", 7)) { - switch_snprintf(reply, reply_len, "+OK"); - goto done; + switch_event_t *call_event; + char *event_str; + switch_size_t len; + switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA); + + switch_caller_profile_event_set_data(switch_channel_get_caller_profile(channel), "Channel", call_event); + switch_channel_event_set_data(channel, call_event); + switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Content-Type", "command/reply"); + switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Reply-Text", "+OK\n"); + switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Socket-Mode", switch_test_flag(listener, LFLAG_ASYNC) ? "async" : "static"); + switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Control", switch_test_flag(listener, LFLAG_FULL) ? "full" : "single-channel"); + + switch_event_serialize(call_event, &event_str, SWITCH_TRUE); + switch_assert(event_str); + len = strlen(event_str); + switch_socket_send(listener->sock, event_str, &len); + switch_safe_free(event_str); + + //switch_snprintf(reply, reply_len, "+OK"); + goto done_noreply; } else if (!strncasecmp(cmd, "getvar", 6)) { char *arg; const char *val = ""; @@ -1966,10 +1984,8 @@ add_listener(listener); if (session && switch_test_flag(listener, LFLAG_AUTHED)) { - switch_event_t *ievent = NULL, *call_event; - char *event_str; - - + switch_event_t *ievent = NULL; + switch_set_flag_locked(listener, LFLAG_SESSION); status = read_packet(listener, &ievent, 25); @@ -1978,35 +1994,14 @@ switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done; } - - if (switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_clear_flag_locked(listener, LFLAG_RUNNING); - goto done; - } + if (parse_command(listener, &ievent, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done; } - switch_caller_profile_event_set_data(switch_channel_get_caller_profile(channel), "Channel", call_event); - switch_channel_event_set_data(channel, call_event); - switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Content-Type", "command/reply"); - switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Reply-Text", "+OK\n"); - switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Socket-Mode", switch_test_flag(listener, LFLAG_ASYNC) ? "async" : "static"); - switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Control", switch_test_flag(listener, LFLAG_FULL) ? "full" : "single-channel"); - - switch_event_serialize(call_event, &event_str, SWITCH_TRUE); - if (!event_str) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_clear_flag_locked(listener, LFLAG_RUNNING); - goto done; - } - len = strlen(event_str); - switch_socket_send(listener->sock, event_str, &len); - switch_safe_free(event_str); } else { switch_snprintf(buf, sizeof(buf), "Content-Type: auth/request\n\n"); From anthm at freeswitch.org Mon Mar 23 12:55:03 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Mon, 23 Mar 2009 14:55:03 -0500 Subject: [Freeswitch-svn] [commit] r12724 - in freeswitch/trunk/libs/esl: . lua perl php python ruby src src/include Message-ID: Author: anthm Date: Mon Mar 23 14:55:02 2009 New Revision: 12724 Log: add disconnect method and check in ivrd Added: freeswitch/trunk/libs/esl/ivrd.c freeswitch/trunk/libs/esl/test.pl (contents, props changed) Modified: freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/lua/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/ESL.pm freeswitch/trunk/libs/esl/perl/esl_wrap.cpp freeswitch/trunk/libs/esl/php/ESL.php freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/php/php_ESL.h freeswitch/trunk/libs/esl/python/ESL.py freeswitch/trunk/libs/esl/python/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Mon Mar 23 14:55:02 2009 @@ -16,7 +16,7 @@ # comment the next line to disable c++ (no swig mods for you then) OBJS += src/esl_oop.o -all: $(MYLIB) fs_cli testclient testserver +all: $(MYLIB) fs_cli testclient testserver ivrd $(MYLIB): $(OBJS) $(HEADERS) $(SRC) ar rcs $(MYLIB) $(OBJS) @@ -25,6 +25,9 @@ testserver: $(MYLIB) testserver.c $(CC) $(CC_CFLAGS) $(CFLAGS) testserver.c -o testserver $(LDFLAGS) $(LIBS) +ivrd: $(MYLIB) ivrd.c + $(CC) $(CC_CFLAGS) $(CFLAGS) ivrd.c -o ivrd $(LDFLAGS) $(LIBS) + testclient: $(MYLIB) testclient.c $(CC) $(CC_CFLAGS) $(CFLAGS) testclient.c -o testclient $(LDFLAGS) $(LIBS) @@ -38,7 +41,7 @@ $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) -c $< -o $@ clean: - rm -f *.o src/*.o testclient testserver fs_cli libesl.a *~ src/*~ src/include/*~ + rm -f *.o src/*.o testclient testserver ivrd fs_cli libesl.a *~ src/*~ src/include/*~ $(MAKE) -C perl clean $(MAKE) -C php clean $(MAKE) -C lua clean Added: freeswitch/trunk/libs/esl/ivrd.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/ivrd.c Mon Mar 23 14:55:02 2009 @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2009, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include + +static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struct sockaddr_in *addr) +{ + esl_handle_t handle = {{0}}; + char path_buffer[1024] = { 0 }; + const char *path; + + if (fork()) { + close(client_sock); + return; + } + + esl_attach_handle(&handle, client_sock, addr); + + if (!(path = esl_event_get_header(handle.info_event, "variable_ivr_path"))) { + esl_log(ESL_LOG_ERROR, "Missing ivr_path param!\n"); + return; + } + + strncpy(path_buffer, path, sizeof(path_buffer) - 1); + + /* hotwire the socket to STDIN/STDOUT */ + dup2(client_sock, STDIN_FILENO); + dup2(client_sock, STDOUT_FILENO); + + /* close the handle but leak the socket on purpose cos the child will need it open */ + handle.sock = -1; + esl_disconnect(&handle); + + /* DOH! we're still here! Close the socket. */ + + execl(path_buffer, path_buffer, NULL); + esl_log(ESL_LOG_ERROR, "Error %d\n", client_sock); + close(client_sock); + +} + +int main(int argc, char *argv[]) +{ + int i; + char *ip = NULL; + int port = 0; + + for (i = 1; i + 1 < argc; ) { + if (!strcasecmp(argv[i], "-h")) { + ip = argv[++i]; + } else if (!strcasecmp(argv[i], "-p")) { + port = atoi(argv[++i]); + } else { + i++; + } + } + + if (!(ip && port)) { + fprintf(stderr, "Usage %s -h -p \n", argv[0]); + return -1; + } + + esl_listen(ip, port, mycallback); + + return 0; +} Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp Mon Mar 23 14:55:02 2009 @@ -1927,14 +1927,14 @@ SWIG_check_num_args("getHeader",2,2) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("getHeader",1,"ESLevent *"); - if(!lua_isstring(L,2)) SWIG_fail_arg("getHeader",2,"char *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("getHeader",2,"char const *"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLevent,0))){ SWIG_fail_ptr("ESLevent_getHeader",1,SWIGTYPE_p_ESLevent); } arg2 = (char *)lua_tostring(L, 2); - result = (char *)(arg1)->getHeader(arg2); + result = (char *)(arg1)->getHeader((char const *)arg2); SWIG_arg=0; lua_pushstring(L,(const char*)result); SWIG_arg++; return SWIG_arg; @@ -2688,6 +2688,31 @@ } +static int _wrap_ESLconnection_disconnect(lua_State* L) { + int SWIG_arg = -1; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + + SWIG_check_num_args("disconnect",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("disconnect",1,"ESLconnection *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLconnection,0))){ + SWIG_fail_ptr("ESLconnection_disconnect",1,SWIGTYPE_p_ESLconnection); + } + + result = (int)(arg1)->disconnect(); + SWIG_arg=0; + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static void swig_delete_ESLconnection(void *obj) { ESLconnection *arg1 = (ESLconnection *) obj; delete arg1; @@ -2707,6 +2732,7 @@ {"execute", _wrap_ESLconnection_execute}, {"setBlockingExecute", _wrap_ESLconnection_setBlockingExecute}, {"setEventLock", _wrap_ESLconnection_setEventLock}, + {"disconnect", _wrap_ESLconnection_disconnect}, {0,0} }; static swig_lua_attribute swig_ESLconnection_attributes[] = { Modified: freeswitch/trunk/libs/esl/perl/ESL.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL.pm Mon Mar 23 14:55:02 2009 @@ -142,6 +142,7 @@ *execute = *ESLc::ESLconnection_execute; *setBlockingExecute = *ESLc::ESLconnection_setBlockingExecute; *setEventLock = *ESLc::ESLconnection_setEventLock; +*disconnect = *ESLc::ESLconnection_disconnect; sub DISOWN { my $self = shift; my $ptr = tied(%$self); Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp Mon Mar 23 14:55:02 2009 @@ -2304,10 +2304,10 @@ arg1 = reinterpret_cast< ESLevent * >(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_getHeader" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_getHeader" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - result = (char *)(arg1)->getHeader(arg2); + result = (char *)(arg1)->getHeader((char const *)arg2); ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -3330,6 +3330,34 @@ } +XS(_wrap_ESLconnection_disconnect) { + { + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: ESLconnection_disconnect(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_disconnect" "', argument " "1"" of type '" "ESLconnection *""'"); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + result = (int)(arg1)->disconnect(); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + XS(_wrap_eslSetLogLevel) { { int arg1 ; @@ -3435,6 +3463,7 @@ {"ESLc::ESLconnection_execute", _wrap_ESLconnection_execute}, {"ESLc::ESLconnection_setBlockingExecute", _wrap_ESLconnection_setBlockingExecute}, {"ESLc::ESLconnection_setEventLock", _wrap_ESLconnection_setEventLock}, +{"ESLc::ESLconnection_disconnect", _wrap_ESLconnection_disconnect}, {"ESLc::eslSetLogLevel", _wrap_eslSetLogLevel}, {0,0} }; Modified: freeswitch/trunk/libs/esl/php/ESL.php ============================================================================== --- freeswitch/trunk/libs/esl/php/ESL.php (original) +++ freeswitch/trunk/libs/esl/php/ESL.php Mon Mar 23 14:55:02 2009 @@ -194,6 +194,10 @@ function setEventLock($val) { return ESLconnection_setEventLock($this->_cPtr,$val); } + + function disconnect() { + return ESLconnection_disconnect($this->_cPtr); + } } Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Mon Mar 23 14:55:02 2009 @@ -1465,7 +1465,7 @@ arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - result = (char *)(arg1)->getHeader(arg2); + result = (char *)(arg1)->getHeader((char const *)arg2); { if(!result) { ZVAL_NULL(return_value); @@ -2313,6 +2313,32 @@ } +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_disconnect) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + zval **args[1]; + + SWIG_ResetError(); + if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) { + WRONG_PARAM_COUNT; + } + + { + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLconnection, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLconnection_disconnect. Expected SWIGTYPE_p_ESLconnection"); + } + } + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); + result = (int)(arg1)->disconnect(); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg()); +} + + ZEND_NAMED_FUNCTION(_wrap_eslSetLogLevel) { int arg1 ; zval **args[1]; @@ -2391,6 +2417,7 @@ SWIG_ZEND_NAMED_FE(eslconnection_execute,_wrap_ESLconnection_execute,NULL) SWIG_ZEND_NAMED_FE(eslconnection_setblockingexecute,_wrap_ESLconnection_setBlockingExecute,NULL) SWIG_ZEND_NAMED_FE(eslconnection_seteventlock,_wrap_ESLconnection_setEventLock,NULL) + SWIG_ZEND_NAMED_FE(eslconnection_disconnect,_wrap_ESLconnection_disconnect,NULL) SWIG_ZEND_NAMED_FE(eslsetloglevel,_wrap_eslSetLogLevel,NULL) {NULL, NULL, NULL} }; Modified: freeswitch/trunk/libs/esl/php/php_ESL.h ============================================================================== --- freeswitch/trunk/libs/esl/php/php_ESL.h (original) +++ freeswitch/trunk/libs/esl/php/php_ESL.h Mon Mar 23 14:55:02 2009 @@ -64,5 +64,6 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_execute); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setBlockingExecute); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setEventLock); +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_disconnect); ZEND_NAMED_FUNCTION(_wrap_eslSetLogLevel); #endif /* PHP_ESL_H */ Modified: freeswitch/trunk/libs/esl/python/ESL.py ============================================================================== --- freeswitch/trunk/libs/esl/python/ESL.py (original) +++ freeswitch/trunk/libs/esl/python/ESL.py Mon Mar 23 14:55:02 2009 @@ -91,6 +91,7 @@ def execute(*args): return apply(_ESL.ESLconnection_execute, args) def setBlockingExecute(*args): return apply(_ESL.ESLconnection_setBlockingExecute, args) def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args) + def disconnect(*args): return apply(_ESL.ESLconnection_disconnect, args) ESLconnection_swigregister = _ESL.ESLconnection_swigregister ESLconnection_swigregister(ESLconnection) Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Mon Mar 23 14:55:02 2009 @@ -3298,10 +3298,10 @@ arg1 = reinterpret_cast< ESLevent * >(argp1); res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_getHeader" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLevent_getHeader" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - result = (char *)(arg1)->getHeader(arg2); + result = (char *)(arg1)->getHeader((char const *)arg2); resultobj = SWIG_FromCharPtr((const char *)result); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; @@ -4173,6 +4173,28 @@ } +SWIGINTERN PyObject *_wrap_ESLconnection_disconnect(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:ESLconnection_disconnect",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_disconnect" "', argument " "1"" of type '" "ESLconnection *""'"); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + result = (int)(arg1)->disconnect(); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *ESLconnection_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; @@ -4237,6 +4259,7 @@ { (char *)"ESLconnection_execute", _wrap_ESLconnection_execute, METH_VARARGS, NULL}, { (char *)"ESLconnection_setBlockingExecute", _wrap_ESLconnection_setBlockingExecute, METH_VARARGS, NULL}, { (char *)"ESLconnection_setEventLock", _wrap_ESLconnection_setEventLock, METH_VARARGS, NULL}, + { (char *)"ESLconnection_disconnect", _wrap_ESLconnection_disconnect, METH_VARARGS, NULL}, { (char *)"ESLconnection_swigregister", ESLconnection_swigregister, METH_VARARGS, NULL}, { (char *)"eslSetLogLevel", _wrap_eslSetLogLevel, METH_VARARGS, NULL}, { NULL, NULL, 0, NULL } Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Mon Mar 23 14:55:02 2009 @@ -2414,10 +2414,10 @@ arg1 = reinterpret_cast< ESLevent * >(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","getHeader", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","getHeader", 2, argv[0] )); } arg2 = reinterpret_cast< char * >(buf2); - result = (char *)(arg1)->getHeader(arg2); + result = (char *)(arg1)->getHeader((char const *)arg2); vresult = SWIG_FromCharPtr((const char *)result); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return vresult; @@ -3306,6 +3306,30 @@ SWIGINTERN VALUE +_wrap_ESLconnection_disconnect(int argc, VALUE *argv, VALUE self) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + VALUE vresult = Qnil; + + if ((argc < 0) || (argc > 0)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLconnection *","disconnect", 1, self )); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + result = (int)(arg1)->disconnect(); + vresult = SWIG_From_int(static_cast< int >(result)); + return vresult; +fail: + return Qnil; +} + + +SWIGINTERN VALUE _wrap_eslSetLogLevel(int argc, VALUE *argv, VALUE self) { int arg1 ; int val1 ; @@ -3658,6 +3682,7 @@ rb_define_method(cESLconnection.klass, "execute", VALUEFUNC(_wrap_ESLconnection_execute), -1); rb_define_method(cESLconnection.klass, "setBlockingExecute", VALUEFUNC(_wrap_ESLconnection_setBlockingExecute), -1); rb_define_method(cESLconnection.klass, "setEventLock", VALUEFUNC(_wrap_ESLconnection_setEventLock), -1); + rb_define_method(cESLconnection.klass, "disconnect", VALUEFUNC(_wrap_ESLconnection_disconnect), -1); cESLconnection.mark = 0; cESLconnection.destroy = (void (*)(void *)) free_ESLconnection; cESLconnection.trackObjects = 0; Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Mon Mar 23 14:55:02 2009 @@ -33,6 +33,15 @@ } +int ESLconnection::disconnect() +{ + if (handle.connected) { + return esl_disconnect(&handle); + } + + return 0; +} + int ESLconnection::connected() { return handle.connected; Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Mon Mar 23 14:55:02 2009 @@ -90,6 +90,7 @@ int execute(const char *app, const char *arg = NULL, const char *uuid = NULL); int setBlockingExecute(const char *val); int setEventLock(const char *val); + int disconnect(void); }; void eslSetLogLevel(int level); Added: freeswitch/trunk/libs/esl/test.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/test.pl Mon Mar 23 14:55:02 2009 @@ -0,0 +1,21 @@ +#!/usr/bin/perl +require ESL; +use Data::Dumper; + +my $fd = fileno(STDIN); +my $con = new ESL::ESLconnection($fd); +my $info = $con->getInfo(); + +select STDERR; + +print $info->serialize(); + +my $uuid = $info->getHeader("unique-id"); + +$con->execute("answer", "", $uuid); +$con->execute("playback", "/ram/swimp.raw", $uuid); + + +$con->disconnect(); + + From mcollins at freeswitch.org Mon Mar 23 15:55:56 2009 From: mcollins at freeswitch.org (FreeSWITCH SVN) Date: Mon, 23 Mar 2009 17:55:56 -0500 Subject: [Freeswitch-svn] [commit] r12725 - freeswitch/trunk/libs/esl Message-ID: Author: mcollins Date: Mon Mar 23 17:55:56 2009 New Revision: 12725 Log: Cosmetics Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Mon Mar 23 17:55:56 2009 @@ -180,7 +180,7 @@ printf(" -p, --password=FILENAME Password\n"); printf(" -x, --execute=command Execute Command and Exit\n"); printf(" -l, --loglevel=command Log Level\n"); - printf(" -q, --quiet Disable logging\n"); + printf(" -q, --quiet Disable logging\n"); printf(" -d, --debug=level Debug Level (0 - 7)\n\n"); return 1; } From silik0n at freeswitch.org Tue Mar 24 01:41:09 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 03:41:09 -0500 Subject: [Freeswitch-svn] [commit] r12726 - freeswitch/trunk/scripts/contrib/swk/php/xml_curl Message-ID: Author: silik0n Date: Tue Mar 24 03:41:09 2009 New Revision: 12726 Log: ok lets add a few more things in here for IVR stuff Added: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php (contents, props changed) freeswitch/trunk/scripts/contrib/swk/php/xml_curl/fs_curl.php - copied, changed from r12725, /freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Added: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php Tue Mar 24 03:41:09 2009 @@ -0,0 +1,74 @@ + + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Ken Rice + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Ken Rice + * + * freeswitch.php -- Initial Class file for XML_CURL responses for Codename: SHIPMENT + * + *************************************************************************************************** + * + * This Requires the FreeSWITCH ESL Extension to be installed properly on your system. + * + */ + +// require_once "ESL.php"; + +class FSConfig { + // var $esl; + + var $dbh; + + public function __construct(){ + $dbtype='mysql'; /* Set the Database type */ + // $db_hostname = 'localhost'; /* Database Server hostname */ + $db_hostname = '192.168.1.140'; /* Database Server hostname */ + $db_port = '3306'; /* Database Server Port */ + $db_username = 'root'; /* Database Server username */ + $db_password = 'password'; /* Database Server password */ + $db_database = 'shipment'; /* DataBase Name */ + if ($dbtype == 'mysql') { + $pdo_flags = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,); + } + $this->dbh = new PDO("$dbtype:host=$db_hostname;port=$db_port;dbname=$db_database", $db_username, $db_password, $pdo_flags); + + } + + /*** IVR Methods Methods ***/ + public function getConfigMenus(){ + $query = sprintf("select * from menus"); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + + public function getConfigMenuOptions($menu_uid) { + $query = sprintf("select * from menu_entries where menu_uid = %s", $menu_uid); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } +} Added: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Tue Mar 24 03:41:09 2009 @@ -0,0 +1 @@ +link fs_curl.php \ No newline at end of file Copied: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/fs_curl.php (from r12725, /freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php) ============================================================================== --- /freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/fs_curl.php Tue Mar 24 03:41:09 2009 @@ -1,6 +1,7 @@ getDirDomainbyName($key_value); -} else { - printf("\n\n

\n". - "\n

\n"); - die(); -} - - +/* Uncomment and edit for debugging directory*/ +/* +$section = "configuration"; +$tag_name= "configuration"; +$key_name ="name"; +$key_value="ivr.conf"; +*/ +/* section=configuration&tag_name=configuration&key_name=name&key_value=ivr.conf&Event-Name=REQUEST_PARAMS */ -$db_domain_settings = $fsd->getDirDomain($db_domain['uid']); +if ($section == "configuration" && $tag_name == "configuration" && $key_name == "name" && $key_value == "ivr.conf" ) { + + $fsc = new FSConfig(); + + printf(" \n"); + printf(" \n"); + printf("

\n"); + printf(" \n"); + printf(" \n"); + + $db_menus = $fsc->getConfigMenus(); + foreach ($db_menus as $db_menu) { + printf(" \n", + $db_menu['name'], $db_menu['greet_long'], $db_menu['greet_short'], $db_menu['invalid_sound'], + $db_menu['exit_sound'], $db_menu['timeout'], $db_menu['inter_digit_timeout'], $db_menu['max_failures'], + $db_menu['max_timeouts'], $db_menu['digit_len']); + + $db_menuopts = $fsc->getConfigMenuOptions($db_menu['uid']); + + foreach ($db_menuopts as $db_menuopt) { + printf(" \n", + $db_menuopt['action'], $db_menuopt['digits'], $db_menuopt['param']); + } + + printf(" \n"); + } + printf(" \n"); + printf(" \n"); + printf("

\n"); + printf(" \n"); +} else if ($section == "directory" && $tag_name == "domain" && $key_name == "name" && $user != "" ) { -$db_user = $fsd->getDirUsersByDomainUidByUsername($db_domain['uid'], $user); -$db_user_settings = $fsd->getDirUser($db_user['uid']); -$db_groups = $fsd->getDirGroupsByDomianUidByUserUid($db_domain['uid'], $db_user['uid']); - -printf(" \n"); -printf(" \n"); -printf("

\n"); -printf(" \n", $db_domain['name']); -printf(" \n"); -foreach($db_domain_settings['params'] as $db_params) { - printf(" \n", $db_params['name'], $db_params['value']); -} -printf(" \n"); -printf(" \n"); -foreach($db_domain_settings['variables'] as $db_variables) { - printf(" \n", $db_variables['name'], $db_variables['value']); -} -printf(" \n"); -printf(" \n"); -printf(" \n"); -printf(" \n"); -printf(" \n", $db_user['username'], $db_user['mailbox']); -printf(" \n"); -foreach($db_user_settings['params'] as $db_params) { - printf(" \n", $db_params['name'], $db_params['value']); -} -printf(" \n"); -printf(" \n"); -foreach($db_user_settings['variables'] as $db_variables) { - printf(" \n", $db_variables['name'], $db_variables['value']); -} -printf(" \n"); -printf(" \n"); -printf(" \n"); -printf(" \n"); -foreach($db_groups as $db_group){ - printf(" \n", $db_group['groupName']); + $fsd = new FSDirectory(); + $db_domain = $fsd->getDirDomainbyName($key_value); + $db_domain_settings = $fsd->getDirDomain($db_domain['uid']); + $db_user = $fsd->getDirUsersByDomainUidByUsername($db_domain['uid'], $user); + $db_user_settings = $fsd->getDirUser($db_user['uid']); + $db_groups = $fsd->getDirGroupsByDomianUidByUserUid($db_domain['uid'], $db_user['uid']); + + printf(" \n"); + printf(" \n"); + printf("

\n"); + printf(" \n", $db_domain['name']); + printf(" \n"); + foreach($db_domain_settings['params'] as $db_params) { + printf(" \n", $db_params['name'], $db_params['value']); + } + printf(" \n"); + printf(" \n"); + foreach($db_domain_settings['variables'] as $db_variables) { + printf(" \n", $db_variables['name'], $db_variables['value']); + } + printf(" \n"); + printf(" \n"); + printf(" \n"); printf(" \n"); - printf(" \n", $user); + printf(" \n", $db_user['username'], $db_user['mailbox']); + printf(" \n"); + foreach($db_user_settings['params'] as $db_params) { + printf(" \n", $db_params['name'], $db_params['value']); + } + printf(" \n"); + printf(" \n"); + foreach($db_user_settings['variables'] as $db_variables) { + printf(" \n", $db_variables['name'], $db_variables['value']); + } + printf(" \n"); + printf(" \n"); printf(" \n"); printf(" \n"); + foreach($db_groups as $db_group){ + printf(" \n", $db_group['groupName']); + printf(" \n"); + printf(" \n", $user); + printf(" \n"); + printf(" \n"); + } + + printf(" \n"); + printf(" \n"); + printf("

\n"); + printf(" \n"); + +} else { + printf("\n\n

\n". + "\n

\n"); + die(); } - -printf(" \n"); -printf(" \n"); -printf("

\n"); -printf(" \n"); ?> From silik0n at freeswitch.org Tue Mar 24 01:43:19 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 03:43:19 -0500 Subject: [Freeswitch-svn] [commit] r12727 - freeswitch/trunk/scripts/contrib/swk/php/xml_curl Message-ID: Author: silik0n Date: Tue Mar 24 03:43:19 2009 New Revision: 12727 Log: you dont need my RFC1918 address in your configs Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php Tue Mar 24 03:43:19 2009 @@ -45,7 +45,7 @@ public function __construct(){ $dbtype='mysql'; /* Set the Database type */ // $db_hostname = 'localhost'; /* Database Server hostname */ - $db_hostname = '192.168.1.140'; /* Database Server hostname */ + $db_hostname = '127.0.0.1'; /* Database Server hostname */ $db_port = '3306'; /* Database Server Port */ $db_username = 'root'; /* Database Server username */ $db_password = 'password'; /* Database Server password */ Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Tue Mar 24 03:43:19 2009 @@ -45,7 +45,7 @@ public function __construct(){ $dbtype='mysql'; /* Set the Database type */ // $db_hostname = 'localhost'; /* Database Server hostname */ - $db_hostname = '192.168.1.140'; /* Database Server hostname */ + $db_hostname = '127.0.0.1'; /* Database Server hostname */ $db_port = '3306'; /* Database Server Port */ $db_username = 'root'; /* Database Server username */ $db_password = 'password'; /* Database Server password */ From anthm at freeswitch.org Tue Mar 24 07:54:13 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 09:54:13 -0500 Subject: [Freeswitch-svn] [commit] r12728 - in freeswitch/trunk/src: . mod/formats/mod_sndfile mod/languages/mod_lua Message-ID: Author: anthm Date: Tue Mar 24 09:54:13 2009 New Revision: 12728 Log: FSCORE-341 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Tue Mar 24 09:54:13 2009 @@ -103,7 +103,8 @@ context->sfinfo.channels = handle->channels; context->sfinfo.samplerate = handle->samplerate; if (handle->samplerate == 8000 || handle->samplerate == 16000 || - handle->samplerate == 24000 || handle->samplerate == 32000 || handle->samplerate == 48000) { + handle->samplerate == 24000 || handle->samplerate == 32000 || handle->samplerate == 48000 || + handle->samplerate == 11025 || handle->samplerate == 22050 || handle->samplerate == 44100) { context->sfinfo.format |= SF_FORMAT_PCM_16; } Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Tue Mar 24 09:54:13 2009 @@ -24,20 +24,23 @@ Session::~Session() { - if (channel) { - switch_channel_set_private(channel, "CoreSession", NULL); - } - - if (hangup_func_str) { - if (session) { - switch_core_event_hook_remove_state_change(session, lua_hanguphook); + if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); } - switch_safe_free(hangup_func_str); + switch_channel_set_private(channel, "CoreSession", NULL); + switch_core_event_hook_remove_state_change(session, lua_hanguphook); + session = NULL; + channel = NULL; } + switch_safe_free(hangup_func_str); switch_safe_free(hangup_func_arg); switch_safe_free(cb_function); switch_safe_free(cb_arg); + + init_vars(); + } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Tue Mar 24 09:54:13 2009 @@ -290,10 +290,10 @@ fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen); - memcpy(fh->dbuf, fh->resampler->to, fh->resampler->to_len); + memcpy(fh->dbuf, fh->resampler->to, fh->resampler->to_len * 2); data = fh->dbuf; } else { - memcpy(data, fh->resampler->to, fh->resampler->to_len); + memcpy(data, fh->resampler->to, fh->resampler->to_len * 2); } *len = fh->resampler->to_len / fh->channels; Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Mar 24 09:54:13 2009 @@ -888,22 +888,28 @@ { this_check_void(); - if (channel) { - switch_channel_set_private(channel, "CoreSession", NULL); - } - switch_safe_free(xml_cdr_text); switch_safe_free(uuid); switch_safe_free(tts_name); switch_safe_free(voice_name); if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); + } + + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "destroy/unlink session from object\n"); - if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { + + if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); } switch_core_session_rwunlock(session); session = NULL; + channel = NULL; } allocated = 0; From brian at freeswitch.org Tue Mar 24 08:00:44 2009 From: brian at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:00:44 -0500 Subject: [Freeswitch-svn] [commit] r12729 - freeswitch/trunk/libs/esl/python Message-ID: Author: brian Date: Tue Mar 24 10:00:44 2009 New Revision: 12729 Log: ESL-9 Modified: freeswitch/trunk/libs/esl/python/single_command.py Modified: freeswitch/trunk/libs/esl/python/single_command.py ============================================================================== --- freeswitch/trunk/libs/esl/python/single_command.py (original) +++ freeswitch/trunk/libs/esl/python/single_command.py Tue Mar 24 10:00:44 2009 @@ -2,21 +2,42 @@ import string import sys +from optparse import OptionParser from ESL import * -con = ESLconnection("localhost","8021","ClueCon") -#are we connected? - -if con.connected: - - #get argument passed to script - command = string.join(sys.argv[1:]) - - #run command - e=con.sendRecv("api "+ command) - print e.getBody() - -else: - - print "Not Connected" - +def main(argv): + + try: + + parser = OptionParser() + parser.add_option("-a", "--auth", dest="auth", default="ClueCon", + help="ESL password") + parser.add_option("-s", "--server", dest="server", default="127.0.0.1", + help="FreeSWITCH server IP address") + parser.add_option("-p", "--port", dest="port", default="8021", + help="FreeSWITCH server event socket port") + parser.add_option("-c", "--command", dest="command", + help="command to run, surround mutli word commands in \"\'s") + + (options, args) = parser.parse_args() + + + con = ESLconnection(options.server, options.port, options.auth) + #are we connected? + + if con.connected: + #run command + e=con.sendRecv("api "+ options.command) + print e.getBody() + + else: + + print "Not Connected" + sys.exit(2) + + except: + + print parser.get_usage() + +if __name__ == "__main__": + main(sys.argv[1:]) \ No newline at end of file From anthm at freeswitch.org Tue Mar 24 08:30:08 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:30:08 -0500 Subject: [Freeswitch-svn] [commit] r12730 - in freeswitch/trunk/src: . include mod/languages/mod_lua mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_perl mod/languages/mod_python Message-ID: Author: anthm Date: Tue Mar 24 10:30:08 2009 New Revision: 12730 Log: fix hanguphook order of operations vs destroy method issue in c++ code Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Tue Mar 24 10:30:08 2009 @@ -264,7 +264,7 @@ SWITCH_DECLARE(int) originate(CoreSession * a_leg_session, char *dest, int timeout = 60); - SWITCH_DECLARE(void) destroy(void); + SWITCH_DECLARE(virtual void) destroy(void); /** \brief set a DTMF callback function * Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Tue Mar 24 10:30:08 2009 @@ -21,8 +21,14 @@ hh = mark = 0; } static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup); -Session::~Session() + + +void Session::destroy(void) { + + if (!allocated) { + return; + } if (session) { if (!channel) { @@ -30,8 +36,6 @@ } switch_channel_set_private(channel, "CoreSession", NULL); switch_core_event_hook_remove_state_change(session, lua_hanguphook); - session = NULL; - channel = NULL; } switch_safe_free(hangup_func_str); @@ -39,8 +43,13 @@ switch_safe_free(cb_function); switch_safe_free(cb_arg); - init_vars(); - + CoreSession::destroy(); +} + + +Session::~Session() +{ + destroy(); } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Tue Mar 24 10:30:08 2009 @@ -23,6 +23,7 @@ Session(char *uuid, CoreSession *a_leg = NULL); Session(switch_core_session_t *session); ~Session(); + virtual void destroy(void); virtual bool begin_allow_threads(); virtual bool end_allow_threads(); @@ -40,6 +41,7 @@ char *hangup_func_str; char *hangup_func_arg; void setLUA(lua_State *state); + }; } #endif Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Tue Mar 24 10:30:08 2009 @@ -7388,6 +7388,30 @@ } +static int _wrap_Session_destroy(lua_State* L) { + int SWIG_arg = -1; + LUA::Session *arg1 = (LUA::Session *) 0 ; + + SWIG_check_num_args("destroy",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("destroy",1,"LUA::Session *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_LUA__Session,0))){ + SWIG_fail_ptr("Session_destroy",1,SWIGTYPE_p_LUA__Session); + } + + (arg1)->destroy(); + SWIG_arg=0; + + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static int _wrap_Session_begin_allow_threads(lua_State* L) { int SWIG_arg = -1; LUA::Session *arg1 = (LUA::Session *) 0 ; @@ -8086,6 +8110,7 @@ delete arg1; } static swig_lua_method swig_LUA_Session_methods[] = { + {"destroy", _wrap_Session_destroy}, {"begin_allow_threads", _wrap_Session_begin_allow_threads}, {"end_allow_threads", _wrap_Session_end_allow_threads}, {"check_hangup_hook", _wrap_Session_check_hangup_hook}, Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Mar 24 10:30:08 2009 @@ -1444,6 +1444,17 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get() { + char * jresult ; + char *result = 0 ; + + result = (char *) "transfer_after_bridge"; + + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get() { char * jresult ; char *result = 0 ; @@ -13113,6 +13124,64 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_in_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t arg2 ; + switch_size_t *argp2 ; + + arg1 = (switch_file_handle *)jarg1; + argp2 = (switch_size_t *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0); + return ; + } + arg2 = *argp2; + if (arg1) (arg1)->samples_in = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_in_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t result; + + arg1 = (switch_file_handle *)jarg1; + result = ((arg1)->samples_in); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_out_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t arg2 ; + switch_size_t *argp2 ; + + arg1 = (switch_file_handle *)jarg1; + argp2 = (switch_size_t *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0); + return ; + } + arg2 = *argp2; + if (arg1) (arg1)->samples_out = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_out_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t result; + + arg1 = (switch_file_handle *)jarg1; + result = ((arg1)->samples_out); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_vol_set(void * jarg1, int jarg2) { switch_file_handle *arg1 = (switch_file_handle *) 0 ; int32_t arg2 ; @@ -22245,6 +22314,18 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_process_import(void * jarg1, void * jarg2, char * jarg3) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_channel_t *arg2 = (switch_channel_t *) 0 ; + char *arg3 = (char *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_channel_t *)jarg2; + arg3 = (char *)jarg3; + switch_process_import(arg1,arg2,(char const *)arg3); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() { int jresult ; int result; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Mar 24 10:30:08 2009 @@ -249,7 +249,7 @@ return ret; } - public void destroy() { + public virtual void destroy() { freeswitchPINVOKE.CoreSession_destroy(swigCPtr); } @@ -3382,6 +3382,10 @@ return ret; } + public static void switch_process_import(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_switch_channel peer_channel, string varname) { + freeswitchPINVOKE.switch_process_import(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_switch_channel.getCPtr(peer_channel), varname); + } + public static switch_status_t switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp rtp_session, switch_rtp_crypto_direction_t direction, uint index, switch_rtp_crypto_key_type_t type, SWIGTYPE_p_unsigned_char key, SWIGTYPE_p_switch_size_t keylen) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), (int)direction, index, (int)type, SWIGTYPE_p_unsigned_char.getCPtr(key), SWIGTYPE_p_switch_size_t.getCPtr(keylen)); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); @@ -4181,6 +4185,7 @@ public static readonly string SWITCH_LOCAL_VIDEO_PORT_VARIABLE = freeswitchPINVOKE.SWITCH_LOCAL_VIDEO_PORT_VARIABLE_get(); public static readonly string SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE_get(); public static readonly string SWITCH_PARK_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get(); + public static readonly string SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get(); public static readonly string SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE = freeswitchPINVOKE.SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get(); public static readonly string SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE = freeswitchPINVOKE.SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE_get(); public static readonly string SWITCH_MAX_FORWARDS_VARIABLE = freeswitchPINVOKE.SWITCH_MAX_FORWARDS_VARIABLE_get(); @@ -4754,6 +4759,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get")] public static extern string SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get")] + public static extern string SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get")] public static extern string SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get(); @@ -7520,6 +7528,18 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_offset_pos_get")] public static extern uint switch_file_handle_offset_pos_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_in_set")] + public static extern void switch_file_handle_samples_in_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_in_get")] + public static extern IntPtr switch_file_handle_samples_in_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_out_set")] + public static extern void switch_file_handle_samples_out_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_out_get")] + public static extern IntPtr switch_file_handle_samples_out_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_vol_set")] public static extern void switch_file_handle_vol_set(HandleRef jarg1, int jarg2); @@ -9632,6 +9652,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_sound_test")] public static extern int switch_ivr_sound_test(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_process_import")] + public static extern void switch_process_import(HandleRef jarg1, HandleRef jarg2, string jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_BUF_LEN_get")] public static extern int SWITCH_RTP_MAX_BUF_LEN_get(); @@ -20488,6 +20511,30 @@ } } + public SWIGTYPE_p_switch_size_t samples_in { + set { + freeswitchPINVOKE.switch_file_handle_samples_in_set(swigCPtr, SWIGTYPE_p_switch_size_t.getCPtr(value)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + get { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_file_handle_samples_in_get(swigCPtr), true); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + public SWIGTYPE_p_switch_size_t samples_out { + set { + freeswitchPINVOKE.switch_file_handle_samples_out_set(swigCPtr, SWIGTYPE_p_switch_size_t.getCPtr(value)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + get { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_file_handle_samples_out_get(swigCPtr), true); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public int vol { set { freeswitchPINVOKE.switch_file_handle_vol_set(swigCPtr, value); Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm Tue Mar 24 10:30:08 2009 @@ -478,6 +478,7 @@ } } +*destroy = *freeswitchc::Session_destroy; *begin_allow_threads = *freeswitchc::Session_begin_allow_threads; *end_allow_threads = *freeswitchc::Session_end_allow_threads; *check_hangup_hook = *freeswitchc::Session_check_hangup_hook; Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Tue Mar 24 10:30:08 2009 @@ -44,18 +44,33 @@ } } static switch_status_t perl_hanguphook(switch_core_session_t *session_hungup); -Session::~Session() + +void Session::destroy(void) { - switch_safe_free(cb_function); - switch_safe_free(cb_arg); + + if (!allocated) { + return; + } - if (session && hangup_func_str) { + if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); + } + switch_channel_set_private(channel, "CoreSession", NULL); switch_core_event_hook_remove_state_change(session, perl_hanguphook); } + switch_safe_free(cb_function); + switch_safe_free(cb_arg); switch_safe_free(hangup_func_str); - switch_safe_free(hangup_func_arg); + switch_safe_free(hangup_func_arg); + + CoreSession::destroy(); +} +Session::~Session() +{ + destroy(); } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h Tue Mar 24 10:30:08 2009 @@ -31,7 +31,8 @@ Session(char *uuid, CoreSession *a_leg = NULL); Session(switch_core_session_t *session); ~Session(); - + + virtual void destroy(void); virtual bool begin_allow_threads(); virtual bool end_allow_threads(); virtual void check_hangup_hook(); Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Tue Mar 24 10:30:08 2009 @@ -9942,6 +9942,33 @@ } +XS(_wrap_Session_destroy) { + { + PERL::Session *arg1 = (PERL::Session *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Session_destroy(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_PERL__Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_destroy" "', argument " "1"" of type '" "PERL::Session *""'"); + } + arg1 = reinterpret_cast< PERL::Session * >(argp1); + (arg1)->destroy(); + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + XS(_wrap_Session_begin_allow_threads) { { PERL::Session *arg1 = (PERL::Session *) 0 ; @@ -11217,6 +11244,7 @@ {"freeswitchc::dtmf_callback", _wrap_dtmf_callback}, {"freeswitchc::new_Session", _wrap_new_Session}, {"freeswitchc::delete_Session", _wrap_delete_Session}, +{"freeswitchc::Session_destroy", _wrap_Session_destroy}, {"freeswitchc::Session_begin_allow_threads", _wrap_Session_begin_allow_threads}, {"freeswitchc::Session_end_allow_threads", _wrap_Session_end_allow_threads}, {"freeswitchc::Session_check_hangup_hook", _wrap_Session_check_hangup_hook}, @@ -11534,17 +11562,17 @@ SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv); Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py Tue Mar 24 10:30:08 2009 @@ -324,6 +324,7 @@ def begin_allow_threads(*args): return _freeswitch.Session_begin_allow_threads(*args) def end_allow_threads(*args): return _freeswitch.Session_end_allow_threads(*args) def check_hangup_hook(*args): return _freeswitch.Session_check_hangup_hook(*args) + def destroy(*args): return _freeswitch.Session_destroy(*args) def run_dtmf_callback(*args): return _freeswitch.Session_run_dtmf_callback(*args) def setInputCallback(*args): return _freeswitch.Session_setInputCallback(*args) def unsetInputCallback(*args): return _freeswitch.Session_unsetInputCallback(*args) Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Tue Mar 24 10:30:08 2009 @@ -21,16 +21,25 @@ } static switch_status_t python_hanguphook(switch_core_session_t *session_hungup); -Session::~Session() +void Session::destroy(void) { - if (hangup_func) { - if (session) { - switch_core_event_hook_remove_state_change(session, python_hanguphook); + if (!allocated) { + return; + } + + if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); } - Py_DECREF(hangup_func); - hangup_func = NULL; + switch_channel_set_private(channel, "CoreSession", NULL); + switch_core_event_hook_remove_state_change(session, python_hanguphook); } + + if (hangup_func) { + Py_DECREF(hangup_func); + hangup_func = NULL; + } if (hangup_func_arg) { Py_DECREF(hangup_func_arg); @@ -49,7 +58,14 @@ if (Self) { Py_DECREF(Self); - } + } + + CoreSession::destroy(); +} + +Session::~Session() +{ + destroy(); } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h Tue Mar 24 10:30:08 2009 @@ -27,6 +27,7 @@ virtual bool begin_allow_threads(); virtual bool end_allow_threads(); virtual void check_hangup_hook(); + virtual void destroy(void); virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); void setInputCallback(PyObject *cbfunc, PyObject *funcargs = NULL); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Tue Mar 24 10:30:08 2009 @@ -9442,6 +9442,27 @@ } +SWIGINTERN PyObject *_wrap_Session_destroy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PYTHON::Session *arg1 = (PYTHON::Session *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:Session_destroy",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PYTHON__Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_destroy" "', argument " "1"" of type '" "PYTHON::Session *""'"); + } + arg1 = reinterpret_cast< PYTHON::Session * >(argp1); + (arg1)->destroy(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Session_run_dtmf_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; PYTHON::Session *arg1 = (PYTHON::Session *) 0 ; @@ -10114,6 +10135,7 @@ { (char *)"Session_begin_allow_threads", _wrap_Session_begin_allow_threads, METH_VARARGS, NULL}, { (char *)"Session_end_allow_threads", _wrap_Session_end_allow_threads, METH_VARARGS, NULL}, { (char *)"Session_check_hangup_hook", _wrap_Session_check_hangup_hook, METH_VARARGS, NULL}, + { (char *)"Session_destroy", _wrap_Session_destroy, METH_VARARGS, NULL}, { (char *)"Session_run_dtmf_callback", _wrap_Session_run_dtmf_callback, METH_VARARGS, NULL}, { (char *)"Session_setInputCallback", _wrap_Session_setInputCallback, METH_VARARGS, NULL}, { (char *)"Session_unsetInputCallback", _wrap_Session_unsetInputCallback, METH_VARARGS, NULL}, Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Mar 24 10:30:08 2009 @@ -887,6 +887,10 @@ SWITCH_DECLARE(void) CoreSession::destroy(void) { this_check_void(); + + if (!allocated) { + return; + } switch_safe_free(xml_cdr_text); switch_safe_free(uuid); @@ -903,7 +907,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "destroy/unlink session from object\n"); - + if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); } @@ -912,7 +916,7 @@ channel = NULL; } - allocated = 0; + init_vars(); } From brian at freeswitch.org Tue Mar 24 08:30:45 2009 From: brian at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:30:45 -0500 Subject: [Freeswitch-svn] [commit] r12731 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua Message-ID: Author: brian Date: Tue Mar 24 10:30:45 2009 New Revision: 12731 Log: Thu Mar 5 10:19:35 CST 2009 Pekka Pessi * check_nua: using fail_unless_event() macro Ignore-this: b03dc7431e8fea9835322bd8f825a803 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:30:45 2009 @@ -1 +1 @@ -Tue Mar 10 14:57:43 CDT 2009 +Tue Mar 24 10:29:44 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c Tue Mar 24 10:30:45 2009 @@ -103,7 +103,7 @@ mark_point(); nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); s2_nua_teardown(); } @@ -186,7 +186,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); } @@ -216,7 +216,7 @@ respond_with_sdp(invite, d1, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -253,7 +253,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); s2_sip_respond_to(invite, d1, 404, "First not found", TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 404)); + fail_unless_event(nua_r_invite, 404); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -276,7 +276,7 @@ /* Wake up nua thread and let it time out INVITE transaction */ nua_set_params(s2->nua, TAG_END()); - s2_check_event(nua_r_set_params, 0); + fail_unless_event(nua_r_set_params, 0); s2_sip_respond_to(invite, d1, 404, "Not found after 32 seconds", TAG_END()); s2_sip_free_message(invite); @@ -307,7 +307,7 @@ respond_with_sdp(invite, d1, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Tue Mar 24 10:30:45 2009 @@ -405,7 +405,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; } @@ -437,7 +437,7 @@ s2_sip_free_message(m); - s2_check_event(nua_r_unregister, 200); + fail_unless_event(nua_r_unregister, 200); nua_handle_destroy(nh); s2->registration->nh = NULL; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h Tue Mar 24 10:30:45 2009 @@ -83,6 +83,9 @@ int s2_check_callstate(enum nua_callstate state); int s2_check_substate(struct event *e, enum nua_substate state); +#define fail_unless_event(event, status) \ + fail_unless(s2_check_event(event, status)) + #define SIP_METHOD_UNKNOWN sip_method_unknown, NULL void s2_flush_all(void); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Tue Mar 24 10:30:45 2009 @@ -94,7 +94,7 @@ { s2_teardown_started("register"); nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); s2_nua_teardown(); } @@ -162,7 +162,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 407); + fail_unless_event(nua_r_register, 407); nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END()); @@ -173,7 +173,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 401); + fail_unless_event(nua_r_register, 401); nua_authenticate(nh, NUTAG_AUTH(s2_auth2_credentials), TAG_END()); @@ -190,7 +190,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -250,7 +250,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); @@ -266,7 +266,7 @@ fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -294,7 +294,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 401); + fail_unless_event(nua_r_register, 401); nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END()); @@ -315,7 +315,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); return nh; } @@ -392,7 +392,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_i_outbound, 0); + fail_unless_event(nua_i_outbound, 0); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -406,7 +406,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); @@ -448,7 +448,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -465,7 +465,7 @@ fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2_register_teardown(); @@ -494,7 +494,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); @@ -509,7 +509,7 @@ fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -545,7 +545,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); @@ -563,7 +563,7 @@ fail_if(s2->registration->contact->m_next != NULL); fail_unless( url_has_param(s2->registration->contact->m_url, "transport=tcp")); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -599,7 +599,7 @@ "close TCP at server, wait for re-REGISTERs."); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); mark_point(); s2->registration->nh = nh; @@ -623,7 +623,7 @@ /* The "NAT binding" changed when new TCP connection is established */ /* => NUA re-REGISTERs with newly detected contact */ - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -637,7 +637,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); @@ -656,7 +656,7 @@ "Register with UDP, UDP time-outing, then w/ TCP using rport. "); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); mark_point(); s2->registration->nh = nh; @@ -683,7 +683,7 @@ SIPTAG_VIA(natted_via(m)), TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 401); + fail_unless_event(nua_r_register, 401); nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END()); /* Turn off pong */ @@ -703,7 +703,7 @@ s2_sip_free_message(m); /* NUA detects oops... re-registers UDP */ - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -717,7 +717,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Tue Mar 24 10:30:45 2009 @@ -99,7 +99,7 @@ if (s2->shutdown == 0) { mark_point(); nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); } mark_point(); @@ -242,7 +242,7 @@ } ta_end(ta); - fail_unless(s2_check_event(nua_r_invite, status)); + fail_unless_event(nua_r_invite, status); return s2_sip_wait_for_request(SIP_METHOD_PRACK); } @@ -264,12 +264,12 @@ SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); } @@ -322,7 +322,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); return nh; @@ -343,7 +343,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); } @@ -366,14 +366,14 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); nua_authenticate(nh, NUTAG_AUTH("Digest:\"s2test\":abc:abc"), TAG_END()); bye = s2_sip_wait_for_request(SIP_METHOD_BYE); fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_if(s2->events); } @@ -396,12 +396,12 @@ fail_if(!cancel); s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(cancel); - fail_unless(s2_check_event(nua_r_cancel, 200)); + fail_unless_event(nua_r_cancel, 200); s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END()); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 487)); + fail_unless_event(nua_r_invite, 487); } static void @@ -414,7 +414,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, ta_tags(ta))); ta_end(ta); - fail_unless(s2_check_event(nua_i_bye, 200)); + fail_unless_event(nua_i_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE)); } @@ -598,7 +598,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); nua_bye(nh, TAG_END()); @@ -608,7 +608,7 @@ fail_unless(tport_is_tcp(bye->tport)); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -669,12 +669,12 @@ SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_unless(ack && tport_is_tcp(ack->tport)); @@ -734,9 +734,9 @@ fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 487)); + fail_unless_event(nua_r_invite, 487); fail_unless(s2_check_callstate(nua_callstate_terminated)); - fail_unless(s2_check_event(nua_r_cancel, 200)); + fail_unless_event(nua_r_cancel, 200); fail_if(s2->events != NULL); nua_handle_destroy(nh); @@ -791,7 +791,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); cancel_by_nua(nh, invite, dialog, TAG_END()); @@ -823,7 +823,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -834,7 +834,7 @@ s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END()); s2_sip_free_message(cancel); - fail_unless(s2_check_event(nua_r_cancel, 481)); + fail_unless_event(nua_r_cancel, 481); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -872,7 +872,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_bye(nh, TAG_END()); @@ -883,7 +883,7 @@ s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END()); s2_sip_free_message(cancel); - fail_unless(s2_check_event(nua_r_cancel, 481)); + fail_unless_event(nua_r_cancel, 481); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -893,7 +893,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -935,7 +935,7 @@ s2_sip_free_message(response); fail_if(s2_sip_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_cancel, 200)); + fail_unless_event(nua_i_cancel, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); response = s2_sip_wait_for_response(200, SIP_METHOD_CANCEL); @@ -990,7 +990,7 @@ s2_sip_free_message(response); fail_if(s2_sip_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_cancel, 200)); + fail_unless_event(nua_i_cancel, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); response = s2_sip_wait_for_response(200, SIP_METHOD_CANCEL); @@ -1029,7 +1029,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -1045,8 +1045,8 @@ s2_sip_free_message(cancel); } - fail_unless(s2_check_event(nua_r_cancel, 408)); - fail_unless(s2_check_event(nua_r_invite, 408)); + fail_unless_event(nua_r_cancel, 408); + fail_unless_event(nua_r_invite, 408); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); } @@ -1074,7 +1074,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -1088,7 +1088,7 @@ s2_nua_fast_forward(1, s2base->root); } - fail_unless(s2_check_event(nua_r_invite, 408)); + fail_unless_event(nua_r_invite, 408); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); } @@ -1117,7 +1117,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -1138,7 +1138,7 @@ s2->registration->nh = NULL; nua_set_params(s2->nua, NUTAG_SHUTDOWN_EVENTS(1), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); nua_shutdown(s2->nua); event = s2_wait_for_event(nua_r_shutdown, 100); @@ -1202,7 +1202,7 @@ SIPTAG_RECORD_ROUTE(rr), TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); if (rr == NULL) @@ -1319,7 +1319,7 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); prack = respond_with_100rel(invite, dialog, with_sdp = 0, SIP_180_RINGING, @@ -1330,7 +1330,7 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); /* Change the record-route */ rr->r_url->url_user = "record2"; @@ -1338,7 +1338,7 @@ SIPTAG_RECORD_ROUTE(rr), TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_if(!ack); @@ -1383,7 +1383,7 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); prack = respond_with_100rel(invite, dialog, with_sdp = 0, SIP_180_RINGING, @@ -1391,11 +1391,11 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1450,7 +1450,7 @@ SIPTAG_REQUIRE_STR("100rel"), TAG_END()); s2_sip_free_message(prack), prack = NULL; - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); fail_unless(s2_check_callstate(nua_callstate_proceeding)); update = s2_sip_wait_for_request(SIP_METHOD_UPDATE); @@ -1463,7 +1463,7 @@ TAG_END()); s2_sip_free_message(update), update = NULL; - fail_unless(s2_check_event(nua_r_update, 200)); + fail_unless_event(nua_r_update, 200); fail_unless(s2_check_callstate(nua_callstate_proceeding)); prack = respond_with_100rel(invite, dialog, with_sdp = 0, @@ -1472,11 +1472,11 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1518,7 +1518,7 @@ SIPTAG_REQUIRE_STR("100rel"), SIPTAG_RSEQ(rs), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 183)); + fail_unless_event(nua_r_invite, 183); fail_unless(s2_check_callstate(nua_callstate_proceeding)); sip_rack_init(rack)->ra_response = s2_rseq; @@ -1532,14 +1532,14 @@ s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); respond_with_sdp( prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1554,7 +1554,7 @@ TAG_END()); s2_sip_free_message(update), update = NULL; - fail_unless(s2_check_event(nua_r_update, 200)); + fail_unless_event(nua_r_update, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); bye_to_nua(nh, TAG_END()); @@ -1594,7 +1594,7 @@ SIPTAG_REQUIRE_STR("100rel"), SIPTAG_RSEQ(rs), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 183)); + fail_unless_event(nua_r_invite, 183); fail_unless(s2_check_callstate(nua_callstate_proceeding)); sip_rack_init(rack)->ra_response = s2_rseq; @@ -1609,7 +1609,7 @@ prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); fail_unless(s2_check_callstate(nua_callstate_proceeding)); update = s2_sip_wait_for_request(SIP_METHOD_UPDATE); @@ -1618,7 +1618,7 @@ s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); process_offer(update); @@ -1627,7 +1627,7 @@ TAG_END()); s2_sip_free_message(update), update = NULL; - fail_unless(s2_check_event(nua_r_update, 200)); + fail_unless_event(nua_r_update, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1681,7 +1681,7 @@ fail_if(!ack); s2_sip_free_message(ack); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); } @@ -1727,7 +1727,7 @@ fail_if(soa_process_reject(soa, NULL) < 0); /* We get nua_r_invite with 100 trying (and 500 in sip->sip_status) */ - fail_unless(s2_check_event(nua_r_invite, 100)); + fail_unless_event(nua_r_invite, 100); s2_nua_fast_forward(10, s2base->root); @@ -1737,7 +1737,7 @@ process_offer(invite); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_if(!ack); @@ -1780,13 +1780,13 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); s2_nua_fast_forward(10, s2base->root); nua_set_hparams(nh, NUTAG_REFRESH_WITHOUT_SDP(1), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_INVITE, NULL, SIPTAG_USER_AGENT_STR("evil (evil) evil"), @@ -1805,7 +1805,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); bye_by_nua(nh, TAG_END()); @@ -1842,7 +1842,7 @@ process_answer(ack); s2_sip_free_message(ack); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); bye_by_nua(nh, TAG_END()); @@ -1894,7 +1894,7 @@ fail_if(!ack); fail_if(strcmp(ack->sip->sip_to->a_display, "UAS Changed")); s2_sip_free_message(ack); - fail_unless(s2_check_event(nua_r_invite, 403)); + fail_unless_event(nua_r_invite, 403); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -1929,11 +1929,11 @@ fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); if (i == 3) break; - fail_unless(s2_check_event(nua_r_invite, 100)); + fail_unless_event(nua_r_invite, 100); s2_nua_fast_forward(5, s2base->root); } - fail_unless(s2_check_event(nua_r_invite, 500)); + fail_unless_event(nua_r_invite, 500); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -1961,7 +1961,7 @@ s2_sip_free_message(invite); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 403)); + fail_unless_event(nua_r_invite, 403); /* Return to previous state */ fail_unless(s2_check_callstate(nua_callstate_ready)); @@ -1999,18 +1999,18 @@ fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); if (i == 3) break; - fail_unless(s2_check_event(nua_r_invite, 100)); + fail_unless_event(nua_r_invite, 100); s2_nua_fast_forward(5, s2base->root); } - fail_unless(s2_check_event(nua_r_invite, 500)); + fail_unless_event(nua_r_invite, 500); /* Graceful termination */ fail_unless(s2_check_callstate(nua_callstate_terminating)); bye = s2_sip_wait_for_request(SIP_METHOD_BYE); fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -2038,7 +2038,7 @@ s2_sip_respond_to(invite, NULL, SIP_491_REQUEST_PENDING, TAG_END()); s2_sip_free_message(invite); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 491)); + fail_unless_event(nua_r_invite, 491); /* Return to previous state */ fail_unless(s2_check_callstate(nua_callstate_ready)); @@ -2088,7 +2088,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); soa_generate_offer(soa, 1, NULL); @@ -2137,7 +2137,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); nua_handle_destroy(nh); } @@ -2157,7 +2157,7 @@ mark_point(); nua_set_hparams(nh, NUTAG_APPL_METHOD("BYE"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); @@ -2174,7 +2174,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE)); @@ -2197,7 +2197,7 @@ mark_point(); nua_set_hparams(nh, NUTAG_APPL_METHOD("BYE"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2212,7 +2212,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_respond(nh, 200, "OKOK", NUTAG_WITH(i_bye->data->e_msg), TAG_END()); @@ -2236,7 +2236,7 @@ mark_point(); nua_set_hparams(nh, NUTAG_APPL_METHOD("BYE"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2251,7 +2251,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -2271,14 +2271,14 @@ nh = invite_to_nua(TAG_END()); nua_set_hparams(nh, NUTAG_AUTOANSWER(0), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE)); nua_bye(nh, TAG_END()); - fail_unless(s2_check_event(nua_i_invite, 100)); + fail_unless_event(nua_i_invite, 100); fail_unless(s2_check_callstate(nua_callstate_received)); do { @@ -2309,14 +2309,14 @@ nh = invite_to_nua(TAG_END()); nua_set_hparams(nh, NUTAG_AUTOANSWER(0), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE)); nua_bye(nh, TAG_END()); - fail_unless(s2_check_event(nua_i_invite, 100)); + fail_unless_event(nua_i_invite, 100); fail_unless(s2_check_callstate(nua_callstate_received)); bye = s2_sip_wait_for_request(SIP_METHOD_BYE); @@ -2352,7 +2352,7 @@ request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE)); nua_bye(nh, TAG_END()); - fail_unless(s2_check_event(nua_i_invite, 100)); + fail_unless_event(nua_i_invite, 100); fail_unless(s2_check_callstate(nua_callstate_received)); nua_respond(nh, SIP_486_BUSY_HERE, TAG_END()); @@ -2445,7 +2445,7 @@ fail_if(!bye); fail_unless(s2_check_callstate(nua_callstate_calling)); - fail_unless(s2_check_event(nua_r_invite, 501)); + fail_unless_event(nua_r_invite, 501); fail_unless(s2_check_callstate(nua_callstate_terminating)); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2483,12 +2483,12 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2533,7 +2533,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); s2_nua_fast_forward(300, s2base->root); @@ -2542,7 +2542,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_if(s2->events); @@ -2579,7 +2579,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); s2_nua_fast_forward(160, s2base->root); @@ -2588,7 +2588,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_if(s2->events); @@ -2662,7 +2662,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_handle_destroy(nh); @@ -2690,11 +2690,11 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); nua_handle_destroy(nh); @@ -2726,11 +2726,11 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); nua_ack(nh, TAG_END()); @@ -2793,7 +2793,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_handle_destroy(nh); @@ -2822,11 +2822,11 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); nua_handle_destroy(nh); @@ -2892,7 +2892,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_handle_destroy(nh); @@ -3156,7 +3156,7 @@ nua_handle_destroy(nh); nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END()); @@ -3202,7 +3202,7 @@ "Test multithreading nua_respond() API with OPTIONS."); nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END()); @@ -3354,7 +3354,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); notify1 = s2_sip_wait_for_request(SIP_METHOD_NOTIFY); @@ -3362,7 +3362,7 @@ respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Tue Mar 24 10:30:45 2009 @@ -80,7 +80,7 @@ nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); s2_nua_teardown(); } @@ -509,7 +509,7 @@ nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"), SIPTAG_ALLOW_EVENTS_STR(event), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); ta_start(ta, tag, value); s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL, @@ -550,7 +550,7 @@ s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE); nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL, SIPTAG_EVENT_STR("presence"), @@ -558,7 +558,7 @@ s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE); nua_set_params(nua, SIPTAG_ALLOW_EVENTS_STR("presence"), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL, SIPTAG_EVENT_STR("presence"), @@ -601,7 +601,7 @@ "terminated")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_handle_destroy(nh); } END_TEST @@ -629,7 +629,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "active")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); s2_nua_fast_forward(300, s2base->root); @@ -640,7 +640,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "terminated")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_handle_destroy(nh); } @@ -682,7 +682,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "active")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_notify(nh, NUTAG_SUBSTATE(nua_substate_active), @@ -728,7 +728,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "active")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_notify(nh, NUTAG_SUBSTATE(nua_substate_active), From mikej at freeswitch.org Tue Mar 24 08:32:08 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:32:08 -0500 Subject: [Freeswitch-svn] [commit] r12732 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua Message-ID: Author: mikej Date: Tue Mar 24 10:32:08 2009 New Revision: 12732 Log: Thu Mar 5 10:20:11 CST 2009 Pekka Pessi * check_nua: s2_setup_logs() now turns on transport logging, too Ignore-this: 4ad4dc1efaf76c34a46038586a00e084 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:32:08 2009 @@ -1 +1 @@ -Tue Mar 24 10:29:44 CDT 2009 +Tue Mar 24 10:30:39 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Tue Mar 24 10:32:08 2009 @@ -295,6 +295,11 @@ su_log_soft_set_level(nea_log, level); su_log_soft_set_level(nta_log, level); su_log_soft_set_level(tport_log, level); + + if (getenv("TPORT_LOG") == NULL && getenv("S2_TPORT_LOG") == NULL) { + if (s2sip) + tport_set_params(s2sip->master, TPTAG_LOG(level > 1), TAG_END()); + } } nua_t *s2_nua_setup(char const *label, From mikej at freeswitch.org Tue Mar 24 08:32:49 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:32:49 -0500 Subject: [Freeswitch-svn] [commit] r12733 - in freeswitch/trunk/libs/sofia-sip: . s2check Message-ID: Author: mikej Date: Tue Mar 24 10:32:49 2009 New Revision: 12733 Log: Thu Mar 5 11:44:15 CST 2009 Pekka Pessi * s2check.h: redefine tcase_add_loop_test, too Ignore-this: 149c19e8d089b60e8ddcb98da54c9d88 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2check.h freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:32:49 2009 @@ -1 +1 @@ -Tue Mar 24 10:30:39 CDT 2009 +Tue Mar 24 10:31:53 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2check.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2check.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2check.h Tue Mar 24 10:32:49 2009 @@ -42,10 +42,16 @@ SOFIA_BEGIN_DECLS #undef tcase_add_test +#undef tcase_add_loop_test + /* Redirect tcase_add_test() to our function */ -#define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "") +#define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "", 0, 0, 1) + +void s2_tcase_add_test(TCase *, TFun, char const *name, + int signo, int start, int end); -void s2_tcase_add_test(TCase *, TFun, char const *name); +#define tcase_add_loop_test(tc, tf, s, e) \ + s2_tcase_add_test(tc, tf, "" #tf "", 0, (s), (e)) void s2_select_tests(char const *pattern); Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c Tue Mar 24 10:32:49 2009 @@ -46,7 +46,8 @@ * A special version of tcase_add_test() that inserts test function into * tcase only if its name matches given pattern. */ -void s2_tcase_add_test(TCase *tc, TFun tf, char const *name) +void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, + int signo, int start, int end) { char const * const *patterns; @@ -54,9 +55,9 @@ for (patterns = test_patterns; *patterns; patterns++) { if (!fnmatch(*patterns, name, 0)) { if (strcmp(*patterns, "*")) { - printf("%s: running\n", name); + printf("%s: selected\n", name); } - _tcase_add_test(tc, tf, name, 0, 0, 1); + _tcase_add_test(tc, tf, name, signo, start, end); return; } } @@ -64,9 +65,9 @@ for (patterns = test_patterns; *patterns; patterns++) { if (!strcmp(*patterns, name) || !strcmp(*patterns, "*")) { if (strcmp(*patterns, "*")) { - printf("%s: running\n", name); + printf("%s: selected\n", name); } - _tcase_add_test(tc, tf, name, 0, 0, 1); + _tcase_add_test(tc, tf, name, signo, start, end); return; } } From mikej at freeswitch.org Tue Mar 24 08:33:33 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:33:33 -0500 Subject: [Freeswitch-svn] [commit] r12734 - in freeswitch/trunk/libs/sofia-sip: . s2check Message-ID: Author: mikej Date: Tue Mar 24 10:33:33 2009 New Revision: 12734 Log: Thu Mar 5 12:29:30 CST 2009 Pekka Pessi * s2base.h: added S2_CASE(), added test function name to s2_case() parameters Ignore-this: c9ceff2812044e2643c21548be29233e Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2base.c freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:33:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:31:53 CDT 2009 +Tue Mar 24 10:32:33 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Tue Mar 24 10:33:33 2009 @@ -126,13 +126,15 @@ void s2_case(char const *number, char const *title, - char const *description) + char const *description, + char const *function) { stamps.start = now(); _s2_case = number; if (s2_start_stop) - printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title); + printf("%s - starting %s (%s/%s %s)\n", s2_tester, function, + _s2_suite, _s2_case, title); } void s2_step(void) Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Tue Mar 24 10:33:33 2009 @@ -44,7 +44,16 @@ void s2_case(char const *tag, char const *title, - char const *description); + char const *description, + char const *function); + +#if HAVE_FUNC +#define S2_CASE(n, t, d) s2_case((n),(t),(d), __func__) +#elif HAVE_FUNCTION +#define S2_CASE(n, t, d) s2_case((n),(t),(d), __FUNCTION__) +#else +#define S2_CASE(n, t, d) s2_case((n),(t),(d), "") +#endif void s2_teardown_started(char const *label); void s2_teardown(void); From mikej at freeswitch.org Tue Mar 24 08:34:23 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:34:23 -0500 Subject: [Freeswitch-svn] [commit] r12735 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua Message-ID: Author: mikej Date: Tue Mar 24 10:34:23 2009 New Revision: 12735 Log: Thu Mar 5 13:04:56 CST 2009 Pekka Pessi * check_nua: use S2_CASE() Ignore-this: 85691a39065d7ad3da57f45fe87c1da Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:34:23 2009 @@ -1 +1 @@ -Tue Mar 24 10:32:33 CDT 2009 +Tue Mar 24 10:33:24 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c Tue Mar 24 10:34:23 2009 @@ -201,7 +201,7 @@ struct message *invite; struct message *bye; - s2_case("6.1.1", "SIP_CC_OE_CE_V_019", + S2_CASE("6.1.1", "SIP_CC_OE_CE_V_019", "Ensure that the IUT when an INVITE client transaction " "is in the Calling state, on receipt of Success (200 OK) " "responses differing only on the tag in the To header, " @@ -241,7 +241,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("6.1.2", "SIP_CC_OE_CE_TI_008", + S2_CASE("6.1.2", "SIP_CC_OE_CE_TI_008", "If an unreliable transport is used, ensure that " "the IUT, when an INVITE client transaction is in " "the Completed state, on receipt of final responses " @@ -291,7 +291,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("6.1.2", "SIP_CC_OE_CE_TI_011_012", + S2_CASE("6.1.2", "SIP_CC_OE_CE_TI_011_012", "Ensure that the IUT, when an INVITE client transaction " "has been in the Terminated state, on receipt of a " "retransmitted Success (200 OK) responses sends an ACK " Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Tue Mar 24 10:34:23 2009 @@ -117,7 +117,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.0.1", "Failed Register", "REGISTER returned 403 response"); + S2_CASE("1.0.1", "Failed Register", "REGISTER returned 403 response"); nua_register(nh, TAG_END()); @@ -135,7 +135,7 @@ START_TEST(register_1_1_1) { - s2_case("1.1.1", "Basic Register", "REGISTER returning 200 OK"); + S2_CASE("1.1.1", "Basic Register", "REGISTER returning 200 OK"); s2_register_setup(); @@ -149,7 +149,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.1.2", "Register with dual authentication", + S2_CASE("1.1.2", "Register with dual authentication", "Register, authenticate"); nh = nua_handle(nua, NULL, TAG_END()); @@ -230,7 +230,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.2.1", "Register behind NAT", + S2_CASE("1.2.1", "Register behind NAT", "Register through NAT, detect NAT, re-REGISTER"); nh = nua_handle(nua, NULL, TAG_END()); @@ -324,7 +324,7 @@ { nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); - s2_case("1.2.2.1", "Register behind NAT", + S2_CASE("1.2.2.1", "Register behind NAT", "Authenticate, outbound activated"); mark_point(); @@ -339,7 +339,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.2.2.2", "Register behind NAT", + S2_CASE("1.2.2.2", "Register behind NAT", "Authenticate, outbound activated, " "authenticate OPTIONS probe, " "NAT binding change"); @@ -421,7 +421,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.2.2.3", "Register behind NAT", + S2_CASE("1.2.2.3", "Register behind NAT", "Authenticate, outbound activated, " "detect NAT binding change when re-REGISTERing"); @@ -476,7 +476,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.2.3", "Register behind NAT", + S2_CASE("1.2.3", "Register behind NAT", "Outbound activated by error response"); nh = nua_handle(nua, NULL, TAG_END()); @@ -525,7 +525,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.3.1", "Register over TCP via NAT", + S2_CASE("1.3.1", "Register over TCP via NAT", "REGISTER via TCP, detect NTA, re-REGISTER"); nh = nua_handle(nua, NULL, TAG_END()); @@ -576,7 +576,7 @@ { nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); - s2_case("1.3.2.1", "Register behind NAT", + S2_CASE("1.3.2.1", "Register behind NAT", "Authenticate, outbound activated"); mark_point(); @@ -593,7 +593,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.3.2.2", "Register behind NAT with TCP", + S2_CASE("1.3.2.2", "Register behind NAT with TCP", "Detect NAT over TCP using rport. " "Authenticate, detect NAT, " "close TCP at server, wait for re-REGISTERs."); @@ -652,7 +652,7 @@ struct message *m; tport_t *tcp; - s2_case("1.3.3.1", "Register behind NAT with UDP and TCP", + S2_CASE("1.3.3.1", "Register behind NAT with UDP and TCP", "Register with UDP, UDP time-outing, then w/ TCP using rport. "); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Tue Mar 24 10:34:23 2009 @@ -428,7 +428,7 @@ { nua_handle_t *nh; - s2_case("2.1.1", "Basic call", + S2_CASE("2.1.1", "Basic call", "NUA sends INVITE, NUA sends BYE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -446,7 +446,7 @@ { nua_handle_t *nh; - s2_case("2.1.2.1", "Basic call", + S2_CASE("2.1.2.1", "Basic call", "NUA sends INVITE, NUA receives BYE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -463,7 +463,7 @@ { nua_handle_t *nh; - s2_case("2.1.2.2", "Basic call over TCP", + S2_CASE("2.1.2.2", "Basic call over TCP", "NUA sends INVITE, NUA receives BYE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), @@ -484,7 +484,7 @@ { nua_handle_t *nh; - s2_case("2.1.3.1", "Incoming call", + S2_CASE("2.1.3.1", "Incoming call", "NUA receives INVITE and BYE"); nh = invite_to_nua(TAG_END()); @@ -500,7 +500,7 @@ { nua_handle_t *nh; - s2_case("2.1.3.2", "Incoming call over TCP", + S2_CASE("2.1.3.2", "Incoming call over TCP", "NUA receives INVITE and BYE"); dialog->tport = s2sip->tcp.tport; @@ -518,7 +518,7 @@ { nua_handle_t *nh; - s2_case("2.1.4", "Incoming call", + S2_CASE("2.1.4", "Incoming call", "NUA receives INVITE and sends BYE"); nh = invite_to_nua(TAG_END()); @@ -534,7 +534,7 @@ { nua_handle_t *nh; - s2_case("2.1.5", "Incoming call", + S2_CASE("2.1.5", "Incoming call", "NUA receives INVITE and sends BYE, BYE is challenged"); nh = invite_to_nua(TAG_END()); @@ -553,7 +553,7 @@ struct event *invite; struct message *response; - s2_case("2.1.6", "Basic call", + S2_CASE("2.1.6", "Basic call", "NUA received INVITE, " "NUA responds (and saves proxy for dialog), " "NUA sends BYE"); @@ -621,7 +621,7 @@ nua_handle_t *nh, *nh2; sip_replaces_t *replaces; - s2_case("2.1.7", "Call lookup", + S2_CASE("2.1.7", "Call lookup", "Test dialog and call-id lookup"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -654,7 +654,7 @@ nua_handle_t *nh; struct message *invite, *ack; - s2_case("2.1.8", "Call using NUTAG_PROXY()", + S2_CASE("2.1.8", "Call using NUTAG_PROXY()", "Test handle-specific NUTAG_PROXY()."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -713,7 +713,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("2.2.1", "Cancel call", + S2_CASE("2.2.1", "Cancel call", "NUA is caller, NUA sends CANCEL immediately"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -749,7 +749,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("2.2.2", "Canceled call", + S2_CASE("2.2.2", "Canceled call", "NUA is caller, NUA sends CANCEL after receiving 100"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -776,7 +776,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("2.2.3", "Canceled call", + S2_CASE("2.2.3", "Canceled call", "NUA is caller, NUA sends CANCEL after receiving 180"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -807,7 +807,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("2.2.4", "Cancel and 200 OK glare", + S2_CASE("2.2.4", "Cancel and 200 OK glare", "NUA is caller, NUA sends CANCEL after receiving 180 " "but UAS already sent 200 OK."); @@ -852,7 +852,7 @@ nua_handle_t *nh; struct message *invite, *cancel, *bye; - s2_case( + S2_CASE( "2.2.5", "Cancel and 200 OK glare", "NUA is caller, " "NUA uses nua_bye() to send CANCEL after receiving 180\n" @@ -907,7 +907,7 @@ struct event *invite; struct message *response; - s2_case("2.2.6", "Cancel call", + S2_CASE("2.2.6", "Cancel call", "NUA is callee, sends 100, 180, INVITE gets canceled"); soa_generate_offer(soa, 1, NULL); @@ -959,7 +959,7 @@ struct message *response; char const *via = "SIP/2.0/UDP host.in.invalid;rport"; - s2_case("2.2.7", "Call gets canceled", + S2_CASE("2.2.7", "Call gets canceled", "NUA is callee, sends 100, 180, INVITE gets canceled. " "Using RFC 2543 dialog and transaction matching."); @@ -1013,7 +1013,7 @@ struct message *invite, *cancel; int timeout; - s2_case("2.2.8", "CANCEL and INVITE times out", + S2_CASE("2.2.8", "CANCEL and INVITE times out", "NUA is caller, NUA sends CANCEL after receiving 180 " "but UAS never responds."); @@ -1058,7 +1058,7 @@ struct message *invite, *cancel; int timeout; - s2_case("2.2.9", "CANCEL a RFC2543 UA", + S2_CASE("2.2.9", "CANCEL a RFC2543 UA", "NUA is caller, NUA sends CANCEL after receiving 180, " "UAS sends 200 OK to CANCEL but no response to INVITE."); @@ -1101,7 +1101,7 @@ struct event *event; int timeout; - s2_case("2.2.10", "CANCEL and INVITE times out", + S2_CASE("2.2.10", "CANCEL and INVITE times out", "NUA is caller, NUA sends CANCEL after receiving 180 " "but UAS never responds."); @@ -1221,7 +1221,7 @@ rr->r_url->url_user = "record"; rr->r_url->url_params = "lr"; - s2_case("2.3.1", "Incoming call with call timers", + S2_CASE("2.3.1", "Incoming call with call timers", "NUA receives INVITE, " "activates call timers, " "sends re-INVITE twice, " @@ -1249,7 +1249,7 @@ { nua_handle_t *nh; - s2_case("2.3.2", "Incoming call with call timers", + S2_CASE("2.3.2", "Incoming call with call timers", "NUA receives INVITE, " "activates call timers, " "sends re-INVITE, " @@ -1294,7 +1294,7 @@ int with_sdp; sip_record_route_t rr[1]; - s2_case("2.4.1", "Call with 100rel", + S2_CASE("2.4.1", "Call with 100rel", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 for it, " "receives 180, sends PRACK, receives 200 for it, " @@ -1357,7 +1357,7 @@ struct message *invite, *prack; int with_sdp; - s2_case("2.4.2", "Call with 100rel", + S2_CASE("2.4.2", "Call with 100rel", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 for it, " "receives 180, sends PRACK, receives 200 for it, " @@ -1425,7 +1425,7 @@ struct message *invite, *prack, *update; int with_sdp; - s2_case("2.5.1", "Call with preconditions", + S2_CASE("2.5.1", "Call with preconditions", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 for it, " "sends UPDATE, receives 200 for it, " @@ -1493,7 +1493,7 @@ sip_rseq_t rs[1]; sip_rack_t rack[1]; - s2_case("2.5.2", "Call with preconditions - send 200 w/ ongoing PRACK ", + S2_CASE("2.5.2", "Call with preconditions - send 200 w/ ongoing PRACK ", "NUA sends INVITE, " "receives 183, sends PRACK, " "receives 200 to INVITE, " @@ -1570,7 +1570,7 @@ sip_rseq_t rs[1]; sip_rack_t rack[1]; - s2_case("2.5.3", "Call with preconditions - send 200 w/ ongoing UPDATE ", + S2_CASE("2.5.3", "Call with preconditions - send 200 w/ ongoing UPDATE ", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 to PRACK, " "sends UPDATE, " @@ -1658,7 +1658,7 @@ struct message *invite, *ack; int i; - s2_case("2.6.1", "Queued re-INVITEs", + S2_CASE("2.6.1", "Queued re-INVITEs", "NUA receives INVITE, " "sends re-INVITE twice, " "sends BYE."); @@ -1696,7 +1696,7 @@ nua_handle_t *nh; struct message *invite, *ack, *response; - s2_case("2.6.2", "Re-INVITE glare", + S2_CASE("2.6.2", "Re-INVITE glare", "NUA sends re-INVITE and then receives re-INVITE, " "sends BYE."); @@ -1754,7 +1754,7 @@ nua_handle_t *nh; struct message *response; - s2_case("2.6.3", "Handling re-INVITE without SDP gracefully", + S2_CASE("2.6.3", "Handling re-INVITE without SDP gracefully", "NUA receives INVITE, " "re-INVITE without SDP (w/o NUTAG_REFRESH_WITHOUT_SDP(), " "re-INVITE without SDP (using NUTAG_REFRESH_WITHOUT_SDP(), " @@ -1819,7 +1819,7 @@ nua_handle_t *nh; struct message *invite, *ack; - s2_case("2.6.4", "re-INVITEs w/o SDP", + S2_CASE("2.6.4", "re-INVITEs w/o SDP", "NUA sends re-INVITE w/o SDP, " "receives SDP w/ offer, " "sends ACK w/ answer, " @@ -1874,7 +1874,7 @@ nua_handle_t *nh; struct message *invite, *ack; - s2_case("3.1.1", "Call failure", "Call fails with 403 response"); + S2_CASE("3.1.1", "Call failure", "Call fails with 403 response"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -1908,7 +1908,7 @@ struct message *invite; int i; - s2_case("3.1.2", "Call fails after too many retries", + S2_CASE("3.1.2", "Call fails after too many retries", "Call fails after 4 times 500 Retry-After"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), @@ -1945,7 +1945,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("3.2.1", "Re-INVITE failure", "Re-INVITE fails with 403 response"); + S2_CASE("3.2.1", "Re-INVITE failure", "Re-INVITE fails with 403 response"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -1976,7 +1976,7 @@ struct message *invite, *bye; int i; - s2_case("3.2.2", "Re-INVITE fails after too many retries", + S2_CASE("3.2.2", "Re-INVITE fails after too many retries", "Call fails after 4 times 500 Retry-After"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), @@ -2023,7 +2023,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("3.2.3", "Re-INVITE failure", "Re-INVITE fails with 491 response"); + S2_CASE("3.2.3", "Re-INVITE failure", "Re-INVITE fails with 491 response"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2071,7 +2071,7 @@ nua_handle_t *nh; struct message *bye, *r481; - s2_case("4.1.1", "Re-INVITE while terminating", + S2_CASE("4.1.1", "Re-INVITE while terminating", "NUA sends BYE, " "BYE is challenged, " "and NUA is re-INVITEd at the same time."); @@ -2113,7 +2113,7 @@ nua_handle_t *nh; struct message *bye, *r481; - s2_case("4.1.2", "Re-INVITE while terminating", + S2_CASE("4.1.2", "Re-INVITE while terminating", "NUA sends BYE, and gets re-INVITEd at same time"); nh = invite_to_nua(TAG_END()); @@ -2149,7 +2149,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.3", "BYE while terminating", + S2_CASE("4.1.3", "BYE while terminating", "NUA sends BYE and receives BYE"); nh = invite_to_nua(TAG_END()); @@ -2190,7 +2190,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.4", "Send BYE after BYE has been received", + S2_CASE("4.1.4", "Send BYE after BYE has been received", "NUA receives BYE, tries to send BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2229,7 +2229,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.5", "Send BYE after BYE has been received", + S2_CASE("4.1.5", "Send BYE after BYE has been received", "NUA receives BYE, tries to send BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2265,7 +2265,7 @@ nua_handle_t *nh; struct message *bye, *r486; - s2_case("4.1.6", "Send BYE after INVITE has been received", + S2_CASE("4.1.6", "Send BYE after INVITE has been received", "NUA receives INVITE, sends BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2303,7 +2303,7 @@ nua_handle_t *nh; struct message *bye, *r486; - s2_case("4.1.7", "Send BYE after INVITE has been received", + S2_CASE("4.1.7", "Send BYE after INVITE has been received", "NUA receives INVITE, sends BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2340,7 +2340,7 @@ nua_handle_t *nh; struct message *bye, *r486; - s2_case("4.1.8", "BYE followed by response to INVITE", + S2_CASE("4.1.8", "BYE followed by response to INVITE", "NUA receives INVITE, sends BYE at same time"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2380,7 +2380,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.6", "Send BYE, receive BYE, destroy", + S2_CASE("4.1.6", "Send BYE, receive BYE, destroy", "NUA sends BYE, receives BYE and handle gets destroyed"); nh = invite_to_nua(TAG_END()); @@ -2424,7 +2424,7 @@ struct message *invite, *bye; struct event *i_bye; - s2_case("4.1.6", "Send auto-BYE upon receiving 501, receive BYE, destroy", + S2_CASE("4.1.6", "Send auto-BYE upon receiving 501, receive BYE, destroy", "NUA sends BYE, receives BYE and handle gets destroyed"); nh = invite_to_nua(TAG_END()); @@ -2475,7 +2475,7 @@ struct message *invite, *ack; struct event *i_bye; - s2_case("4.1.11", "Receive BYE in completing state", + S2_CASE("4.1.11", "Receive BYE in completing state", "NUA sends INVITE, receives 200, receives BYE."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2511,7 +2511,7 @@ nua_handle_t *nh; struct message *bye; - s2_case("4.2.1", "BYE in progress while call timer expires", + S2_CASE("4.2.1", "BYE in progress while call timer expires", "NUA receives INVITE, " "activates call timers, " "sends BYE, BYE challenged, " @@ -2555,7 +2555,7 @@ nua_handle_t *nh; struct message *bye; - s2_case("4.2.2", "BYE in progress while call timer expires", + S2_CASE("4.2.2", "BYE in progress while call timer expires", "NUA receives INVITE, " "activates call timers, " "sends BYE, BYE challenged, " @@ -2626,7 +2626,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.1", "Destroy handle after INVITE sent", + S2_CASE("4.3.1", "Destroy handle after INVITE sent", "NUA sends INVITE, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2654,7 +2654,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.2", "Destroy handle in calling state", + S2_CASE("4.3.2", "Destroy handle in calling state", "NUA sends INVITE, receives 180, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2682,7 +2682,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.3", "Destroy handle in completing state", + S2_CASE("4.3.3", "Destroy handle in completing state", "NUA sends INVITE, receives 200, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2718,7 +2718,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.3", "Destroy handle in ready state ", + S2_CASE("4.3.3", "Destroy handle in ready state ", "NUA sends INVITE, receives 200, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2757,7 +2757,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.5", "Destroy handle in re-INVITE calling state", + S2_CASE("4.3.5", "Destroy handle in re-INVITE calling state", "NUA sends re-INVITE, handle gets destroyed."); nh = invite_to_nua(TAG_END()); @@ -2785,7 +2785,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.6", "Destroy handle in calling state of re-INVITE", + S2_CASE("4.3.6", "Destroy handle in calling state of re-INVITE", "NUA sends re-INVITE, receives 180, handle gets destroyed."); nh = invite_to_nua(TAG_END()); @@ -2814,7 +2814,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.7", "Destroy handle in completing state of re-INVITE", + S2_CASE("4.3.7", "Destroy handle in completing state of re-INVITE", "NUA sends INVITE, receives 200, handle gets destroyed."); nh = invite_to_nua(TAG_END()); @@ -2850,7 +2850,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.8", "Destroy handle after INVITE sent", + S2_CASE("4.3.8", "Destroy handle after INVITE sent", "NUA sends INVITE, handle gets destroyed, " "but remote end returns 200 OK. " "Make sure nua tries to release call properly."); @@ -2882,7 +2882,7 @@ nua_handle_t *nh; struct message *invite, *cancel, *ack, *bye; - s2_case("4.3.9", "Destroy handle in calling state", + S2_CASE("4.3.9", "Destroy handle in calling state", "NUA sends INVITE, receives 180, handle gets destroyed, " "but remote end returns 200 OK. " "Make sure nua tries to release call properly."); @@ -2923,7 +2923,7 @@ struct event *invite; struct message *response; - s2_case("4.4.1", "Destroy handle while call is on-going", + S2_CASE("4.4.1", "Destroy handle while call is on-going", "NUA is callee, sends 100, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -2958,7 +2958,7 @@ struct event *invite; struct message *response; - s2_case("4.4.1", "Destroy handle while call is on-going", + S2_CASE("4.4.1", "Destroy handle while call is on-going", "NUA is callee, sends 180, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -2999,7 +2999,7 @@ struct event *invite; struct message *response, *bye; - s2_case("4.4.3.1", "Destroy handle while call is on-going", + S2_CASE("4.4.3.1", "Destroy handle while call is on-going", "NUA is callee, sends 200, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -3053,7 +3053,7 @@ struct event *invite; struct message *response, *bye; - s2_case("4.4.3.1", "Destroy handle while call is on-going", + S2_CASE("4.4.3.1", "Destroy handle while call is on-going", "NUA is callee, sends 200, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -3139,7 +3139,7 @@ nua_handle_t *nh; struct message *response; - s2_case("5.1.1", "Test nua_respond() API", + S2_CASE("5.1.1", "Test nua_respond() API", "Test nua_respond() API with OPTIONS."); s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END()); @@ -3198,7 +3198,7 @@ pthread_t tid; void *thread_return = NULL; - s2_case("5.1.2", "Test nua_respond() API with another thread", + S2_CASE("5.1.2", "Test nua_respond() API with another thread", "Test multithreading nua_respond() API with OPTIONS."); nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END()); @@ -3262,7 +3262,7 @@ struct event *refer; struct message *notify; - s2_case("5.2.1", "Receive REFER", + S2_CASE("5.2.1", "Receive REFER", "Make a call, receive REFER."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -3299,7 +3299,7 @@ struct message *notify0, *notify1, *notify2; struct dialog *dialog1, *dialog2; - s2_case("5.2.2", "Receive REFER", + S2_CASE("5.2.2", "Receive REFER", "Make a call, receive REFER, " "make another call with automatic NOTIFYs"); @@ -3395,7 +3395,7 @@ START_TEST(empty) { - s2_case("0.0.0", "Empty test case", + S2_CASE("0.0.0", "Empty test case", "Detailed explanation for empty test case."); tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END()); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Tue Mar 24 10:34:23 2009 @@ -265,7 +265,7 @@ { nua_handle_t *nh; struct event *notify; - s2_case("6.1.1", "Basic subscription", + S2_CASE("6.1.1", "Basic subscription", "NUA sends SUBSCRIBE, waits for NOTIFY, sends un-SUBSCRIBE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -283,7 +283,7 @@ struct message *subscribe, *response; struct event *notify, *event; - s2_case("6.1.2", "Basic subscription with refresh", + S2_CASE("6.1.2", "Basic subscription with refresh", "NUA sends SUBSCRIBE, waits for NOTIFY, " "sends re-SUBSCRIBE, waits for NOTIFY, " "sends un-SUBSCRIBE"); @@ -331,7 +331,7 @@ struct message *response; struct event *notify, *event; - s2_case("6.1.3", "Subscription terminated by notifier", + S2_CASE("6.1.3", "Subscription terminated by notifier", "NUA sends SUBSCRIBE, waits for NOTIFY, " "gets NOTIFY terminating the subscription,"); @@ -361,7 +361,7 @@ struct message *response; struct event *notify, *event; - s2_case("6.1.4", "Subscription terminated by notifier, re-established", + S2_CASE("6.1.4", "Subscription terminated by notifier, re-established", "NUA sends SUBSCRIBE, waits for NOTIFY, " "gets NOTIFY terminating the subscription,"); @@ -419,7 +419,7 @@ nua_handle_t *nh; struct event *notify; - s2_case("6.2.1", "Event fetch - NOTIFY after 202", + S2_CASE("6.2.1", "Event fetch - NOTIFY after 202", "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -436,7 +436,7 @@ nua_handle_t *nh; struct event *notify; - s2_case("6.2.2", "Event fetch - NOTIFY before 200", + S2_CASE("6.2.2", "Event fetch - NOTIFY before 200", "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY"); send_notify_before_response = 1; @@ -456,7 +456,7 @@ struct message *subscribe; struct event *event; - s2_case("6.2.3", "Event fetch - no NOTIFY", + S2_CASE("6.2.3", "Event fetch - no NOTIFY", "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY, times out"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -539,7 +539,7 @@ struct message *notify, *response; sip_t *sip; - s2_case("6.3.1", "Basic NOTIFY server", + S2_CASE("6.3.1", "Basic NOTIFY server", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "First NOTIFY terminates subscription. "); @@ -612,7 +612,7 @@ struct message *notify; sip_t *sip; - s2_case("6.3.2", "NOTIFY server - automatic subscription termination", + S2_CASE("6.3.2", "NOTIFY server - automatic subscription termination", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates with timeout. "); @@ -664,7 +664,7 @@ struct event *response; sip_t *sip; - s2_case("6.3.3", "NOTIFY server - terminate with error response to NOTIFY", + S2_CASE("6.3.3", "NOTIFY server - terminate with error response to NOTIFY", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates when watcher " "returns 481 to second NOTIFY."); @@ -709,7 +709,7 @@ struct event *response; sip_t *sip; - s2_case("6.3.4", "NOTIFY server - terminate with error response to NOTIFY", + S2_CASE("6.3.4", "NOTIFY server - terminate with error response to NOTIFY", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates when watcher " "returns 481 to second NOTIFY. The queued 3rd NOTIFY gets " @@ -778,7 +778,7 @@ START_TEST(empty) { - s2_case("0.0.0", "Empty test case", + S2_CASE("0.0.0", "Empty test case", "Detailed explanation for empty test case."); tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END()); From mikej at freeswitch.org Tue Mar 24 08:36:03 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:36:03 -0500 Subject: [Freeswitch-svn] [commit] r12736 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta Message-ID: Author: mikej Date: Tue Mar 24 10:36:03 2009 New Revision: 12736 Log: Thu Mar 5 13:06:15 CST 2009 Pekka Pessi * check_nta: use S2_CASE() Ignore-this: c94d4219b0882f1343bcfc56f975ea48 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:36:03 2009 @@ -1 +1 @@ -Tue Mar 24 10:33:24 CDT 2009 +Tue Mar 24 10:35:04 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Tue Mar 24 10:36:03 2009 @@ -95,7 +95,7 @@ struct message *request; struct event *response; - s2_case("2.0.0", "Send MESSAGE", + S2_CASE("2.0.0", "Send MESSAGE", "Basic non-INVITE transaction with outbound proxy"); orq = nta_outgoing_tcreate(s2->default_leg, @@ -123,7 +123,7 @@ struct message *request; struct event *response; - s2_case("2.0.0", "Send MESSAGE", + S2_CASE("2.0.0", "Send MESSAGE", "Basic non-INVITE transaction with " "numeric per-transaction outbound proxy"); @@ -155,7 +155,7 @@ char payload[2048]; - s2_case("2.0.2", "Send MESSAGE", + S2_CASE("2.0.2", "Send MESSAGE", "Basic non-INVITE transaction exceeding " "default path MTU (1300 bytes)"); @@ -210,7 +210,7 @@ char payload[2048]; - s2_case("2.1.0", "Try UDP after trying with TCP", + S2_CASE("2.1.0", "Try UDP after trying with TCP", "TCP connect() is refused"); memset(payload, 'x', sizeof payload); @@ -279,7 +279,7 @@ char payload[2048]; - s2_case("2.1.1", "Try UDP after trying with TCP", + S2_CASE("2.1.1", "Try UDP after trying with TCP", "TCP connect() times out"); memset(payload, 'x', sizeof payload); @@ -337,7 +337,7 @@ struct event *response; url_t udpurl[1]; - s2_case("2.1.2", "Send MESSAGE", + S2_CASE("2.1.2", "Send MESSAGE", "Non-INVITE transaction to TCP-only server"); client_setup_tcp_only_server(); From mikej at freeswitch.org Tue Mar 24 08:37:01 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:37:01 -0500 Subject: [Freeswitch-svn] [commit] r12737 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv Message-ID: Author: mikej Date: Tue Mar 24 10:37:01 2009 New Revision: 12737 Log: Thu Mar 5 13:21:25 CST 2009 Pekka Pessi * check_sres_sip.c: use S2_CASE() Ignore-this: da194ea35fa98a73f3da3b4b5257aa8f Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:37:01 2009 @@ -1 +1 @@ -Tue Mar 24 10:35:04 CDT 2009 +Tue Mar 24 10:36:05 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/check_sres_sip.c Tue Mar 24 10:37:01 2009 @@ -160,7 +160,7 @@ sres_sip_t *srs; #if 0 - s2_case("1.0", "Check invalid input values", + S2_CASE("1.0", "Check invalid input values", "Detailed explanation for empty test case."); #endif From mikej at freeswitch.org Tue Mar 24 08:37:43 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:37:43 -0500 Subject: [Freeswitch-svn] [commit] r12738 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta Message-ID: Author: mikej Date: Tue Mar 24 10:37:43 2009 New Revision: 12738 Log: Thu Mar 5 13:06:59 CST 2009 Pekka Pessi * run_test_nta: fixed bashism with exec Ignore-this: 6d034eb8fd66f6a903e3219589f62eef Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:37:43 2009 @@ -1 +1 @@ -Tue Mar 24 10:36:05 CDT 2009 +Tue Mar 24 10:36:48 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/run_test_nta Tue Mar 24 10:37:43 2009 @@ -188,7 +188,7 @@ # -g is also very nice option for named named -f -c $namedfile & pid=$! -while ! test -r $pidfile && kill -0 $! +while ! test -r $pidfile && kill -0 $! 2>/dev/null do sleep 1 done @@ -205,12 +205,10 @@ exit $exit else echo "$0: cannot start named (check apparmor/selinux)" - exec ipv6=$ipv6 $VALGRIND ./test_nta "$@" + ipv6=$ipv6 $VALGRIND exec ./test_nta "$@" fi else # not having BIND and portbind - -ipv6=$ipv6 $VALGRIND ./test_nta "$@" -exit $? + ipv6=$ipv6 $VALGRIND exec ./test_nta "$@" fi From mikej at freeswitch.org Tue Mar 24 08:38:33 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:38:33 -0500 Subject: [Freeswitch-svn] [commit] r12739 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta Message-ID: Author: mikej Date: Tue Mar 24 10:38:33 2009 New Revision: 12739 Log: Thu Mar 5 13:08:22 CST 2009 Pekka Pessi * nta.c: nta_leg_tag(leg, NULL) now always returns the tag (old or new) Ignore-this: f5a7d67ed90e2c284f6696d6b5b89326 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 24 10:38:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:36:48 CDT 2009 +Tue Mar 24 10:37:37 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 24 10:38:33 2009 @@ -4391,7 +4391,7 @@ /* If there already is a tag, return NULL if it does not match with new one */ if (leg->leg_local->a_tag) { - if (su_casematch(tag, leg->leg_local->a_tag)) + if (tag == NULL || su_casematch(tag, leg->leg_local->a_tag)) return leg->leg_local->a_tag; else return NULL; From mikej at freeswitch.org Tue Mar 24 08:39:08 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:39:08 -0500 Subject: [Freeswitch-svn] [commit] r12740 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta Message-ID: Author: mikej Date: Tue Mar 24 10:39:08 2009 New Revision: 12740 Log: Thu Mar 5 13:09:53 CST 2009 Pekka Pessi * nta.c: #include here Ignore-this: bab8054edc65e3defbed6db325e1deba Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:39:08 2009 @@ -1 +1 @@ -Tue Mar 24 10:37:37 CDT 2009 +Tue Mar 24 10:38:12 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 24 10:39:08 2009 @@ -74,6 +74,7 @@ #include #include +#include /* Resolver context type */ #define SRES_CONTEXT_T nta_outgoing_t Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Tue Mar 24 10:39:08 2009 @@ -47,7 +47,6 @@ #if HAVE_SOFIA_SRESOLV #include #endif -#include typedef struct nta_compressor nta_compressor_t; From mikej at freeswitch.org Tue Mar 24 08:40:31 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:40:31 -0500 Subject: [Freeswitch-svn] [commit] r12741 - in freeswitch/trunk/libs/sofia-sip: . s2check Message-ID: Author: mikej Date: Tue Mar 24 10:40:31 2009 New Revision: 12741 Log: Thu Mar 5 13:20:53 CST 2009 Pekka Pessi * s2util.h, s2time.c: added s2_timed_logger() Ignore-this: 504e7e5c1201b0b2d5c345c31d5d4b71 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2time.c freeswitch/trunk/libs/sofia-sip/s2check/s2util.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:40:31 2009 @@ -1 +1 @@ -Tue Mar 24 10:38:12 CDT 2009 +Tue Mar 24 10:39:35 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2time.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2time.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2time.c Tue Mar 24 10:40:31 2009 @@ -26,6 +26,9 @@ #include "s2util.h" +#include +#include + /* -- Delay scenarios --------------------------------------------------- */ static unsigned long time_offset; @@ -49,3 +52,23 @@ su_root_step(root, 0); } +void +s2_timed_logger(void *stream, char const *fmt, va_list ap) +{ + char buffer[4096]; + su_time_t now = su_now(); + size_t prefix, wrote; + int n; + + snprintf(buffer, sizeof buffer, + "%02u:%02u:%02u.%06lu[+%lu] ", + (unsigned)(now.tv_sec / 3600 % 24), + (unsigned)(now.tv_sec / 60 % 60), + (unsigned)(now.tv_sec % 60), + now.tv_usec, + time_offset); + prefix = strlen(buffer); + n = vsnprintf(buffer + prefix, (sizeof buffer) - prefix, fmt, ap); + if (n > 0) + wrote = fwrite(buffer, prefix + n, 1, stream); +} Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2util.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2util.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2util.h Tue Mar 24 10:40:31 2009 @@ -34,10 +34,12 @@ */ #include +#include SOFIA_BEGIN_DECLS void s2_fast_forward(unsigned long seconds, su_root_t *root); +void s2_timed_logger(void *stream, char const *fmt, va_list ap); SOFIA_END_DECLS From mikej at freeswitch.org Tue Mar 24 08:41:03 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:41:03 -0500 Subject: [Freeswitch-svn] [commit] r12742 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua Message-ID: Author: mikej Date: Tue Mar 24 10:41:03 2009 New Revision: 12742 Log: Mon Mar 9 12:32:13 CDT 2009 Pekka Pessi * nua: added nua_i_none to nua_event_name() Ignore-this: 5d262decadfc28b82ab7292330e20530 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:41:03 2009 @@ -1 +1 @@ -Tue Mar 24 10:39:35 CDT 2009 +Tue Mar 24 10:40:08 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_common.c Tue Mar 24 10:41:03 2009 @@ -309,6 +309,8 @@ char const *nua_event_name(nua_event_t event) { switch (event) { + case nua_i_none: return "nua_i_none"; + case nua_i_error: return "nua_i_error"; case nua_i_invite: return "nua_i_invite"; case nua_i_cancel: return "nua_i_cancel"; From mikej at freeswitch.org Tue Mar 24 08:41:38 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:41:38 -0500 Subject: [Freeswitch-svn] [commit] r12743 - in freeswitch/trunk/libs/sofia-sip: . tests Message-ID: Author: mikej Date: Tue Mar 24 10:41:38 2009 New Revision: 12743 Log: Mon Mar 9 12:42:00 CDT 2009 Pekka Pessi * test_nua_api.c: nua_i_none is no more unknown Ignore-this: b7232be3e3956337161266c1814ddd37 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:41:38 2009 @@ -1 +1 @@ -Tue Mar 24 10:40:08 CDT 2009 +Tue Mar 24 10:40:43 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nua_api.c Tue Mar 24 10:41:38 2009 @@ -94,7 +94,7 @@ TEST_1(!nua_handle_has_registrations(NULL)); TEST_1(!nua_handle_remote(NULL)); TEST_1(!nua_handle_local(NULL)); - TEST_S(nua_event_name(-1), "NUA_UNKNOWN"); + TEST_S(nua_event_name(-111), "NUA_UNKNOWN"); TEST_VOID(nua_register(NULL, TAG_END())); TEST_VOID(nua_unregister(NULL, TAG_END())); TEST_VOID(nua_invite(NULL, TAG_END())); From mikej at freeswitch.org Tue Mar 24 08:42:16 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:42:16 -0500 Subject: [Freeswitch-svn] [commit] r12744 - in freeswitch/trunk/libs/sofia-sip: . packages Message-ID: Author: mikej Date: Tue Mar 24 10:42:16 2009 New Revision: 12744 Log: Mon Mar 9 12:42:48 CDT 2009 Pekka Pessi * packages/sofia-sip-ua.pc.in: silenced warning from configure Ignore-this: dcf6a0fed627e267f5128af5508bcb8f Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:42:16 2009 @@ -1 +1 @@ -Tue Mar 24 10:40:43 CDT 2009 +Tue Mar 24 10:41:20 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in (original) +++ freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-ua.pc.in Tue Mar 24 10:42:16 2009 @@ -4,6 +4,7 @@ libexecdir=@libexecdir@ includedir=@includedir@ include_sofiadir=@include_sofiadir@ +datarootdir=@datarootdir@ sofiaawkdir=@datadir@/@PACKAGE@ Name: sofia-sip-ua From mikej at freeswitch.org Tue Mar 24 08:42:54 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:42:54 -0500 Subject: [Freeswitch-svn] [commit] r12745 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su Message-ID: Author: mikej Date: Tue Mar 24 10:42:53 2009 New Revision: 12745 Log: Mon Mar 9 12:44:03 CDT 2009 Pekka Pessi * su_alloc: shorten race on _su_deinit() Ignore-this: 6d4e6edb434a96e66c9bb018a201a3c6 Make home object unusable earlier during denitialization. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:42:53 2009 @@ -1 +1 @@ -Tue Mar 24 10:41:20 CDT 2009 +Tue Mar 24 10:41:57 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Tue Mar 24 10:42:53 2009 @@ -993,6 +993,9 @@ if (home->suh_blocks) { size_t i; su_block_t *b; + void *suh_lock = home->suh_lock; + + home->suh_lock = NULL; if (home->suh_blocks->sub_destructor) { void (*destructor)(void *) = home->suh_blocks->sub_destructor; @@ -1034,11 +1037,7 @@ home->suh_blocks = NULL; - if (home->suh_lock) { - void *suh_lock = home->suh_lock; - - home->suh_lock = NULL; - + if (suh_lock) { /* Unlock, or risk assert() or leak handles on Windows */ _su_home_unlocker(suh_lock); _su_home_destroy_mutexes(suh_lock); From mikej at freeswitch.org Tue Mar 24 08:43:28 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:43:28 -0500 Subject: [Freeswitch-svn] [commit] r12746 - in freeswitch/trunk/libs/sofia-sip: . s2check Message-ID: Author: mikej Date: Tue Mar 24 10:43:28 2009 New Revision: 12746 Log: Wed Mar 11 09:49:37 CDT 2009 Pekka Pessi * s2base.c: use struct timeval with gettimeofday() Ignore-this: 1ca4ea3c958573a1fa845d8b66b7d6ad Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:43:28 2009 @@ -1 +1 @@ -Tue Mar 24 10:41:57 CDT 2009 +Tue Mar 24 10:42:34 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Tue Mar 24 10:43:28 2009 @@ -74,7 +74,7 @@ static double now(void) { - struct timespec tv; + struct timeval tv; gettimeofday(&tv, NULL); From mikej at freeswitch.org Tue Mar 24 08:44:04 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:44:04 -0500 Subject: [Freeswitch-svn] [commit] r12747 - in freeswitch/trunk/libs/sofia-sip: . s2check Message-ID: Author: mikej Date: Tue Mar 24 10:44:04 2009 New Revision: 12747 Log: Wed Mar 11 09:50:20 CDT 2009 Pekka Pessi * s2check: added exit77.c to EXTRA_DIST Ignore-this: ae3403c0bd1b4596c24bc7304916fa85 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:44:04 2009 @@ -1 +1 @@ -Tue Mar 24 10:42:34 CDT 2009 +Tue Mar 24 10:43:08 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Tue Mar 24 10:44:04 2009 @@ -28,7 +28,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = +EXTRA_DIST = exit77.c # ---------------------------------------------------------------------- # Tests From mikej at freeswitch.org Tue Mar 24 08:44:33 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:44:33 -0500 Subject: [Freeswitch-svn] [commit] r12748 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su/sofia-sip Message-ID: Author: mikej Date: Tue Mar 24 10:44:33 2009 New Revision: 12748 Log: Wed Mar 11 11:58:14 CDT 2009 Pekka Pessi * sofia-sip/su_config.h: include extern in SOFIAPUBVAR Ignore-this: 7cccd45776e8452a8e404aaf01eaeadf Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:44:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:43:08 CDT 2009 +Tue Mar 24 10:43:39 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_config.h Tue Mar 24 10:44:33 2009 @@ -84,7 +84,7 @@ #undef SOFIAPUBVAR #if defined(IN_LIBSOFIA_SIP_UA) #define SOFIAPUBFUN __declspec(dllexport) - #define SOFIAPUBVAR __declspec(dllexport) + #define SOFIAPUBVAR __declspec(dllexport) extern #else #define SOFIAPUBFUN __declspec(dllimport) #define SOFIAPUBVAR __declspec(dllimport) extern @@ -104,7 +104,7 @@ #undef SOFIAPUBVAR #if defined(IN_LIBSOFIA_SIP_UA) #define SOFIAPUBFUN __declspec(dllexport) - #define SOFIAPUBVAR __declspec(dllexport) extern + #define SOFIAPUBVAR __declspec(dllexport) extern #else #define SOFIAPUBFUN __declspec(dllimport) #define SOFIAPUBVAR __declspec(dllimport) From mikej at freeswitch.org Tue Mar 24 08:45:13 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:45:13 -0500 Subject: [Freeswitch-svn] [commit] r12749 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg Message-ID: Author: mikej Date: Tue Mar 24 10:45:13 2009 New Revision: 12749 Log: Wed Mar 11 11:50:44 CDT 2009 Pekka Pessi * msg_mime.c: explicit cast when assigning to mp_len Ignore-this: ca5b8291eb84d8b166ab7f659bcf69f8 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:45:13 2009 @@ -1 +1 @@ -Tue Mar 24 10:43:39 CDT 2009 +Tue Mar 24 10:44:15 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Tue Mar 24 10:45:13 2009 @@ -513,7 +513,7 @@ for (mp = all; mp; mp = mp->mp_next) { mp->mp_data = boundary; - mp->mp_len = blen; + mp->mp_len = (unsigned)blen; /* XXX */ assert(mp->mp_payload || mp->mp_separator); @@ -613,7 +613,8 @@ for (; mp; mp = mp->mp_next) { if (mp->mp_data == NULL) { - mp->mp_data = boundary, mp->mp_len = blen; + mp->mp_data = boundary; + mp->mp_len = (unsigned)blen; /* XXX */ } else { if (mp->mp_len < 3) return -1; From mikej at freeswitch.org Tue Mar 24 08:45:45 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:45:45 -0500 Subject: [Freeswitch-svn] [commit] r12750 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv Message-ID: Author: mikej Date: Tue Mar 24 10:45:45 2009 New Revision: 12750 Log: Wed Mar 11 11:51:43 CDT 2009 Pekka Pessi * sres_sip.c: silence VC warnings Ignore-this: dd9d4b774716430cdf429ed86664b109 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:45:45 2009 @@ -1 +1 @@ -Tue Mar 24 10:44:15 CDT 2009 +Tue Mar 24 10:44:50 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Tue Mar 24 10:45:45 2009 @@ -1440,8 +1440,8 @@ memset(ai, 0, (sizeof ai)); ai->ai_protocol = stp->stp_number; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); su->su_family = ai->ai_family = AF_INET6; su->su_port = htons(step->sp_port); @@ -1477,8 +1477,8 @@ memset(ai, 0, (sizeof ai)); ai->ai_protocol = stp->stp_number; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin)); + su->su_len = (sizeof su->su_sin); su->su_family = ai->ai_family = AF_INET; su->su_port = htons(step->sp_port); @@ -1541,8 +1541,8 @@ memset(ai, 0, (sizeof ai)); (void)buffer; if (host_is_ip4_address(target)) { - ai->ai_addr = memset(su, 0, (sizeof su->su_sin)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin)); + su->su_len = (sizeof su->su_sin); if (su_inet_pton(su->su_family = ai->ai_family = AF_INET, target, &su->su_sin.sin_addr) <= 0) { srs->srs_error = SRES_SIP_ERR_BAD_URI; @@ -1551,8 +1551,8 @@ } #if SU_HAVE_IN6 else if (host_is_ip6_address(target)) { - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); if (su_inet_pton(su->su_family = ai->ai_family = AF_INET6, target, &su->su_sin6.sin6_addr) <= 0) { srs->srs_error = SRES_SIP_ERR_BAD_URI; @@ -1562,8 +1562,8 @@ else if (host_is_ip6_reference(target)) { size_t len = strlen(target) - 2; - ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); - su->su_len = ai->ai_addrlen = (sizeof su->su_sin6); + ai->ai_addr = memset(su, 0, ai->ai_addrlen = (sizeof su->su_sin6)); + su->su_len = (sizeof su->su_sin6); if (len >= sizeof buffer || !memcpy(buffer, target + 1, len) || From mikej at freeswitch.org Tue Mar 24 08:46:13 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:46:13 -0500 Subject: [Freeswitch-svn] [commit] r12751 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport Message-ID: Author: mikej Date: Tue Mar 24 10:46:13 2009 New Revision: 12751 Log: Wed Mar 11 11:52:58 CDT 2009 Pekka Pessi * tport.c: silence VC warnings Ignore-this: b81c43b73fcefa2dd58dd3366dd60368 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:46:13 2009 @@ -1 +1 @@ -Tue Mar 24 10:44:50 CDT 2009 +Tue Mar 24 10:45:18 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Tue Mar 24 10:46:13 2009 @@ -3078,7 +3078,7 @@ int tport_subject_search(char const *subject, su_strlst_t const *lst) { - int idx, ilen; + usize_t idx, ilen; const char *subjuri; if (!subject || su_strmatch(tpn_any, subject)) From mikej at freeswitch.org Tue Mar 24 08:46:59 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:46:59 -0500 Subject: [Freeswitch-svn] [commit] r12752 - in freeswitch/trunk/libs/sofia-sip: . tests Message-ID: Author: mikej Date: Tue Mar 24 10:46:59 2009 New Revision: 12752 Log: Mon Mar 23 10:41:08 CDT 2009 Pekka Pessi * tests: added check_dlopen_sofia.c Ignore-this: 1f3a1a6dc3e9099c6488a637e5f06e9a Added: freeswitch/trunk/libs/sofia-sip/tests/check_dlopen_sofia.c Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:46:59 2009 @@ -1 +1 @@ -Tue Mar 24 10:45:18 CDT 2009 +Tue Mar 24 10:46:04 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Tue Mar 24 10:46:59 2009 @@ -33,8 +33,8 @@ libtestnat_a_SOURCES = test_nat.h test_nat.c test_nat_tags.c if HAVE_CHECK -TESTS += check_sofia -check_PROGRAMS += check_sofia +TESTS += check_dlopen_sofia check_sofia +check_PROGRAMS += check_dlopen_sofia check_sofia endif check_sofia_CFLAGS = @CHECK_CFLAGS@ @@ -46,6 +46,9 @@ ${sofiabuilddir}/libsofia-sip-ua.la \ @CHECK_LIBS@ +check_dlopen_sofia_CFLAGS = -I$(top_srcdir)/s2check @CHECK_CFLAGS@ +check_dlopen_sofia_LDADD = ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ + CLEANFILES = tmp_sippasswd.?????? # ---------------------------------------------------------------------- Added: freeswitch/trunk/libs/sofia-sip/tests/check_dlopen_sofia.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/tests/check_dlopen_sofia.c Tue Mar 24 10:46:59 2009 @@ -0,0 +1,124 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2009 Nokia Corporation. + * + * Contact: Pekka Pessi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +/**@CFILE check_dlopen_sofia.c + * + * @brief Check dlopen()ing and dlclose() with libsofia-sip-ua + * + * @author Pekka Pessi + * + * @copyright (C) 2009 Nokia Corporation. + */ + +#include "config.h" + +#include +#include +#include + +#include + +#if HAVE_CHECK && HAVE_LIBDL + +#include +#include + +#include +#include + +static uint64_t (*su_random64)(void); + +START_TEST(load_su_uniqueid) +{ + void *sofia; + uint64_t rnd; + + sofia = dlopen("../libsofia-sip-ua/.libs/libsofia-sip-ua.so", RTLD_NOW); + su_random64 = dlsym(sofia, "su_random64"); + fail_unless(su_random64 != NULL); + rnd = su_random64(); + fail_unless(sofia != NULL); + fail_unless(dlclose(sofia) == 0); +} +END_TEST + +TCase *dl_tcase(void) +{ + TCase *tc = tcase_create("1 - dlopen/dlclose"); + + tcase_add_test(tc, load_su_uniqueid); + + return tc; +} + +/* ---------------------------------------------------------------------- */ + +static void usage(int exitcode) +{ + fprintf(exitcode ? stderr : stdout, + "usage: check_dlopen_sofia [--xml=logfile] case,...\n"); + exit(exitcode); +} + +int main(int argc, char *argv[]) +{ + int i, failed = 0; + + Suite *suite = suite_create("dlopen()ing and dlclose() with libsofia-sip-ua"); + SRunner *runner; + char const *xml = NULL; + + s2_select_tests(getenv("CHECK_CASES")); + + for (i = 1; argv[i]; i++) { + if (strncmp(argv[i], "--xml=", strlen("--xml=")) == 0) { + xml = argv[i] + strlen("--xml="); + } + else if (strcmp(argv[i], "--xml") == 0) { + if (!(xml = argv[++i])) + usage(2); + } + else if (strcmp(argv[i], "-?") == 0 || + strcmp(argv[i], "-h") == 0 || + strcmp(argv[i], "--help") == 0) + usage(0); + else + s2_select_tests(argv[i]); + } + + suite_add_tcase(suite, dl_tcase()); + + runner = srunner_create(suite); + if (xml) + srunner_set_xml(runner, xml); + srunner_run_all(runner, CK_ENV); + failed = srunner_ntests_failed(runner); + srunner_free(runner); + + exit(failed ? EXIT_FAILURE : EXIT_SUCCESS); +} + +#else +int main(void) { return 77; } +#endif From mikej at freeswitch.org Tue Mar 24 08:47:43 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:47:43 -0500 Subject: [Freeswitch-svn] [commit] r12753 - freeswitch/trunk/libs/sofia-sip Message-ID: Author: mikej Date: Tue Mar 24 10:47:43 2009 New Revision: 12753 Log: Mon Mar 23 10:41:29 CDT 2009 Pekka Pessi * configure.ac: check for dlopen in -ldl Ignore-this: e1fa8a4bf30eb9023e54264dbe8c42bd Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/configure.ac Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:47:43 2009 @@ -1 +1 @@ -Tue Mar 24 10:46:04 CDT 2009 +Tue Mar 24 10:46:45 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Tue Mar 24 10:47:43 2009 @@ -110,6 +110,12 @@ fi AC_CHECK_HEADERS([fnmatch.h]) +dnl dl is currently used only in testing +AC_CHECK_LIB([dl], [dlopen], [ + dnl Note: -ldl is not added to LIBS + AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dl library is available]) +]) + ### internal modules ### ---------------- AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define to 1 always]) From mikej at freeswitch.org Tue Mar 24 08:48:19 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:48:19 -0500 Subject: [Freeswitch-svn] [commit] r12754 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta Message-ID: Author: mikej Date: Tue Mar 24 10:48:19 2009 New Revision: 12754 Log: Mon Mar 23 12:22:50 CDT 2009 Pekka Pessi * nta.c: use random key when generating tags Ignore-this: 3e989f42549acbdbc259383b1b64e74d 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 24 10:48:19 2009 @@ -1 +1 @@ -Tue Mar 24 10:46:45 CDT 2009 +Tue Mar 24 10:47:23 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 24 10:48:19 2009 @@ -1175,10 +1175,9 @@ static int agent_tag_init(nta_agent_t *self) { sip_contact_t *m = self->sa_contact; - uint32_t hash = 1; + uint32_t hash = su_random(); if (m) { - if (m->m_url->url_user) hash = 914715421U * hash + msg_hash_string(m->m_url->url_user); if (m->m_url->url_host) @@ -1192,7 +1191,7 @@ if (hash == 0) hash = 914715421U; - self->sa_branch = NTA_BRANCH_PRIME * su_ntp_now(); + self->sa_branch = NTA_BRANCH_PRIME * (uint64_t)su_nanotime(NULL); self->sa_branch *= hash; self->sa_tags = NTA_TAG_PRIME * self->sa_branch; @@ -2505,6 +2504,8 @@ if (!self->sa_contact) return -1; + agent_tag_init(self); + return 0; } From mikej at freeswitch.org Tue Mar 24 08:49:04 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:49:04 -0500 Subject: [Freeswitch-svn] [commit] r12755 - freeswitch/trunk/libs/sofia-sip Message-ID: Author: mikej Date: Tue Mar 24 10:49:03 2009 New Revision: 12755 Log: Mon Mar 23 12:27:27 CDT 2009 Pekka Pessi * RELEASE: urandom is no more public Ignore-this: 353234331d627b77c66841036c9d77f7 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/RELEASE Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:49:03 2009 @@ -1 +1 @@ -Tue Mar 24 10:47:23 CDT 2009 +Tue Mar 24 10:48:07 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Tue Mar 24 10:49:03 2009 @@ -51,7 +51,7 @@ - t_skip_next(), t_skip_move(), t_skip_len(), t_skip_dup(), t_skip_filter() - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter() - t_filter_with(), t_any_filter() - - sres_record_class() + - sres_record_class(), urandom - u2s_alloc() libsofia-sip-ua-glib: From mikej at freeswitch.org Tue Mar 24 08:54:18 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 10:54:18 -0500 Subject: [Freeswitch-svn] [commit] r12756 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su Message-ID: Author: mikej Date: Tue Mar 24 10:54:18 2009 New Revision: 12756 Log: Tue Mar 3 12:23:35 CST 2009 Della Betta Filippo * su_uniqueid.c: srand() must be called per-thread on windows Ignore-this: ee98b86faadc4a39186ba4991b073c40 Mon Mar 23 12:41:53 CDT 2009 Pekka Pessi * su_uniqueid.c: simple threadsafe implementation Ignore-this: b3597fb6032b79a61b63f004f121188b Using /dev/urandom where available, simple 64-bit prng elsewhere. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:54:18 2009 @@ -1 +1 @@ -Tue Mar 24 10:48:07 CDT 2009 +Tue Mar 24 10:52:57 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Tue Mar 24 10:54:18 2009 @@ -74,116 +74,133 @@ #include "sofia-sip/su_uniqueid.h" /* For random number generator */ -static int initialized = 0; +static FILE *urandom; -static void init(void); -static void init_node(void); +union state { + uint64_t u64; +}; -/* Constants */ -static const unsigned version = 1; /* Current version */ -static const unsigned reserved = 128; /* DCE variant */ -#define granularity (10000000UL) -static const uint64_t mask60 = SU_U64_C(0xfffFFFFffffFFFF); -#define MAGIC (16384) +#if SU_HAVE_PTHREADS -/* 100-nanosecond intervals between 15 October 1582 and 1 January 1900 */ -static const uint64_t ntp_epoch = -(uint64_t)(141427) * (24 * 60 * 60L) * granularity; - -/* State */ -static uint64_t timestamp0 = 0; -static unsigned clock_sequence = MAGIC; -static unsigned char node[6]; +#include -FILE *urandom; +static pthread_once_t once = PTHREAD_ONCE_INIT; +static int done_once = 1; +static pthread_key_t state_key; -/* - * Get current timestamp - */ -static uint64_t timestamp(void) +static void +init_once(void) { - uint64_t tl = su_ntp_now(); - uint64_t hi = su_ntp_hi(tl), lo = su_ntp_lo(tl); + pthread_key_create(&state_key, free); +#if HAVE_DEV_URANDOM + urandom = fopen("/dev/urandom", "rb"); +#endif /* HAVE_DEV_URANDOM */ + done_once = 1; +} - lo *= granularity; - hi *= granularity; +#else +static int initialized; +#endif - tl = hi + (lo >> 32) + ntp_epoch; +static union state * +get_state(void) +{ + static union state *retval, state0[1]; -#ifdef TESTING - printf("timestamp %08x-%08x\n", (unsigned)(tl >>32), (unsigned)tl); -#endif +#if SU_HAVE_PTHREADS - tl &= mask60; + pthread_once(&once, init_once); - if (tl <= timestamp0) - clock_sequence = (clock_sequence + 1) & (MAGIC - 1); + if (urandom) + return NULL; - timestamp0 = tl; + retval = pthread_getspecific(state_key); + if (retval) { + return retval; + } - return tl; -} + retval = calloc(1, sizeof *retval); + if (retval != NULL) + pthread_setspecific(state_key, retval); + else + retval = state0; -#if !HAVE_RANDOM -#define random() rand() -#define srandom(x) srand(x) -#endif +#else /* !SU_HAVE_PTHREADS */ -/* - * Initialize clock_sequence and timestamp0 - */ -static void init(void) -{ - int i; + if (urandom == NULL) { +#if HAVE_DEV_URANDOM + urandom = fopen("/dev/urandom", "rb"); +#endif /* HAVE_DEV_URANDOM */ + } -#define N_SEED 32 + if (urandom) + return NULL; -#if HAVE_INITSTATE - /* Allow libsofia-sip-ua.so to unload. */ - uint32_t *seed = calloc(N_SEED, sizeof *seed); -#else - static uint32_t _seed[N_SEED] = { 0 }; - uint32_t *seed = _seed; + retval = state0; + + if (initialized) + return retval; #endif - su_time_t now; - initialized = 1; + { + uint32_t seed[32]; + int i; + union { + uint32_t u32; + pthread_t tid; + } tid32 = { 0 }; - /* Initialize our random number generator */ -#if HAVE_DEV_URANDOM - if (!urandom) - urandom = fopen("/dev/urandom", "rb"); -#endif /* HAVE_DEV_URANDOM */ + tid32.tid = pthread_self(); - if (urandom) { - size_t len = fread(seed, sizeof *seed, N_SEED, urandom); (void)len; - } - else { - for (i = 0; i < N_SEED; i += 2) { + memset(seed, 0, sizeof seed); /* Make valgrind happy */ + + for (i = 0; i < 32; i += 2) { #if HAVE_CLOCK_GETTIME struct timespec ts; (void)clock_gettime(CLOCK_REALTIME, &ts); seed[i] ^= ts.tv_sec; seed[i + 1] ^= ts.tv_nsec; -#endif +#else + su_time_t now; su_time(&now); seed[i] ^= now.tv_sec; seed[i + 1] ^= now.tv_sec; +#endif } seed[0] ^= getuid(); seed[1] ^= getpid(); + seed[2] ^= tid32.u32; + seed[3] ^= (uint32_t)(intptr_t)retval; + + for (i = 0; i < 32; i+= 4) { + retval->u64 += ((uint64_t)seed[i] << 32) | seed[i + 1]; + retval->u64 *= ((uint64_t)seed[i + 3] << 32) | seed[i + 2]; + } + + retval->u64 += (uint64_t)su_nanotime(NULL); } -#if HAVE_INITSTATE - initstate(seed[0] ^ seed[1], (void *)seed, N_SEED * (sizeof *seed)); -#else - srand(seed[0] ^ seed[1]); -#endif + return retval; +} - clock_sequence = su_randint(0, MAGIC - 1); +#if !defined(WIN32) && !defined(WIN64) +void sofia_su_uniqueid_destructor(void) + __attribute__((destructor)); +#endif - (void)timestamp(); +void +sofia_su_uniqueid_destructor(void) +{ +#if HAVE_DEV_URANDOM + if (urandom) + fclose(urandom); +#endif /* HAVE_DEV_URANDOM */ - init_node(); +#if SU_HAVE_PTHREADS + if (done_once) { + pthread_key_delete(state_key); + done_once = 0; + } +#endif } #if HAVE_GETIFADDRS @@ -196,10 +213,8 @@ #endif static -void init_node(void) +void init_node(uint8_t node[6]) { - size_t i; - #if HAVE_GETIFADDRS && HAVE_SOCKADDR_LL struct ifaddrs *ifa, *results; @@ -232,24 +247,18 @@ } #endif - if (urandom) { - size_t len = fread(node, sizeof node, 1, urandom); (void)len; - } - else for (i = 0; i < sizeof(node); i++) { - unsigned r = random(); - node[i] = (r >> 24) ^ (r >> 16) ^ (r >> 8) ^ r; - } - + su_randmem(node, 6); node[0] |= 1; /* "multicast" address */ } +static unsigned char node[6]; + size_t su_node_identifier(void *address, size_t addrlen) { if (addrlen > sizeof node) addrlen = sizeof node; - if (!initialized) init(); - + su_guid_generate(NULL); memcpy(address, node, addrlen); return addrlen; @@ -257,21 +266,66 @@ void su_guid_generate(su_guid_t *v) { - uint64_t time; - unsigned clock; + /* Constants */ + static const unsigned version = 1; /* Current version */ + static const unsigned reserved = 128; /* DCE variant */ +#define granularity (10000000UL) + static const uint64_t mask60 = SU_U64_C(0xfffFFFFffffFFFF); +#define MAGIC (16384) + + /* 100-nanosecond intervals between 15 October 1582 and 1 January 1900 */ + static const uint64_t ntp_epoch = + (uint64_t)(141427) * (24 * 60 * 60L) * granularity; + + static uint64_t timestamp0 = 0; + static unsigned clock_sequence = MAGIC; + +#if SU_HAVE_PTHREADS + static pthread_mutex_t update = PTHREAD_MUTEX_INITIALIZER; +#endif + + uint64_t tl = su_ntp_now(); + uint64_t hi = su_ntp_hi(tl), lo = su_ntp_lo(tl); + + lo *= granularity; + hi *= granularity; - if (!initialized) init(); + tl = hi + (lo >> 32) + ntp_epoch; + +#ifdef TESTING + printf("timestamp %08x-%08x\n", (unsigned)(tl >>32), (unsigned)tl); +#endif + + tl &= mask60; + if (tl == 0) tl++; + +#if SU_HAVE_PTHREADS + pthread_mutex_lock(&update); +#endif + + if (timestamp0 == 0) { + clock_sequence = su_randint(0, MAGIC - 1); + init_node(node); + } + else if (tl <= timestamp0) { + clock_sequence = (clock_sequence + 1) & (MAGIC - 1); + } + + timestamp0 = tl; - time = timestamp(); - clock = clock_sequence; +#if SU_HAVE_PTHREADS + pthread_mutex_unlock(&update); +#endif - v->s.time_high_and_version = - htons((unsigned short)(((time >> 48) & 0x0fff) | (version << 12))); - v->s.time_mid = htons((unsigned short)((time >> 32) & 0xffff)); - v->s.time_low = htonl((unsigned long)(time & 0xffffffffUL)); - v->s.clock_seq_low = clock & 0xff; - v->s.clock_seq_hi_and_reserved = (clock >> 8) | reserved; - memcpy(v->s.node, node, sizeof(v->s.node)); + if (v) { + v->s.time_high_and_version = + htons((unsigned short)(((tl >> 48) & 0x0fff) | (version << 12))); + v->s.time_mid = htons((unsigned short)((tl >> 32) & 0xffff)); + v->s.time_low = htonl((unsigned long)(tl & 0xffffffffUL)); + v->s.clock_seq_low = clock_sequence & 0xff; + v->s.clock_seq_hi_and_reserved = (clock_sequence >> 8) | reserved; + memcpy(v->s.node, node, sizeof(v->s.node)); + } } /* @@ -292,58 +346,73 @@ return su_guid_strlen; } -/* - * Generate random integer in range [lb, ub] (inclusive) - */ -int su_randint(int lb, int ub) +uint64_t su_random64(void) { - unsigned rnd = 0; + union state *state = get_state(); - if (!initialized) init(); - - if (urandom) { - size_t len = fread(&rnd, 1, sizeof rnd, urandom); (void)len; + if (state) { + /* Simple rand64 from AoCP */ + return state->u64 = state->u64 * 0X5851F42D4C957F2DULL + 1ULL; + } + else { + uint64_t retval; + size_t len = fread(&retval, 1, sizeof retval, urandom); (void)len; + return retval; } - else - rnd = random(); - - if (ub - lb + 1 != 0) - rnd %= (ub - lb + 1); - - return rnd + lb; } void *su_randmem(void *mem, size_t siz) { - size_t i; + union state *state = get_state(); - if (!initialized) init(); - - if (urandom) { - size_t len = fread(mem, 1, siz, urandom); (void)len; + if (state) { + size_t i; + uint64_t r64; + uint32_t r32; + + for (i = 0; i < siz; i += 4) { + /* Simple rand64 from AoCP */ + state->u64 = r64 = state->u64 * 0X5851F42D4C957F2DULL + 1ULL; + r32 = (uint32_t) (r64 >> 32) ^ (uint32_t)r64; + if (siz - i >= 4) + memcpy((char *)mem + i, &r32, 4); + else + memcpy((char *)mem + i, &r32, siz - i); + } } - else for (i = 0; i < siz; i++) { - unsigned r = random(); - ((char *)mem)[i] = (r >> 24) ^ (r >> 16) ^ (r >> 8) ^ r; + else { + size_t len = fread(mem, 1, siz, urandom); (void)len; } return mem; } -/** Get random number for RTP timestamps. - * - * This function returns a 32-bit random integer. It also initializes the - * random number generator, if needed. +/** + * Generate random integer in range [lb, ub] (inclusive) */ -uint32_t su_random(void) +int su_randint(int lb, int ub) { - if (!initialized) init(); + uint64_t rnd; + unsigned modulo = (unsigned)(ub - lb + 1); - if (urandom) { - uint32_t rnd; - size_t len = fread(&rnd, 1, sizeof rnd, urandom); (void)len; - return rnd; + if (modulo != 0) { + do { + rnd = su_random64(); + } while (rnd / modulo == 0xffffFFFFffffFFFFULL / modulo); + + rnd %= modulo; } + else { + rnd = su_random64(); + } + + return (int)rnd + lb; +} - return (uint32_t)random(); +/** Get random 32-bit unsigned number. + * + */ +uint32_t su_random(void) +{ + return (uint32_t)(su_random64() >> 16); } From mikej at freeswitch.org Tue Mar 24 10:57:00 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 12:57:00 -0500 Subject: [Freeswitch-svn] [commit] r12757 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: mikej Date: Tue Mar 24 12:57:00 2009 New Revision: 12757 Log: use nua_handle_home instead of using nua internals to get the nua handle home Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c 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 Mar 24 12:57:00 2009 @@ -1280,7 +1280,7 @@ if (!switch_channel_test_flag(channel, CF_ANSWERED) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); - nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), + nua_respond(tech_pvt->nh, code, su_strdup(nua_handle_home(tech_pvt->nh), reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); @@ -1303,12 +1303,12 @@ sofia_glue_tech_patch_sdp(tech_pvt); sofia_glue_tech_proxy_remote_addr(tech_pvt); } - nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + nua_respond(tech_pvt->nh, code, su_strdup(nua_handle_home(tech_pvt->nh), reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); } else { - nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + nua_respond(tech_pvt->nh, code, su_strdup(nua_handle_home(tech_pvt->nh), reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Mar 24 12:57:00 2009 @@ -793,7 +793,7 @@ } if (sip->sip_path) { - path_val = sip_header_as_string(nh->nh_home, (void *) sip->sip_path); + path_val = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_path); path_encoded_len = (strlen(path_val) * 3) + 1; switch_zmalloc(path_encoded, path_encoded_len); switch_copy_string(path_encoded, ";fs_path=", 10); @@ -1117,7 +1117,7 @@ if (exptime) { switch_snprintf(exp_param, sizeof(exp_param), "expires=%ld", exptime); - sip_contact_add_param(nh->nh_home, sip->sip_contact, exp_param); + sip_contact_add_param(nua_handle_home(nh), sip->sip_contact, exp_param); if (switch_event_create(&s_event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, reg_host); @@ -1147,10 +1147,10 @@ } if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { - char *full_contact = sip_header_as_string(nh->nh_home, (void *) sip->sip_contact); + char *full_contact = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_contact); if (full_contact && switch_stristr("SUBSCRIBE", full_contact)) { sofia_sla_handle_register(nua, profile, sip, exptime, full_contact); - su_free(nh->nh_home, full_contact); + su_free(nua_handle_home(nh), full_contact); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c Tue Mar 24 12:57:00 2009 @@ -217,7 +217,7 @@ nua_handle_destroy(nh); sofia_private_free(sofia_private); } else { - char *full_contact = sip_header_as_string(nh->nh_home, (void *) sip->sip_contact); + char *full_contact = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_contact); time_t expires = switch_epoch_time_now(NULL); char *sql; char *contact_str = strip_uri(full_contact); From anthm at freeswitch.org Tue Mar 24 10:58:01 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 12:58:01 -0500 Subject: [Freeswitch-svn] [commit] r12758 - freeswitch/trunk/libs/iksemel/src Message-ID: Author: anthm Date: Tue Mar 24 12:58:00 2009 New Revision: 12758 Log: don Modified: freeswitch/trunk/libs/iksemel/src/stream.c Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Tue Mar 24 12:58:00 2009 @@ -45,8 +45,10 @@ }; #ifdef HAVE_GNUTLS +#ifndef WIN32 #include GCRY_THREAD_OPTION_PTHREAD_IMPL; +#endif static size_t tls_push (iksparser *prs, const char *buffer, size_t len) @@ -78,7 +80,9 @@ const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 }; int ret; +#ifndef WIN32 gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); +#endif if (gnutls_global_init () != 0) return IKS_NOMEM; @@ -610,7 +614,9 @@ { int ok = 0; +#ifndef WIN32 gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); +#endif if (gnutls_global_init () != 0) return IKS_NOMEM; From anthm at freeswitch.org Tue Mar 24 11:01:58 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 13:01:58 -0500 Subject: [Freeswitch-svn] [commit] r12759 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket Message-ID: Author: anthm Date: Tue Mar 24 13:01:58 2009 New Revision: 12759 Log: change blocking: true to async: true you can start with blocking and go async but not the other way around Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Mar 24 13:01:58 2009 @@ -1575,7 +1575,13 @@ if (!strncasecmp(cmd, "sendmsg", 7)) { switch_core_session_t *session; char *uuid = cmd + 7; - + const char *async_var = switch_event_get_header(*event, "async"); + int async = switch_test_flag(listener, LFLAG_ASYNC); + + if (switch_true(async_var)) { + async = 1; + } + if (uuid) { while (*uuid == ' ') { uuid++; @@ -1592,14 +1598,11 @@ uuid = switch_event_get_header(*event, "session-id"); } - if (switch_strlen_zero(uuid) && listener->session) { - const char *blocking = switch_event_get_header(*event, "blocking"); - int async = switch_test_flag(listener, LFLAG_ASYNC); - - if (blocking && switch_true(blocking)) { - async = 0; - } + if (uuid && listener->session && !strcmp(uuid, switch_core_session_get_uuid(listener->session))) { + uuid = NULL; + } + if (switch_strlen_zero(uuid) && listener->session) { if (async) { if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { switch_snprintf(reply, reply_len, "+OK"); From anthm at freeswitch.org Tue Mar 24 11:03:26 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 13:03:26 -0500 Subject: [Freeswitch-svn] [commit] r12760 - in freeswitch/trunk/libs/esl: lua perl perl/ESL php python ruby src src/include Message-ID: Author: anthm Date: Tue Mar 24 13:03:26 2009 New Revision: 12760 Log: match ESL to last commit and check in ESL::IVR perl mod Added: freeswitch/trunk/libs/esl/perl/ESL/ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/ESL.pm freeswitch/trunk/libs/esl/perl/esl_wrap.cpp freeswitch/trunk/libs/esl/php/ESL.php freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/php/php_ESL.h freeswitch/trunk/libs/esl/python/ESL.py freeswitch/trunk/libs/esl/python/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp freeswitch/trunk/libs/esl/src/esl.c freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl.h freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp Tue Mar 24 13:03:26 2009 @@ -2632,22 +2632,60 @@ } -static int _wrap_ESLconnection_setBlockingExecute(lua_State* L) { +static int _wrap_ESLconnection_executeAsync(lua_State* L) { int SWIG_arg = -1; ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; int result; - SWIG_check_num_args("setBlockingExecute",2,2) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("setBlockingExecute",1,"ESLconnection *"); - if(!lua_isstring(L,2)) SWIG_fail_arg("setBlockingExecute",2,"char const *"); + SWIG_check_num_args("executeAsync",2,4) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("executeAsync",1,"ESLconnection *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("executeAsync",2,"char const *"); + if(lua_gettop(L)>=3 && !lua_isstring(L,3)) SWIG_fail_arg("executeAsync",3,"char const *"); + if(lua_gettop(L)>=4 && !lua_isstring(L,4)) SWIG_fail_arg("executeAsync",4,"char const *"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLconnection,0))){ - SWIG_fail_ptr("ESLconnection_setBlockingExecute",1,SWIGTYPE_p_ESLconnection); + SWIG_fail_ptr("ESLconnection_executeAsync",1,SWIGTYPE_p_ESLconnection); } arg2 = (char *)lua_tostring(L, 2); - result = (int)(arg1)->setBlockingExecute((char const *)arg2); + if(lua_gettop(L)>=3){ + arg3 = (char *)lua_tostring(L, 3); + } + if(lua_gettop(L)>=4){ + arg4 = (char *)lua_tostring(L, 4); + } + result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4); + SWIG_arg=0; + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + +static int _wrap_ESLconnection_setAsyncExecute(lua_State* L) { + int SWIG_arg = -1; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + int result; + + SWIG_check_num_args("setAsyncExecute",2,2) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("setAsyncExecute",1,"ESLconnection *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("setAsyncExecute",2,"char const *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLconnection,0))){ + SWIG_fail_ptr("ESLconnection_setAsyncExecute",1,SWIGTYPE_p_ESLconnection); + } + + arg2 = (char *)lua_tostring(L, 2); + result = (int)(arg1)->setAsyncExecute((char const *)arg2); SWIG_arg=0; lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; @@ -2730,7 +2768,8 @@ {"filter", _wrap_ESLconnection_filter}, {"events", _wrap_ESLconnection_events}, {"execute", _wrap_ESLconnection_execute}, - {"setBlockingExecute", _wrap_ESLconnection_setBlockingExecute}, + {"executeAsync", _wrap_ESLconnection_executeAsync}, + {"setAsyncExecute", _wrap_ESLconnection_setAsyncExecute}, {"setEventLock", _wrap_ESLconnection_setEventLock}, {"disconnect", _wrap_ESLconnection_disconnect}, {0,0} Modified: freeswitch/trunk/libs/esl/perl/ESL.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL.pm Tue Mar 24 13:03:26 2009 @@ -140,7 +140,8 @@ *filter = *ESLc::ESLconnection_filter; *events = *ESLc::ESLconnection_events; *execute = *ESLc::ESLconnection_execute; -*setBlockingExecute = *ESLc::ESLconnection_setBlockingExecute; +*executeAsync = *ESLc::ESLconnection_executeAsync; +*setAsyncExecute = *ESLc::ESLconnection_setAsyncExecute; *setEventLock = *ESLc::ESLconnection_setEventLock; *disconnect = *ESLc::ESLconnection_disconnect; sub DISOWN { Added: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Tue Mar 24 13:03:26 2009 @@ -0,0 +1,88 @@ +package ESL::IVR; +use ESL; +use Data::Dumper; + +sub new($$) { + my $proto = shift; + my $class = ref($proto) || $proto; + my $self = {}; + + $self->{_esl} = new ESL::ESLconnection(fileno(STDIN)); + $self->{_info} = $self->{_esl}->getInfo(); + $self->{_uuid} = $self->{_info}->getHeader("unique-id"); + + return bless($self, $class); + +} + +sub getHeader($;) { + my $self = shift; + + return $self->{_info} ? $self->{_info}->getHeader(shift) : undef; +} + +sub execute($;) { + my $self = shift; + return $self->{_esl}->execute(@_); +} + +sub api($;) { + my $self = shift; + return $self->{_esl}->api(@_); +} + +sub disconnect($;) { + my $self = shift; + return $self->{_esl}->disconnect(@_); +} + +sub getVar($;) { + my $self = shift; + my ($var) = @_; + my $e = $self->api("uuid_getvar", "$self->{_uuid} $var"); + my $input; + + if ($e) { + $input = $e->getBody() . "\n"; + if ($input eq "_undef_") { + $input = undef; + } + } + + chomp $input; + + return $input; + +} + +sub playAndGetDigits($;) { + my $self = shift; + my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_; + + $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var"); + + return $self->getVar($var); + +} + +sub read($;) { + my $self = shift; + my ($min, $max, $file, $var, $to, $term) = @_; + + $self->execute("read", "$min $max $file $var $to $term"); + + return $self->getVar($var); + +} + +sub playback($;) { + my $self = shift; + my ($file) = @_; + + $self->execute("playback", $file); + return $self->getVar("playback_terminators_used"); + +} + + +1; Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp Tue Mar 24 13:03:26 2009 @@ -3252,7 +3252,72 @@ } -XS(_wrap_ESLconnection_setBlockingExecute) { +XS(_wrap_ESLconnection_executeAsync) { + { + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 4)) { + SWIG_croak("Usage: ESLconnection_executeAsync(self,app,arg,uuid);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_executeAsync" "', argument " "1"" of type '" "ESLconnection *""'"); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_executeAsync" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + if (items > 2) { + res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_executeAsync" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = reinterpret_cast< char * >(buf3); + } + if (items > 3) { + res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ESLconnection_executeAsync" "', argument " "4"" of type '" "char const *""'"); + } + arg4 = reinterpret_cast< char * >(buf4); + } + result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + SWIG_croak_null(); + } +} + + +XS(_wrap_ESLconnection_setAsyncExecute) { { ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; @@ -3266,19 +3331,19 @@ dXSARGS; if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: ESLconnection_setBlockingExecute(self,val);"); + SWIG_croak("Usage: ESLconnection_setAsyncExecute(self,val);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_setBlockingExecute" "', argument " "1"" of type '" "ESLconnection *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_setAsyncExecute" "', argument " "1"" of type '" "ESLconnection *""'"); } arg1 = reinterpret_cast< ESLconnection * >(argp1); res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setBlockingExecute" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setAsyncExecute" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - result = (int)(arg1)->setBlockingExecute((char const *)arg2); + result = (int)(arg1)->setAsyncExecute((char const *)arg2); ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -3461,7 +3526,8 @@ {"ESLc::ESLconnection_filter", _wrap_ESLconnection_filter}, {"ESLc::ESLconnection_events", _wrap_ESLconnection_events}, {"ESLc::ESLconnection_execute", _wrap_ESLconnection_execute}, -{"ESLc::ESLconnection_setBlockingExecute", _wrap_ESLconnection_setBlockingExecute}, +{"ESLc::ESLconnection_executeAsync", _wrap_ESLconnection_executeAsync}, +{"ESLc::ESLconnection_setAsyncExecute", _wrap_ESLconnection_setAsyncExecute}, {"ESLc::ESLconnection_setEventLock", _wrap_ESLconnection_setEventLock}, {"ESLc::ESLconnection_disconnect", _wrap_ESLconnection_disconnect}, {"ESLc::eslSetLogLevel", _wrap_eslSetLogLevel}, Modified: freeswitch/trunk/libs/esl/php/ESL.php ============================================================================== --- freeswitch/trunk/libs/esl/php/ESL.php (original) +++ freeswitch/trunk/libs/esl/php/ESL.php Tue Mar 24 13:03:26 2009 @@ -187,8 +187,17 @@ return $r; } - function setBlockingExecute($val) { - return ESLconnection_setBlockingExecute($this->_cPtr,$val); + function executeAsync($app,$arg=null,$uuid=null) { + switch (func_num_args()) { + case 1: $r=ESLconnection_executeAsync($this->_cPtr,$app); break; + case 2: $r=ESLconnection_executeAsync($this->_cPtr,$app,$arg); break; + default: $r=ESLconnection_executeAsync($this->_cPtr,$app,$arg,$uuid); + } + return $r; + } + + function setAsyncExecute($val) { + return ESLconnection_setAsyncExecute($this->_cPtr,$val); } function setEventLock($val) { Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Tue Mar 24 13:03:26 2009 @@ -2247,7 +2247,58 @@ } -ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setBlockingExecute) { +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_executeAsync) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + int result; + zval **args[4]; + int arg_count; + + SWIG_ResetError(); + arg_count = ZEND_NUM_ARGS(); + if(arg_count<2 || arg_count>4 || + zend_get_parameters_array_ex(arg_count,args)!=SUCCESS) + WRONG_PARAM_COUNT; + + { + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLconnection, 0) < 0) { + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLconnection_executeAsync. Expected SWIGTYPE_p_ESLconnection"); + } + } + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); + + /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + convert_to_string_ex(args[1]); + arg2 = (char *) Z_STRVAL_PP(args[1]); + /*@SWIG@*/; + + if(arg_count > 2) { + /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + convert_to_string_ex(args[2]); + arg3 = (char *) Z_STRVAL_PP(args[2]); + /*@SWIG@*/; + + } + if(arg_count > 3) { + /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/ + convert_to_string_ex(args[3]); + arg4 = (char *) Z_STRVAL_PP(args[3]); + /*@SWIG@*/; + + } + result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4); + { + ZVAL_LONG(return_value,result); + } + return; +fail: + zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg()); +} + + +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setAsyncExecute) { ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; int result; @@ -2260,7 +2311,7 @@ { if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLconnection, 0) < 0) { - SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLconnection_setBlockingExecute. Expected SWIGTYPE_p_ESLconnection"); + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLconnection_setAsyncExecute. Expected SWIGTYPE_p_ESLconnection"); } } if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL"); @@ -2270,7 +2321,7 @@ arg2 = (char *) Z_STRVAL_PP(args[1]); /*@SWIG@*/; - result = (int)(arg1)->setBlockingExecute((char const *)arg2); + result = (int)(arg1)->setAsyncExecute((char const *)arg2); { ZVAL_LONG(return_value,result); } @@ -2415,7 +2466,8 @@ SWIG_ZEND_NAMED_FE(eslconnection_filter,_wrap_ESLconnection_filter,NULL) SWIG_ZEND_NAMED_FE(eslconnection_events,_wrap_ESLconnection_events,NULL) SWIG_ZEND_NAMED_FE(eslconnection_execute,_wrap_ESLconnection_execute,NULL) - SWIG_ZEND_NAMED_FE(eslconnection_setblockingexecute,_wrap_ESLconnection_setBlockingExecute,NULL) + SWIG_ZEND_NAMED_FE(eslconnection_executeasync,_wrap_ESLconnection_executeAsync,NULL) + SWIG_ZEND_NAMED_FE(eslconnection_setasyncexecute,_wrap_ESLconnection_setAsyncExecute,NULL) SWIG_ZEND_NAMED_FE(eslconnection_seteventlock,_wrap_ESLconnection_setEventLock,NULL) SWIG_ZEND_NAMED_FE(eslconnection_disconnect,_wrap_ESLconnection_disconnect,NULL) SWIG_ZEND_NAMED_FE(eslsetloglevel,_wrap_eslSetLogLevel,NULL) Modified: freeswitch/trunk/libs/esl/php/php_ESL.h ============================================================================== --- freeswitch/trunk/libs/esl/php/php_ESL.h (original) +++ freeswitch/trunk/libs/esl/php/php_ESL.h Tue Mar 24 13:03:26 2009 @@ -62,7 +62,8 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_filter); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_events); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_execute); -ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setBlockingExecute); +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_executeAsync); +ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setAsyncExecute); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setEventLock); ZEND_NAMED_FUNCTION(_wrap_ESLconnection_disconnect); ZEND_NAMED_FUNCTION(_wrap_eslSetLogLevel); Modified: freeswitch/trunk/libs/esl/python/ESL.py ============================================================================== --- freeswitch/trunk/libs/esl/python/ESL.py (original) +++ freeswitch/trunk/libs/esl/python/ESL.py Tue Mar 24 13:03:26 2009 @@ -89,7 +89,8 @@ def filter(*args): return apply(_ESL.ESLconnection_filter, args) def events(*args): return apply(_ESL.ESLconnection_events, args) def execute(*args): return apply(_ESL.ESLconnection_execute, args) - def setBlockingExecute(*args): return apply(_ESL.ESLconnection_setBlockingExecute, args) + def executeAsync(*args): return apply(_ESL.ESLconnection_executeAsync, args) + def setAsyncExecute(*args): return apply(_ESL.ESLconnection_setAsyncExecute, args) def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args) def disconnect(*args): return apply(_ESL.ESLconnection_disconnect, args) ESLconnection_swigregister = _ESL.ESLconnection_swigregister Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Tue Mar 24 13:03:26 2009 @@ -4105,31 +4105,93 @@ } -SWIGINTERN PyObject *_wrap_ESLconnection_setBlockingExecute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_ESLconnection_executeAsync(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:ESLconnection_setBlockingExecute",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO|OO:ESLconnection_executeAsync",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_setBlockingExecute" "', argument " "1"" of type '" "ESLconnection *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_executeAsync" "', argument " "1"" of type '" "ESLconnection *""'"); } arg1 = reinterpret_cast< ESLconnection * >(argp1); res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setBlockingExecute" "', argument " "2"" of type '" "char const *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_executeAsync" "', argument " "2"" of type '" "char const *""'"); } arg2 = reinterpret_cast< char * >(buf2); - result = (int)(arg1)->setBlockingExecute((char const *)arg2); + if (obj2) { + res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_executeAsync" "', argument " "3"" of type '" "char const *""'"); + } + arg3 = reinterpret_cast< char * >(buf3); + } + if (obj3) { + res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ESLconnection_executeAsync" "', argument " "4"" of type '" "char const *""'"); + } + arg4 = reinterpret_cast< char * >(buf4); + } + result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4); + resultobj = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_ESLconnection_setAsyncExecute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:ESLconnection_setAsyncExecute",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_setAsyncExecute" "', argument " "1"" of type '" "ESLconnection *""'"); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_setAsyncExecute" "', argument " "2"" of type '" "char const *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + result = (int)(arg1)->setAsyncExecute((char const *)arg2); resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; @@ -4257,7 +4319,8 @@ { (char *)"ESLconnection_filter", _wrap_ESLconnection_filter, METH_VARARGS, NULL}, { (char *)"ESLconnection_events", _wrap_ESLconnection_events, METH_VARARGS, NULL}, { (char *)"ESLconnection_execute", _wrap_ESLconnection_execute, METH_VARARGS, NULL}, - { (char *)"ESLconnection_setBlockingExecute", _wrap_ESLconnection_setBlockingExecute, METH_VARARGS, NULL}, + { (char *)"ESLconnection_executeAsync", _wrap_ESLconnection_executeAsync, METH_VARARGS, NULL}, + { (char *)"ESLconnection_setAsyncExecute", _wrap_ESLconnection_setAsyncExecute, METH_VARARGS, NULL}, { (char *)"ESLconnection_setEventLock", _wrap_ESLconnection_setEventLock, METH_VARARGS, NULL}, { (char *)"ESLconnection_disconnect", _wrap_ESLconnection_disconnect, METH_VARARGS, NULL}, { (char *)"ESLconnection_swigregister", ESLconnection_swigregister, METH_VARARGS, NULL}, Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Tue Mar 24 13:03:26 2009 @@ -3236,7 +3236,68 @@ SWIGINTERN VALUE -_wrap_ESLconnection_setBlockingExecute(int argc, VALUE *argv, VALUE self) { +_wrap_ESLconnection_executeAsync(int argc, VALUE *argv, VALUE self) { + ESLconnection *arg1 = (ESLconnection *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) NULL ; + char *arg4 = (char *) NULL ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + VALUE vresult = Qnil; + + if ((argc < 1) || (argc > 3)) { + rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail; + } + res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLconnection *","executeAsync", 1, self )); + } + arg1 = reinterpret_cast< ESLconnection * >(argp1); + res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","executeAsync", 2, argv[0] )); + } + arg2 = reinterpret_cast< char * >(buf2); + if (argc > 1) { + res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","executeAsync", 3, argv[1] )); + } + arg3 = reinterpret_cast< char * >(buf3); + } + if (argc > 2) { + res4 = SWIG_AsCharPtrAndSize(argv[2], &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","executeAsync", 4, argv[2] )); + } + arg4 = reinterpret_cast< char * >(buf4); + } + result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4); + vresult = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + return vresult; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + return Qnil; +} + + +SWIGINTERN VALUE +_wrap_ESLconnection_setAsyncExecute(int argc, VALUE *argv, VALUE self) { ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; int result; @@ -3252,15 +3313,15 @@ } res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLconnection *","setBlockingExecute", 1, self )); + SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLconnection *","setAsyncExecute", 1, self )); } arg1 = reinterpret_cast< ESLconnection * >(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","setBlockingExecute", 2, argv[0] )); + SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","setAsyncExecute", 2, argv[0] )); } arg2 = reinterpret_cast< char * >(buf2); - result = (int)(arg1)->setBlockingExecute((char const *)arg2); + result = (int)(arg1)->setAsyncExecute((char const *)arg2); vresult = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return vresult; @@ -3680,7 +3741,8 @@ rb_define_method(cESLconnection.klass, "filter", VALUEFUNC(_wrap_ESLconnection_filter), -1); rb_define_method(cESLconnection.klass, "events", VALUEFUNC(_wrap_ESLconnection_events), -1); rb_define_method(cESLconnection.klass, "execute", VALUEFUNC(_wrap_ESLconnection_execute), -1); - rb_define_method(cESLconnection.klass, "setBlockingExecute", VALUEFUNC(_wrap_ESLconnection_setBlockingExecute), -1); + rb_define_method(cESLconnection.klass, "executeAsync", VALUEFUNC(_wrap_ESLconnection_executeAsync), -1); + rb_define_method(cESLconnection.klass, "setAsyncExecute", VALUEFUNC(_wrap_ESLconnection_setAsyncExecute), -1); rb_define_method(cESLconnection.klass, "setEventLock", VALUEFUNC(_wrap_ESLconnection_setEventLock), -1); rb_define_method(cESLconnection.klass, "disconnect", VALUEFUNC(_wrap_ESLconnection_disconnect), -1); cESLconnection.mark = 0; Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Tue Mar 24 13:03:26 2009 @@ -451,7 +451,7 @@ char app_buf[512] = ""; char arg_buf[512] = ""; const char *el_buf = "event-lock: true\n"; - const char *bl_buf = "blocking: true\n"; + const char *bl_buf = "async: true\n"; char send_buf[1292] = ""; if (!handle->connected) { @@ -471,7 +471,7 @@ } snprintf(send_buf, sizeof(send_buf), "%s\ncall-command: execute\n%s%s%s%s\n", - cmd_buf, app_buf, arg_buf, handle->event_lock ? el_buf : "", handle->blocking_execute ? bl_buf : ""); + cmd_buf, app_buf, arg_buf, handle->event_lock ? el_buf : "", handle->async_execute ? bl_buf : ""); return esl_send_recv(handle, send_buf); } Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Tue Mar 24 13:03:26 2009 @@ -131,12 +131,12 @@ return NULL; } -int ESLconnection::setBlockingExecute(const char *val) +int ESLconnection::setAsyncExecute(const char *val) { if (val) { - handle.blocking_execute = esl_true(val); + handle.async_execute = esl_true(val); } - return handle.blocking_execute; + return handle.async_execute; } int ESLconnection::setEventLock(const char *val) @@ -152,6 +152,19 @@ return esl_execute(&handle, app, arg, uuid); } + +int ESLconnection::executeAsync(const char *app, const char *arg, const char *uuid) +{ + int async = handle.async_execute; + int r; + + handle.async_execute = 1; + r = esl_execute(&handle, app, arg, uuid); + handle.async_execute = async; + + return r; +} + int ESLconnection::sendEvent(ESLevent *send_me) { return esl_sendevent(&handle, send_me->event); Modified: freeswitch/trunk/libs/esl/src/include/esl.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl.h Tue Mar 24 13:03:26 2009 @@ -272,7 +272,7 @@ int connected; struct sockaddr_in addr; esl_mutex_t *mutex; - int blocking_execute; + int async_execute; int event_lock; } esl_handle_t; Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Tue Mar 24 13:03:26 2009 @@ -88,7 +88,8 @@ ESLevent *filter(const char *header, const char *value); int events(const char *etype, const char *value); int execute(const char *app, const char *arg = NULL, const char *uuid = NULL); - int setBlockingExecute(const char *val); + int executeAsync(const char *app, const char *arg = NULL, const char *uuid = NULL); + int setAsyncExecute(const char *val); int setEventLock(const char *val); int disconnect(void); }; From anthm at freeswitch.org Tue Mar 24 11:06:25 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 13:06:25 -0500 Subject: [Freeswitch-svn] [commit] r12761 - freeswitch/trunk/libs/esl/perl/ESL Message-ID: Author: anthm Date: Tue Mar 24 13:06:25 2009 New Revision: 12761 Log: update Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Tue Mar 24 13:06:25 2009 @@ -58,6 +58,10 @@ sub playAndGetDigits($;) { my $self = shift; my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_; + + if (!$self->{_esl}->connected()) { + return undef; + } $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var"); @@ -69,6 +73,10 @@ my $self = shift; my ($min, $max, $file, $var, $to, $term) = @_; + if (!$self->{_esl}->connected()) { + return undef; + } + $self->execute("read", "$min $max $file $var $to $term"); return $self->getVar($var); @@ -79,6 +87,10 @@ my $self = shift; my ($file) = @_; + if (!$self->{_esl}->connected()) { + return undef; + } + $self->execute("playback", $file); return $self->getVar("playback_terminators_used"); From mikej at freeswitch.org Tue Mar 24 15:13:19 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 17:13:19 -0500 Subject: [Freeswitch-svn] [commit] r12762 - freeswitch/trunk/scripts/contrib/nmartin Message-ID: Author: mikej Date: Tue Mar 24 17:13:19 2009 New Revision: 12762 Log: add anm's folder Added: freeswitch/trunk/scripts/contrib/nmartin/ From anthm at freeswitch.org Tue Mar 24 15:22:05 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 17:22:05 -0500 Subject: [Freeswitch-svn] [commit] r12763 - in freeswitch/trunk/src/mod: applications/mod_commands event_handlers/mod_event_socket Message-ID: Author: anthm Date: Tue Mar 24 17:22:05 2009 New Revision: 12763 Log: fix typo Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Mar 24 17:22:05 2009 @@ -2598,7 +2598,7 @@ } else if (!strcasecmp(command, "tasks")) { sprintf(sql, "select * from %s", command); } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) { - if (argv[1]) { + if (argv[1] && strcasecmp(argv[1], "as")) { sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); } else { sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); @@ -2628,7 +2628,7 @@ help = 1; holder.print_title = 0; - if ((cmdname = strchr(command, ' ')) != 0) { + if ((cmdname = strchr(command, ' ')) && strcasecmp(cmdname, "as")) { *cmdname++ = '\0'; switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s' order by name", cmdname); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Mar 24 17:22:05 2009 @@ -1593,7 +1593,7 @@ strip_cr(uuid); } } - + if (switch_strlen_zero(uuid)) { uuid = switch_event_get_header(*event, "session-id"); } From brian at freeswitch.org Tue Mar 24 16:18:04 2009 From: brian at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 18:18:04 -0500 Subject: [Freeswitch-svn] [commit] r12764 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx Message-ID: Author: brian Date: Tue Mar 24 18:18:04 2009 New Revision: 12764 Log: not really a warning Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Mar 24 18:18:04 2009 @@ -221,7 +221,7 @@ switch_mutex_unlock(ps->flag_mutex); switch_clear_flag(ps, PSFLAG_HAS_TEXT); switch_clear_flag(ps, PSFLAG_READY); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Port Closed.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Port Closed.\n"); switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); return SWITCH_STATUS_SUCCESS; } From anthm at freeswitch.org Tue Mar 24 16:44:03 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 18:44:03 -0500 Subject: [Freeswitch-svn] [commit] r12765 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_sofia mod/event_handlers/mod_cdr_csv mod/event_handlers/mod_event_socket Message-ID: Author: anthm Date: Tue Mar 24 18:44:03 2009 New Revision: 12765 Log: fix var events to not have stamp info Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Mar 24 18:44:03 2009 @@ -332,6 +332,15 @@ */ #define switch_event_create(event, id) switch_event_create_subclass(event, id, SWITCH_EVENT_SUBCLASS_ANY) +static inline switch_status_t switch_event_create_plain(switch_event_t **event, switch_event_types_t event_id) +{ + switch_status_t status = switch_event_create(event, SWITCH_EVENT_CLONE); + if (status == SWITCH_STATUS_SUCCESS) { + (*event)->event_id = event_id; + } + + return status; +} /*! \brief Deliver an event to all of the registered event listeners \param event the event to send (will be nulled) Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 24 18:44:03 2009 @@ -938,7 +938,7 @@ switch_event_t *event; char *buf; - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create_plain(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(switch_core_session_get_channel(session), event); switch_event_serialize(event, &buf, SWITCH_FALSE); switch_assert(buf); 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 Mar 24 18:44:03 2009 @@ -1147,14 +1147,14 @@ if (in) { if (!gateway->ib_vars) { - switch_event_create(&gateway->ib_vars, SWITCH_EVENT_GENERAL); + switch_event_create_plain(&gateway->ib_vars, SWITCH_EVENT_GENERAL); } switch_event_add_header_string(gateway->ib_vars, SWITCH_STACK_BOTTOM, var, val); } if (out) { if (!gateway->ob_vars) { - switch_event_create(&gateway->ob_vars, SWITCH_EVENT_GENERAL); + switch_event_create_plain(&gateway->ob_vars, SWITCH_EVENT_GENERAL); } switch_event_add_header_string(gateway->ob_vars, SWITCH_STACK_BOTTOM, var, val); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Mar 24 18:44:03 2009 @@ -1780,8 +1780,10 @@ if (first && ret == AUTH_OK) { if (v_event) { - switch_event_create(v_event, SWITCH_EVENT_REQUEST_PARAMS); + switch_event_create_plain(v_event, SWITCH_EVENT_REQUEST_PARAMS); } + + if (v_event && *v_event) { switch_xml_t xparams[3]; int i = 0; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Tue Mar 24 18:44:03 2009 @@ -199,7 +199,7 @@ if (globals.debug) { switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create_plain(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { char *buf; switch_channel_event_set_data(channel, event); switch_event_serialize(event, &buf, SWITCH_FALSE); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Mar 24 18:44:03 2009 @@ -611,8 +611,7 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } if (!strcasecmp(action, "delete")) { @@ -623,8 +622,7 @@ if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } else { switch_event_del_header(listener->filters, header_val); } @@ -1408,15 +1406,13 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } if (!strcasecmp(header_name, "delete")) { if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } else { switch_event_del_header(listener->filters, header_val); } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 24 18:44:03 2009 @@ -220,7 +220,7 @@ return SWITCH_STATUS_MEMERR; } - switch_event_create(&(*channel)->variables, SWITCH_EVENT_GENERAL); + switch_event_create_plain(&(*channel)->variables, SWITCH_EVENT_CHANNEL_DATA); switch_core_hash_init(&(*channel)->private_hash, pool); switch_queue_create(&(*channel)->dtmf_queue, SWITCH_DTMF_LOG_LEN, pool); From nmartin at freeswitch.org Tue Mar 24 17:24:21 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 19:24:21 -0500 Subject: [Freeswitch-svn] [commit] r12766 - freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial Message-ID: Author: nmartin Date: Tue Mar 24 19:24:21 2009 New Revision: 12766 Log: initial import click2dial applet OS X only :( Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/ freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/README.txt freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/click2dial.zip (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/linkify.user.js Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/README.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/README.txt Tue Mar 24 19:24:21 2009 @@ -0,0 +1,48 @@ +README + +Client Side Click2Dial + +============================================================== +Copyright (c) 2009 Nik Martin + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +The original author of this work, Nik Martin, must be credited +as the original author of this work. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +============================================================== + +Setup: + +Unzip Click2Dial.zip. + +Inside fs_dial.app, edit COntents/Resources/fsdial.py to set up your server information and phone number + +Import linkify.user.js into greasemonkey (http://www.greasespot.net/) + +Double Click fs_dial.app to register it as the handler for dial:// urls + +The greasemonkey script will linkify any text on a web page that looks like a phone number. +You can edit the reg-ex inside the greasemonkey script to match different types of numbers. + +The fsdial.py script assumes you have a default context, and outbound calls should go to this context \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/click2dial.zip ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/linkify.user.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/linkify.user.js Tue Mar 24 19:24:21 2009 @@ -0,0 +1,78 @@ +// FreeSWITCH Dial Linkify +// Author: Nik Martin +// License: MIT +// +//This script was taken from another script here: http://userscripts.org/scripts/show/1003 +// +// Matches these patterns: +// 800-555-1212 +// (800) 555-1212 +// (800)555-1212 +// 8005551212 +// Weak since it does any 10+ digit number +// 800.555.1212 +// Tested with: +// www.yellowpages.com +// local.google.com +// a9.com +// +// International calling sure would be neat +// ==UserScript== +// @name FreeSWITCH Dial Linkify +// @namespace +// @description Looks for phone numbers in pages and makes hyperlinks out of them. When clicking on the link, FS will connect your phone to the number you clicked +// @include * +// ==/UserScript== + +(function () { + +//this is the test to see if the number looks like a phone number or not + const trackRegex = /(\+\d\d?)?[\-\s\/\.]?[$]?(\d){2,4}[$]?[\-\s\/\.]?\d\d\d[\-\s\/\.]?(\d){3,5}\b/ig; + + function trackUrl(t) { + return "dial://org.FreeSWITCH.Dialer?number=" + String(t).replace(/[\- \.]/g, ""); + } + + // tags we will scan looking for un-hyperlinked urls + var allowedParents = [ + "abbr", "acronym", "address", "applet", "b", "bdo", "big", "blockquote", "body", + "caption", "center", "cite", "code", "dd", "del", "div", "dfn", "dt", "em", + "fieldset", "font", "form", "h1", "h2", "h3", "h4", "h5", "h6", "i", "iframe", + "ins", "kdb", "li", "object", "nobr", "pre", "p", "q", "samp", "small", "span", "strike", + "s", "strong", "sub", "sup", "td", "th", "tt", "u", "var" + ]; + + var xpath = "//text()[(parent::" + allowedParents.join(" or parent::") + ")" + + //" and contains(translate(., 'HTTP', 'http'), 'http') + " + + "]"; + + var candidates = document.evaluate(xpath, document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null); + + //var t0 = new Date().getTime(); + for (var cand = null, i = 0; (cand = candidates.snapshotItem(i)); i++) { + if (trackRegex.test(cand.nodeValue)) { + var span = document.createElement("span"); + var source = cand.nodeValue; + + cand.parentNode.replaceChild(span, cand); + + trackRegex.lastIndex = 0; + for (var match = null, lastLastIndex = 0; (match = trackRegex.exec(source)); ) { + span.appendChild(document.createTextNode(source.substring(lastLastIndex, match.index))); + + var a = document.createElement("a"); + a.setAttribute("href", trackUrl(match[0])); + a.appendChild(document.createTextNode(match[0])); + span.appendChild(a); + + lastLastIndex = trackRegex.lastIndex; + } + + span.appendChild(document.createTextNode(source.substring(lastLastIndex))); + span.normalize(); + } + } + // var t1 = new Date().getTime(); + // alert("X-Lite Dial linkify took " + ((t1 - t0) / 1000) + " seconds"); + +})(); From nmartin at freeswitch.org Tue Mar 24 17:39:41 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 19:39:41 -0500 Subject: [Freeswitch-svn] [commit] r12767 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Tue Mar 24 19:39:41 2009 New Revision: 12767 Log: initial import Address Book Dialer applet OS X only :( Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ESL.pyc (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/_ESL.so (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.py freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/test.scpt (contents, props changed) Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ESL.pyc ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Tue Mar 24 19:39:41 2009 @@ -0,0 +1,39 @@ +README + + +============================================================== +Copyright (c) 2009 Nik Martin + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +The original author of this work, Nik Martin, must be credited +as the original author of this work. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +============================================================== + + +Drop all thee files in ~/Library/Address Book Scripts + +Edit fsdial.py to set up your server information and phone number + +Start Address Book. You should now have a FS Dial entry on the popup menu on phone numbers now. \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/_ESL.so ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.py Tue Mar 24 19:39:41 2009 @@ -0,0 +1,82 @@ +#!/usr/bin/env python + + +#============================================================== +#Copyright (c) 2009 Nik Martin +# +#Permission is hereby granted, free of charge, to any person +#obtaining a copy of this software and associated documentation +#files (the "Software"), to deal in the Software without +#restriction, including without limitation the rights to use, +#copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the +#Software is furnished to do so, subject to the following +#conditions: +# +#The above copyright notice and this permission notice shall be +#included in all copies or substantial portions of the Software. +# +#The original author of this work, Nik Martin, must be credited +#as the original author of this work. +# +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +#EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +#OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +#NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +#HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +#WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +#FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +#OTHER DEALINGS IN THE SOFTWARE. +# +# +#============================================================== + +import string +import sys +from optparse import OptionParser +from ESL import * + + +def main(argv): + # change these to match your configuration + my_number = "1000" #@mydomain.com + server_addr = "fs.ip.add.ress" + server_port = "8021" + server_auth = "ClueCon" + + + try: + + parser = OptionParser() + parser.add_option("-n", "--number", dest="number", + help="number to dial") + + (options, args) = parser.parse_args() + + + if not options.number: + print "ERROR: destination number required" + sys.exit(2) + + cmd = "api originate {ignore_early_media=true,origination_caller_id_number=" + options.number + ",effective_caller_id_number=" + my_number + "}user/" + my_number + " &transfer(" + options.number + " XML default)" + print cmd + + con = ESLconnection(server_addr, server_port, server_auth) + #are we connected? + + if con.connected: + + e=con.sendRecv(cmd) + print e.getBody() + + else: + + print "Not Connected" + sys.exit(2) + + except: + print "Unexpected error:", sys.exc_info()[0] + raise + +if __name__ == "__main__": + main(sys.argv[1:]) \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/test.scpt ============================================================================== Binary file. No diff available. From nmartin at freeswitch.org Tue Mar 24 17:40:03 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 19:40:03 -0500 Subject: [Freeswitch-svn] [commit] r12768 - in freeswitch/trunk/scripts/contrib/nmartin: fs_client_side_click2dial osx_click2dial Message-ID: Author: nmartin Date: Tue Mar 24 19:40:02 2009 New Revision: 12768 Log: delete old folder Added: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/ - copied from r12766, /freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/ Removed: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/ Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/click2dial.zip Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/click2dial.zip ============================================================================== Binary files. No diff available. From nmartin at freeswitch.org Tue Mar 24 17:49:53 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 19:49:53 -0500 Subject: [Freeswitch-svn] [commit] r12769 - freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial Message-ID: Author: nmartin Date: Tue Mar 24 19:49:53 2009 New Revision: 12769 Log: fix typo for SwK Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt Tue Mar 24 19:49:53 2009 @@ -36,7 +36,7 @@ Unzip Click2Dial.zip. -Inside fs_dial.app, edit COntents/Resources/fsdial.py to set up your server information and phone number +Inside fs_dial.app, edit Contents/Resources/fsdial.py to set up your server information and phone number Import linkify.user.js into greasemonkey (http://www.greasespot.net/) From nmartin at freeswitch.org Tue Mar 24 18:05:30 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 20:05:30 -0500 Subject: [Freeswitch-svn] [commit] r12770 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Tue Mar 24 20:05:30 2009 New Revision: 12770 Log: fix typo Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Tue Mar 24 20:05:30 2009 @@ -32,7 +32,7 @@ ============================================================== -Drop all thee files in ~/Library/Address Book Scripts +Drop all files in ~/Library/Address Book Scripts Edit fsdial.py to set up your server information and phone number From nmartin at freeswitch.org Tue Mar 24 19:20:12 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 21:20:12 -0500 Subject: [Freeswitch-svn] [commit] r12771 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Tue Mar 24 21:20:12 2009 New Revision: 12771 Log: removed personal info from test.scpt removed binary ESL lib files. these should be built from source and distributed to users locally Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/test.scpt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/test.scpt ============================================================================== Binary files. No diff available. From nmartin at freeswitch.org Tue Mar 24 19:21:52 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 21:21:52 -0500 Subject: [Freeswitch-svn] [commit] r12772 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Tue Mar 24 21:21:52 2009 New Revision: 12772 Log: removed binary ESL lib files. these should be built from source and distributed to users locally Removed: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ESL.pyc From nmartin at freeswitch.org Tue Mar 24 19:22:23 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 21:22:23 -0500 Subject: [Freeswitch-svn] [commit] r12773 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Tue Mar 24 21:22:23 2009 New Revision: 12773 Log: removed binary ESL lib files. these should be built from source and distributed to users locally Removed: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/_ESL.so From nmartin at freeswitch.org Tue Mar 24 19:26:28 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Tue, 24 Mar 2009 21:26:28 -0500 Subject: [Freeswitch-svn] [commit] r12774 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Tue Mar 24 21:26:28 2009 New Revision: 12774 Log: added vague instructions for deploying ESL libs on client Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Tue Mar 24 21:26:28 2009 @@ -36,4 +36,7 @@ Edit fsdial.py to set up your server information and phone number -Start Address Book. You should now have a FS Dial entry on the popup menu on phone numbers now. \ No newline at end of file +Start Address Book. You should now have a FS Dial entry on the popup menu on phone numbers now. + +These scripts depend on ESL libs to be loaded on the machine that the scripts run on. These should be +built on a dev machice and loaded on the client machine in the proper locations (python libs) \ No newline at end of file From nmartin at freeswitch.org Wed Mar 25 07:08:16 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 09:08:16 -0500 Subject: [Freeswitch-svn] [commit] r12775 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Wed Mar 25 09:08:16 2009 New Revision: 12775 Log: added contact info for bugs, features, and whatnot Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Wed Mar 25 09:08:16 2009 @@ -1,5 +1,6 @@ README +For support, contact me at freeswitch at servercorps.com ============================================================== Copyright (c) 2009 Nik Martin From nmartin at freeswitch.org Wed Mar 25 07:08:39 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 09:08:39 -0500 Subject: [Freeswitch-svn] [commit] r12776 - freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial Message-ID: Author: nmartin Date: Wed Mar 25 09:08:39 2009 New Revision: 12776 Log: added contact info for bugs, features, and whatnot Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt Wed Mar 25 09:08:39 2009 @@ -2,6 +2,8 @@ Client Side Click2Dial +For support, contact me at freeswitch at servercorps.com + ============================================================== Copyright (c) 2009 Nik Martin From silik0n at freeswitch.org Wed Mar 25 09:32:05 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 11:32:05 -0500 Subject: [Freeswitch-svn] [commit] r12777 - freeswitch/trunk/scripts/contrib/swk/php/amfphp Message-ID: Author: silik0n Date: Wed Mar 25 11:32:04 2009 New Revision: 12777 Log: oops Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Wed Mar 25 11:32:04 2009 @@ -63,7 +63,7 @@ /*** General Whats happening Methods ***/ public function getStatus() { - $esl = new eslConnection($this->esl_ser"ver, $this->esl_port, $this->esl_secret); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api status"); $body = $e->getBody(); return $body; From silik0n at freeswitch.org Wed Mar 25 09:33:58 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 11:33:58 -0500 Subject: [Freeswitch-svn] [commit] r12778 - in freeswitch/trunk/scripts/contrib/swk/flex/amf-test1: bin-debug src Message-ID: Author: silik0n Date: Wed Mar 25 11:33:58 2009 New Revision: 12778 Log: fix some stuff ad some stuff Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.swf freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/bin-debug/main.swf ============================================================================== Binary files. No diff available. Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Wed Mar 25 11:33:58 2009 @@ -128,7 +128,7 @@ public function dgChangeDomainUserVars(event:DataGridEvent):void { var _rowIndex:Number=event.rowIndex; var _columnIndex:Number= event.columnIndex; - freeswitch.updateDirDomainUserVars(dgDomainUserVars.selectedItem.uid, dgDomainUserVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); + freeswitch.updateDirDomainUserVar(dgDomainUserVars.selectedItem.uid, dgDomainUserVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); } @@ -399,6 +399,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From mikej at freeswitch.org Wed Mar 25 09:44:17 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 11:44:17 -0500 Subject: [Freeswitch-svn] [commit] r12779 - freeswitch/trunk/libs/sofia-sip Message-ID: Author: mikej Date: Wed Mar 25 11:44:16 2009 New Revision: 12779 Log: move library checks to the end to keep from incorrect -lz added to LIBS from pkg-config to openssl on 64 bit when only 32 bit zlib-devel is installed. This was causing other checks to fail. Modified: freeswitch/trunk/libs/sofia-sip/configure.ac Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Wed Mar 25 11:44:16 2009 @@ -95,80 +95,6 @@ fi fi -### checks for libraries -### -------------------- - -SAC_SOFIA_SU -SAC_OPENSSL -SAC_TPORT - -dnl Check is used for testing -PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no") -AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") -if test x"$have_check" = "xyes"; then - AC_DEFINE([HAVE_CHECK], 1, [Define to 1 if check library is available]) -fi -AC_CHECK_HEADERS([fnmatch.h]) - -dnl dl is currently used only in testing -AC_CHECK_LIB([dl], [dlopen], [ - dnl Note: -ldl is not added to LIBS - AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dl library is available]) -]) - -### internal modules -### ---------------- -AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define to 1 always]) -AC_DEFINE([HAVE_SOFIA_SRESOLV], 1, [Define to 1 if we use DNS library]) -AC_DEFINE([HAVE_SOFIA_SMIME], 0, [Define to 1 if we use S/MIME library]) - -AC_ARG_ENABLE(stun, -[ --disable-stun disable stun module (enabled)], - , enable_stun=yes) - -if test x$enable_stun = xno ; then - AC_MSG_WARN([** STUN support disabled **]) -elif test x${HAVE_OPENSSL} != x1 ; then - dnl compile STUN only if OPENSSL is available - AC_MSG_WARN([** TLS support for STUN disabled as OpenSSL headers and/or libraries were not found **]) - AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define to 1 if we use STUN library]) -else - AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define to 1 if we use STUN library]) -fi -AM_CONDITIONAL([HAVE_STUN], [test "x$enable_stun" = xyes]) - -AC_ARG_ENABLE(nth, -[ --disable-nth disable HTTP-related modules nth and http (enabled)], - , enable_nth=yes) -AM_CONDITIONAL([HAVE_NTH], [test "x$enable_nth" = xyes]) -if test x$enable_nth = xyes ; then - AC_DEFINE([HAVE_SOFIA_NTH], 1, [Define to 1 if we use NTH library]) - AC_DEFINE([HAVE_SOFIA_HTTP], 1, [Define to 1 if we use HTTP parser library]) -fi - -dnl Disable NTLM support by default -AC_ARG_ENABLE(ntlm, -[ --enable-ntlm enable NTLM support [[disabled]]], - , enable_ntlm=no) - -if test x$enable_ntlm = xyes ; then - AC_DEFINE([HAVE_SOFIA_NTLM], 1, [Define to 1 if we use NTLM library]) -fi -AM_CONDITIONAL([HAVE_NTLM], [test "x$enable_ntlm" = xyes]) - - -AC_DEFINE([HAVE_SRTP], 0, [Define to 1 if we use SRTP]) -AC_DEFINE([HAVE_UPNP], 0, [Define to 1 if we use UPnP]) - - -AC_ARG_ENABLE(memleak_log, -[ --enable-memleak-log enable logging of possible memory leaks [[disabled]]], - , enable_memleak_log=no) - -if test x$enable_memleak_log = xyes ; then - AC_DEFINE([HAVE_MEMLEAK_LOG], 1, [Define to 1 for memory-leak-related logging]) -fi - ### checks for header files ### ----------------------- AC_HEADER_STDC @@ -296,6 +222,80 @@ AC_DEV_URANDOM +### checks for libraries +### -------------------- + +SAC_SOFIA_SU +SAC_OPENSSL +SAC_TPORT + +dnl Check is used for testing +PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no") +AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") +if test x"$have_check" = "xyes"; then + AC_DEFINE([HAVE_CHECK], 1, [Define to 1 if check library is available]) +fi +AC_CHECK_HEADERS([fnmatch.h]) + +dnl dl is currently used only in testing +AC_CHECK_LIB([dl], [dlopen], [ + dnl Note: -ldl is not added to LIBS + AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dl library is available]) +]) + +### internal modules +### ---------------- +AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define to 1 always]) +AC_DEFINE([HAVE_SOFIA_SRESOLV], 1, [Define to 1 if we use DNS library]) +AC_DEFINE([HAVE_SOFIA_SMIME], 0, [Define to 1 if we use S/MIME library]) + +AC_ARG_ENABLE(stun, +[ --disable-stun disable stun module (enabled)], + , enable_stun=yes) + +if test x$enable_stun = xno ; then + AC_MSG_WARN([** STUN support disabled **]) +elif test x${HAVE_OPENSSL} != x1 ; then + dnl compile STUN only if OPENSSL is available + AC_MSG_WARN([** TLS support for STUN disabled as OpenSSL headers and/or libraries were not found **]) + AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define to 1 if we use STUN library]) +else + AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define to 1 if we use STUN library]) +fi +AM_CONDITIONAL([HAVE_STUN], [test "x$enable_stun" = xyes]) + +AC_ARG_ENABLE(nth, +[ --disable-nth disable HTTP-related modules nth and http (enabled)], + , enable_nth=yes) +AM_CONDITIONAL([HAVE_NTH], [test "x$enable_nth" = xyes]) +if test x$enable_nth = xyes ; then + AC_DEFINE([HAVE_SOFIA_NTH], 1, [Define to 1 if we use NTH library]) + AC_DEFINE([HAVE_SOFIA_HTTP], 1, [Define to 1 if we use HTTP parser library]) +fi + +dnl Disable NTLM support by default +AC_ARG_ENABLE(ntlm, +[ --enable-ntlm enable NTLM support [[disabled]]], + , enable_ntlm=no) + +if test x$enable_ntlm = xyes ; then + AC_DEFINE([HAVE_SOFIA_NTLM], 1, [Define to 1 if we use NTLM library]) +fi +AM_CONDITIONAL([HAVE_NTLM], [test "x$enable_ntlm" = xyes]) + + +AC_DEFINE([HAVE_SRTP], 0, [Define to 1 if we use SRTP]) +AC_DEFINE([HAVE_UPNP], 0, [Define to 1 if we use UPnP]) + + +AC_ARG_ENABLE(memleak_log, +[ --enable-memleak-log enable logging of possible memory leaks [[disabled]]], + , enable_memleak_log=no) + +if test x$enable_memleak_log = xyes ; then + AC_DEFINE([HAVE_MEMLEAK_LOG], 1, [Define to 1 for memory-leak-related logging]) +fi + ### output ### ------ From brian at freeswitch.org Wed Mar 25 09:45:43 2009 From: brian at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 11:45:43 -0500 Subject: [Freeswitch-svn] [commit] r12780 - freeswitch/trunk/src/mod/applications/mod_soundtouch Message-ID: Author: brian Date: Wed Mar 25 11:45:43 2009 New Revision: 12780 Log: MODAPP-243 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Wed Mar 25 11:45:43 2009 @@ -14,6 +14,7 @@ $(GETLIB) $(VERSION).tar.gz cd $(DIRECTORY) && ./configure $(DEFAULT_ARGS) --enable-integer-samples -$(LA): $(DIRECTORY) +$(LA): + $(DIRECTORY) cd $(DIRECTORY) && $(MAKE) $(TOUCH_TARGET) From mikej at freeswitch.org Wed Mar 25 09:59:25 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 11:59:25 -0500 Subject: [Freeswitch-svn] [commit] r12781 - freeswitch/trunk/src/mod/applications/mod_soundtouch Message-ID: Author: mikej Date: Wed Mar 25 11:59:25 2009 New Revision: 12781 Log: revert r12780/MODAPP-243 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Wed Mar 25 11:59:25 2009 @@ -14,7 +14,6 @@ $(GETLIB) $(VERSION).tar.gz cd $(DIRECTORY) && ./configure $(DEFAULT_ARGS) --enable-integer-samples -$(LA): - $(DIRECTORY) +$(LA): $(DIRECTORY) cd $(DIRECTORY) && $(MAKE) $(TOUCH_TARGET) From anthm at freeswitch.org Wed Mar 25 11:47:47 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 13:47:47 -0500 Subject: [Freeswitch-svn] [commit] r12782 - freeswitch/trunk/src/mod/applications/mod_fifo Message-ID: Author: anthm Date: Wed Mar 25 13:47:47 2009 New Revision: 12782 Log: fix incorrect var name Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 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 Wed Mar 25 13:47:47 2009 @@ -464,7 +464,7 @@ channel = switch_core_session_get_channel(session); - if ((member_wait = switch_channel_get_variable(channel, "member_wait"))) { + if ((member_wait = switch_channel_get_variable(channel, "fifo_member_wait")) || (member_wait = switch_channel_get_variable(channel, "member_wait"))) { if (strcasecmp(member_wait, "wait") && strcasecmp(member_wait, "nowait")) { member_wait = NULL; } From mikej at freeswitch.org Wed Mar 25 12:34:37 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 14:34:37 -0500 Subject: [Freeswitch-svn] [commit] r12783 - freeswitch/trunk/src/mod/applications/mod_soundtouch Message-ID: Author: mikej Date: Wed Mar 25 14:34:37 2009 New Revision: 12783 Log: fix libsoundtouch build dependencies after a configure failure (MODAPP-243) Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Wed Mar 25 14:34:37 2009 @@ -1,4 +1,3 @@ - VERSION=soundtouch-1.3.1 DIRECTORY=$(switch_srcdir)/libs/$(VERSION) LA=$(DIRECTORY)/source/SoundTouch/.libs/libSoundTouch.a @@ -10,10 +9,12 @@ include $(BASE)/build/modmake.rules -$(DIRECTORY): +$(DIRECTORY)/Makefile $(DIRECTORY)/config.status: $(GETLIB) $(VERSION).tar.gz cd $(DIRECTORY) && ./configure $(DEFAULT_ARGS) --enable-integer-samples + $(TOUCH_TARGET) -$(LA): $(DIRECTORY) +$(LA): $(DIRECTORY)/Makefile $(DIRECTORY)/config.status cd $(DIRECTORY) && $(MAKE) $(TOUCH_TARGET) + From anthm at freeswitch.org Wed Mar 25 13:07:41 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 15:07:41 -0500 Subject: [Freeswitch-svn] [commit] r12784 - in freeswitch/trunk/src: . include mod/event_handlers/mod_cdr_csv Message-ID: Author: anthm Date: Wed Mar 25 15:07:40 2009 New Revision: 12784 Log: rearrange hangup callflow to do more work in the session's own thread Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Wed Mar 25 15:07:40 2009 @@ -511,6 +511,7 @@ SWITCH_DECLARE(void) switch_channel_set_app_flag(switch_channel_t *channel, uint32_t flags); SWITCH_DECLARE(void) switch_channel_clear_app_flag(switch_channel_t *channel, uint32_t flags); SWITCH_DECLARE(int) switch_channel_test_app_flag(switch_channel_t *channel, uint32_t flags); +SWITCH_DECLARE(void) switch_channel_set_hangup_time(switch_channel_t *channel); /** @} */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Wed Mar 25 15:07:40 2009 @@ -209,7 +209,7 @@ free(buf); } } - + g_template_str = (const char *) switch_core_hash_find(globals.template_hash, globals.default_template); if ((accountcode = switch_channel_get_variable(channel, "ACCOUNTCODE"))) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Mar 25 15:07:40 2009 @@ -609,10 +609,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check) { + switch_status_t status = SWITCH_STATUS_FALSE; + switch_assert(channel != NULL); + switch_mutex_lock(channel->profile_mutex); if (channel->variables && !switch_strlen_zero(varname)) { - switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); if (!switch_strlen_zero(value)) { int ok = 1; @@ -626,11 +628,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname); } } - switch_mutex_unlock(channel->profile_mutex); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } + switch_mutex_unlock(channel->profile_mutex); - return SWITCH_STATUS_FALSE; + return status; } switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data); @@ -640,10 +642,12 @@ int ret = 0; char *data; va_list ap; + switch_status_t status = SWITCH_STATUS_FALSE; + switch_assert(channel != NULL); + switch_mutex_lock(channel->profile_mutex); if (channel->variables && !switch_strlen_zero(varname)) { - switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); va_start(ap, fmt); @@ -657,11 +661,11 @@ switch_event_base_add_header(channel->variables, SWITCH_STACK_BOTTOM, varname, data); - switch_mutex_unlock(channel->profile_mutex); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } + switch_mutex_unlock(channel->profile_mutex); - return SWITCH_STATUS_FALSE; + return status; } @@ -1582,6 +1586,16 @@ } +SWITCH_DECLARE(void) switch_channel_set_hangup_time(switch_channel_t *channel) +{ + if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) { + switch_mutex_lock(channel->profile_mutex); + channel->caller_profile->times->hungup = switch_micro_time_now(); + switch_mutex_unlock(channel->profile_mutex); + } +} + + SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel, const char *file, const char *func, int line, switch_call_cause_t hangup_cause) { @@ -1590,17 +1604,8 @@ switch_channel_clear_flag(channel, CF_BLOCK_STATE); if (channel->state < CS_HANGUP) { - switch_event_t *event; switch_channel_state_t last_state = channel->state; - if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) { - switch_mutex_lock(channel->profile_mutex); - channel->caller_profile->times->hungup = switch_micro_time_now(); - switch_mutex_unlock(channel->profile_mutex); - } - - switch_channel_stop_broadcast(channel); - switch_mutex_lock(channel->state_mutex); channel->state = CS_HANGUP; switch_mutex_unlock(channel->state_mutex); @@ -1608,21 +1613,9 @@ channel->hangup_cause = hangup_cause; switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause)); - - switch_channel_set_variable(channel, "hangup_cause", switch_channel_cause2str(channel->hangup_cause)); - switch_channel_presence(channel, "unavailable", switch_channel_cause2str(channel->hangup_cause), NULL); switch_core_session_kill_channel(channel->session, SWITCH_SIG_KILL); switch_core_session_signal_state_change(channel->session); - - switch_channel_set_timestamps(channel); - - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Hangup-Cause", switch_channel_cause2str(channel->hangup_cause)); - switch_channel_event_set_data(channel, event); - switch_event_fire(&event); - } - } return channel->state; Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Mar 25 15:07:40 2009 @@ -424,8 +424,19 @@ { const char *hook_var; switch_core_session_t *use_session = NULL; - + switch_call_cause_t cause = switch_channel_get_cause(session->channel); + switch_event_t *event; + + switch_channel_set_hangup_time(session->channel); + switch_core_media_bug_remove_all(session); + + switch_channel_stop_broadcast(session->channel); + + switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause)); + switch_channel_presence(session->channel, "unavailable", switch_channel_cause2str(cause), NULL); + + switch_channel_set_timestamps(session->channel); STATE_MACRO(hangup, "HANGUP"); @@ -462,8 +473,16 @@ } switch_safe_free(stream.data); } + + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Hangup-Cause", switch_channel_cause2str(cause)); + switch_channel_event_set_data(session->channel, event); + switch_event_fire(&event); + } + + switch_channel_set_state(session->channel, CS_REPORTING); } - switch_channel_set_state(session->channel, CS_REPORTING); + break; case CS_INIT: /* Basic setup tasks */ STATE_MACRO(init, "INIT"); From anthm at freeswitch.org Wed Mar 25 13:14:07 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 15:14:07 -0500 Subject: [Freeswitch-svn] [commit] r12785 - in freeswitch/trunk/src: include mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Wed Mar 25 15:14:07 2009 New Revision: 12785 Log: add username and realm to sip db Modified: freeswitch/trunk/src/include/switch_utils.h 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_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Mar 25 15:14:07 2009 @@ -57,6 +57,7 @@ SWITCH_DECLARE(int) switch_isxdigit(int c); #define switch_goto_status(_status, _label) status = _status; goto _label +#define switch_goto_int(_n, _i, _label) _n = _i; goto _label #define switch_samples_per_packet(rate, interval) ((uint32_t)((float)rate / (1000.0f / (float)interval))) #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768 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 Wed Mar 25 15:14:07 2009 @@ -1488,14 +1488,19 @@ } cb->stream->write_function(cb->stream, - "Call-ID: \t%s\n" - "User: \t%s@%s\n" - "Contact: \t%s\n" - "Agent: \t%s\n" - "Status: \t%s(%s) EXP(%s)\n" - "Host: \t%s\n\n", + "Call-ID: \t%s\n" + "User: \t%s@%s\n" + "Contact: \t%s\n" + "Agent: \t%s\n" + "Status: \t%s(%s) EXP(%s)\n" + "Host: \t%s\n" + "IP: \t%s\n" + "Port: \t%s\n" + "Auth-User: \t%s\n" + "Auth-Realm: \t%s\n\n", switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), switch_str_nil(argv[3]), - switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11])); + switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11]), + switch_str_nil(argv[12]), switch_str_nil(argv[13]), switch_str_nil(argv[14]), switch_str_nil(argv[15])); return 0; } @@ -1516,16 +1521,22 @@ } cb->stream->write_function(cb->stream, - "\n" - "%s\n" - "%s@%s\n" - "%s\n" - "%s\n" - "%s(%s) EXP(%s)\n" - "%s\n" - "\n", - switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), switch_amp_encode(switch_str_nil(argv[3]),xmlbuf,buflen), - switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11])); + " \n" + " %s\n" + " %s@%s\n" + " %s\n" + " %s\n" + " %s(%s) exp(%s)\n" + " %s\n" + " %s\n" + " %s\n" + " %s\n" + " %s\n" + " \n", + switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), + switch_amp_encode(switch_str_nil(argv[3]),xmlbuf,buflen), + switch_str_nil(argv[7]), switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf, switch_str_nil(argv[11]), + switch_str_nil(argv[12]), switch_str_nil(argv[13]), switch_str_nil(argv[14]), switch_str_nil(argv[15])); return 0; } @@ -1639,13 +1650,15 @@ if (argv[4]) { if (!strcasecmp(argv[3], "pres")) { sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname," + "network_ip,network_port,sip_username,sip_realm" " from sip_registrations where profile_name='%q' and presence_hosts like '%%%q%%'", profile->name, argv[4]); } } else { sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname," + "network_ip,network_port,sip_username,sip_realm" " from sip_registrations where profile_name='%q' and contact like '%%%q%%'", profile->name, argv[3]); } @@ -1653,7 +1666,8 @@ if (!sql) { sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname," + "network_ip,network_port,sip_username,sip_realm" " from sip_registrations where profile_name='%q'", profile->name); } @@ -1739,28 +1753,29 @@ if (!strcasecmp(argv[0], "gateway")) { if ((gp = sofia_reg_find_gateway(argv[1]))) { switch_assert(gp->state < REG_STATE_LAST); - stream->write_function(stream, "%s\n", header); - stream->write_function(stream, "\n"); - stream->write_function(stream, "%s\n", switch_str_nil(gp->name)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->register_scheme)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->register_realm)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->register_username)); - stream->write_function(stream, "%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); - stream->write_function(stream, "%s\n", switch_amp_encode(switch_str_nil(gp->register_from),xmlbuf,buflen)); - stream->write_function(stream, "%s\n", switch_amp_encode(switch_str_nil(gp->register_contact),xmlbuf,buflen)); - stream->write_function(stream, "%s\n", switch_amp_encode(switch_str_nil(gp->extension),xmlbuf,buflen)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->register_to)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->register_proxy)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->register_context)); - stream->write_function(stream, "%s\n", switch_str_nil(gp->expires_str)); - stream->write_function(stream, "%d\n", gp->freq); - stream->write_function(stream, "%d\n", gp->ping); - stream->write_function(stream, "%d\n", gp->ping_freq); - stream->write_function(stream, "%s\n", sofia_state_names[gp->state]); - stream->write_function(stream, "%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); - stream->write_function(stream, "%d\n", gp->ib_calls); - stream->write_function(stream, "%d\n", gp->ob_calls); - stream->write_function(stream, "\n"); + stream->write_function(stream, "%s\n", header); + stream->write_function(stream, " \n"); + stream->write_function(stream, " %s\n", switch_str_nil(gp->name)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->register_scheme)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->register_realm)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->register_username)); + stream->write_function(stream, " %s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); + stream->write_function(stream, " %s\n", switch_amp_encode(switch_str_nil(gp->register_from),xmlbuf,buflen)); + stream->write_function(stream, " %s\n", switch_amp_encode(switch_str_nil(gp->register_contact),xmlbuf,buflen)); + stream->write_function(stream, " %s\n", switch_amp_encode(switch_str_nil(gp->extension),xmlbuf,buflen)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->register_to)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->register_proxy)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->register_context)); + stream->write_function(stream, " %s\n", switch_str_nil(gp->expires_str)); + stream->write_function(stream, " %d\n", gp->freq); + stream->write_function(stream, " %d\n", gp->ping); + stream->write_function(stream, " %d\n", gp->ping_freq); + stream->write_function(stream, " %s\n", sofia_state_names[gp->state]); + stream->write_function(stream, " %s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, " %d\n", gp->ib_calls); + stream->write_function(stream, " %d\n", gp->ob_calls); + + stream->write_function(stream, " \n"); sofia_reg_release_gateway(gp); } else { stream->write_function(stream, "Invalid Gateway!\n"); @@ -1772,57 +1787,47 @@ if ((argv[1]) && (profile = sofia_glue_find_profile(argv[1]))) { if (!argv[2] || strcasecmp(argv[2], "reg")) { stream->write_function(stream, "%s\n", header); - stream->write_function(stream, "\n"); - stream->write_function(stream, "\n"); - stream->write_function(stream, "%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "%s\n", profile->domain_name ? profile->domain_name : "N/A"); + stream->write_function(stream, " \n"); + stream->write_function(stream, " \n"); + stream->write_function(stream, " %s\n", switch_str_nil(argv[1])); + stream->write_function(stream, " %s\n", profile->domain_name ? profile->domain_name : "N/A"); if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "%s\n", switch_str_nil(profile->name)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->name)); } - stream->write_function(stream, "%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "%s\n", switch_str_nil(profile->presence_hosts)); - stream->write_function(stream, "%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "%s\n", + stream->write_function(stream, " %s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->presence_hosts)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->dialplan)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->context)); + stream->write_function(stream, " %s\n", switch_strlen_zero(profile->challenge_realm) ? "auto_to" : profile->challenge_realm); - stream->write_function(stream, "%s\n", switch_str_nil(profile->rtpip)); - if (profile->extrtpip) { - stream->write_function(stream, "%s\n", profile->extrtpip); - } + stream->write_function(stream, " %s\n", switch_str_nil(profile->rtpip)); + stream->write_function(stream, " %s\n", profile->extrtpip); + stream->write_function(stream, " %s\n", switch_str_nil(profile->sipip)); + stream->write_function(stream, " %s\n", profile->extsipip); + stream->write_function(stream, " %s\n", switch_str_nil(profile->url)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->bindurl)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, " %s\n", switch_str_nil(profile->tls_bindurl)); + stream->write_function(stream, " %s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); + stream->write_function(stream, " %s\n", switch_strlen_zero(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy); + stream->write_function(stream, " %s\n", switch_str_nil(profile->codec_string)); + stream->write_function(stream, " %d\n", profile->te); + stream->write_function(stream, " rfc2833\n"); + stream->write_function(stream, " info\n"); + stream->write_function(stream, " none\n"); + stream->write_function(stream, " %d\n", profile->cng_pt); + stream->write_function(stream, " %d\n", profile->session_timeout); + stream->write_function(stream, " %d\n", profile->max_proceeding); + stream->write_function(stream, " %s\n", sofia_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); + stream->write_function(stream, " %s\n", sofia_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); + stream->write_function(stream, " %s\n", sofia_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); + stream->write_function(stream, " %s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, " %s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, " %s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); - stream->write_function(stream, "%s\n", switch_str_nil(profile->sipip)); - if (profile->extsipip) { - stream->write_function(stream, "%s\n", profile->extsipip); - } - stream->write_function(stream, "%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "%s\n", switch_str_nil(profile->bindurl)); - if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "%s\n", switch_str_nil(profile->tls_bindurl)); - } - stream->write_function(stream, "%s\n", switch_strlen_zero(profile->hold_music) ? "N/A" : profile->hold_music); - stream->write_function(stream, "%s\n", switch_strlen_zero(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy); - stream->write_function(stream, "%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "%d\n", profile->te); - if (profile->dtmf_type == DTMF_2833) { - stream->write_function(stream, "rfc2833\n"); - } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "info\n"); - } else { - stream->write_function(stream, "none\n"); - } - stream->write_function(stream, "%d\n", profile->cng_pt); - stream->write_function(stream, "%d\n", profile->session_timeout); - stream->write_function(stream, "%d\n", profile->max_proceeding); - stream->write_function(stream, "%s\n", sofia_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "%s\n", sofia_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "%s\n", sofia_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); } - stream->write_function(stream, "\n"); - stream->write_function(stream, "\n"); + stream->write_function(stream, " \n"); + stream->write_function(stream, " \n"); cb.profile = profile; cb.stream = stream; @@ -1831,13 +1836,15 @@ if (argv[4]) { if (!strcasecmp(argv[3], "pres")) { sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname," + "network_ip,network_port,sip_username,sip_realm" " from sip_registrations where profile_name='%q' and presence_hosts like '%%%q%%'", profile->name, argv[4]); } } else { sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname," + "network_ip,network_port,sip_username,sip_realm" " from sip_registrations where profile_name='%q' and contact like '%%%q%%'", profile->name, argv[3]); } @@ -1845,7 +1852,8 @@ if (!sql) { sql = switch_mprintf("select call_id,sip_user,sip_host,contact,status," - "rpid,expires,user_agent,server_user,server_host,profile_name,hostname" + "rpid,expires,user_agent,server_user,server_host,profile_name,hostname," + "network_ip,network_port,sip_username,sip_realm" " from sip_registrations where profile_name='%q'", profile->name); } @@ -1853,8 +1861,8 @@ sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, show_reg_callback_xml, &cb); free(sql); - stream->write_function(stream, "\n"); - stream->write_function(stream, "\n"); + stream->write_function(stream, "\n"); + stream->write_function(stream, "\n"); sofia_glue_release_profile(profile); } else { 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 Wed Mar 25 15:14:07 2009 @@ -677,8 +677,10 @@ void sofia_presence_cancel(void); switch_status_t config_sofia(int reload, char *profile_name); void sofia_reg_auth_challenge(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale); -auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, - char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user); +auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, + sip_t const *sip, const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, + long exptime, sofia_regtype_t regtype, const char *to_user, switch_event_t **auth_params); + void sofia_reg_handle_sip_r_challenge(int status, char const *phrase, 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 Wed Mar 25 15:14:07 2009 @@ -406,7 +406,7 @@ get_addr(network_ip, sizeof(network_ip), addrinfo->ai_addr, addrinfo->ai_addrlen); auth_res = sofia_reg_parse_auth(profile, authorization, sip, (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0, - REG_INVITE, NULL); + REG_INVITE, NULL, NULL); } if (auth_res != AUTH_OK) { @@ -579,6 +579,12 @@ char *profile_name = switch_event_get_header(event, "orig-profile-name"); char *to_user = switch_event_get_header(event, "orig-to-user"); char *presence_hosts = switch_event_get_header(event, "presence-hosts"); + char *network_ip = switch_event_get_header(event, "network-ip"); + char *network_port = switch_event_get_header(event, "network-port"); + char *username = switch_event_get_header(event, "username"); + char *realm = switch_event_get_header(event, "realm"); + + sofia_profile_t *profile = NULL; char guess_ip4[256]; @@ -606,10 +612,11 @@ switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); sql = switch_mprintf("insert into sip_registrations " - "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name,hostname) " - "values ('%q', '%q','%q','%q','Registered', '%q', %ld, '%q', '%q', '%q','%q','%q')", + "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires," + "user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port,sip_username,sip_realm) " + "values ('%q', '%q','%q','%q','Registered', '%q', %ld, '%q', '%q', '%q','%q','%q','%q','%q','%q','%q')", call_id, from_user, from_host, presence_hosts, contact_str, rpid, expires, user_agent, to_user, guess_ip4, - profile_name,mod_sofia_globals.hostname); + profile_name,mod_sofia_globals.hostname, network_ip, network_port, username, realm); if (sql) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); 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 Wed Mar 25 15:14:07 2009 @@ -3191,7 +3191,9 @@ " profile_name VARCHAR(255),\n" " hostname VARCHAR(255),\n" " network_ip VARCHAR(255),\n" - " network_port VARCHAR(6)\n" + " network_port VARCHAR(6),\n" + " sip_username VARCHAR(255),\n" + " sip_realm VARCHAR(255)\n" ");\n"; @@ -3289,6 +3291,8 @@ "create index sr_status on sip_registrations (status)", "create index sr_network_ip on sip_registrations (network_ip)", "create index sr_network_port on sip_registrations (network_port)", + "create index sr_sip_username on sip_registrations (sip_username)", + "create index sr_sip_realm on sip_registrations (sip_realm)", "create index ss_call_id on sip_subscriptions (call_id)", "create index ss_hostname on sip_subscriptions (hostname)", "create index ss_sip_user on sip_subscriptions (sip_user)", @@ -3329,7 +3333,7 @@ test_sql = switch_mprintf("delete from sip_registrations where (contact like '%%TCP%%' " "or status like '%%TCP%%' or status like '%%TLS%%') and hostname='%q' " - "and network_ip!='-1' and network_port!='-1'", + "and network_ip!='-1' and network_port!='-1' and sip_username != '-1'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { @@ -3401,7 +3405,7 @@ test_sql = switch_mprintf("delete from sip_registrations where (contact like '%%TCP%%' " "or status like '%%TCP%%' or status like '%%TLS%%') and hostname='%q' " - "and network_ip!='-1' and network_port!='-1'", + "and network_ip!='-1' and network_port!='-1' and sip_username != '-1'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql); @@ -3465,6 +3469,9 @@ switch_core_db_exec(profile->master_db, "create index if not exists sr_status on sip_registrations (status)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_network_ip on sip_registrations (network_ip)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists sr_network_port on sip_registrations (network_port)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists sr_sip_username on sip_registrations (sip_username)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists sr_sip_realm on sip_registrations (sip_realm)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ss_call_id on sip_subscriptions (call_id)", NULL, NULL, NULL); switch_core_db_exec(profile->master_db, "create index if not exists ss_hostname on sip_subscriptions (hostname)", NULL, NULL, NULL); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Mar 25 15:14:07 2009 @@ -699,6 +699,8 @@ char received_data[128] = ""; char *path_val = NULL; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); + switch_event_t *auth_params = NULL; + int r = 0; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ switch_assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -723,7 +725,7 @@ if (!to_user || !to_host) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not do authorization without a complete from header\n"); nua_respond(nh, SIP_401_UNAUTHORIZED, NUTAG_WITH_THIS(nua), TAG_END()); - return 1; + switch_goto_int(r, 1, end); } if (!reg_host) { @@ -840,7 +842,7 @@ if (authorization) { char *v_contact_str; if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip, sip->sip_request->rq_method_name, - key, keylen, network_ip, v_event, exptime, regtype, to_user)) == AUTH_STALE) { + key, keylen, network_ip, v_event, exptime, regtype, to_user, &auth_params)) == AUTH_STALE) { stale = 1; } @@ -913,7 +915,7 @@ } else { nua_respond(nh, SIP_401_UNAUTHORIZED, NUTAG_WITH_THIS(nua), TAG_END()); } - return 1; + switch_goto_int(r, 1, end); } } @@ -934,12 +936,12 @@ } else { sofia_reg_auth_challenge(nua, profile, nh, regtype, realm, stale); } - return 1; + switch_goto_int(r, 1, end); } reg: if (regtype != REG_REGISTER) { - return 0; + switch_goto_int(r, 0, end); } call_id = sip->sip_call_id->i_id; @@ -959,6 +961,13 @@ if (exptime) { const char *agent = "dunno"; char guess_ip4[256]; + const char *username = "unknown"; + const char *realm = reg_host; + + if (auth_params) { + username = switch_event_get_header(auth_params, "sip_auth_username"); + realm = switch_event_get_header(auth_params, "sip_auth_realm"); + } if (sip->sip_user_agent) { agent = sip->sip_user_agent->g_string; @@ -979,11 +988,12 @@ switch_find_local_ip(guess_ip4, sizeof(guess_ip4), AF_INET); sql = switch_mprintf("insert into sip_registrations " - "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port) " - "values ('%q','%q', '%q','%q','%q','%q', '%q', %ld, '%q', '%q', '%q', '%q', '%q', '%q', '%q')", + "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires," + "user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port,sip_username,sip_realm) " + "values ('%q','%q', '%q','%q','%q','%q', '%q', %ld, '%q', '%q', '%q', '%q', '%q', '%q', '%q','%q','%q')", call_id, to_user, reg_host, profile->presence_hosts ? profile->presence_hosts : reg_host, contact_str, reg_desc, rpid, (long) switch_epoch_time_now(NULL) + (long) exptime * 2, - agent, from_user, guess_ip4, profile->name, mod_sofia_globals.hostname, network_ip, network_port_c); + agent, from_user, guess_ip4, profile->name, mod_sofia_globals.hostname, network_ip, network_port_c, username, realm); if (sql) { sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); @@ -1006,6 +1016,8 @@ switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "to-host", from_host); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-ip", network_ip); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-port", network_port_c); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "username", username); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "realm", realm); switch_event_fire(&s_event); } @@ -1154,10 +1166,17 @@ } } - return 1; + switch_goto_int(r, 1, end); } - return 0; + + end: + + if (auth_params) { + switch_event_destroy(&auth_params); + } + + return r; } @@ -1458,8 +1477,19 @@ } -auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, - char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user) +auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, + sip_authorization_t const *authorization, + sip_t const *sip, + const char *regstr, + char *np, + size_t nplen, + char *ip, + switch_event_t **v_event, + long exptime, + sofia_regtype_t + regtype, + const char *to_user, + switch_event_t **auth_params) { int indexnum; const char *cur; @@ -1600,6 +1630,10 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_method", (sip && sip->sip_request) ? sip->sip_request->rq_method_name : NULL); + if (auth_params) { + switch_event_dup(auth_params, params); + } + if (!switch_strlen_zero(profile->reg_domain)) { domain_name = profile->reg_domain; From anthm at freeswitch.org Wed Mar 25 13:19:28 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 15:19:28 -0500 Subject: [Freeswitch-svn] [commit] r12786 - freeswitch/trunk/src/mod/applications/mod_commands Message-ID: Author: anthm Date: Wed Mar 25 15:19:28 2009 New Revision: 12786 Log: MODAPP-242 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Mar 25 15:19:28 2009 @@ -359,7 +359,6 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", user); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "domain", domain); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "type", type); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "key", key); if (key && type && switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, NULL, params) == SWITCH_STATUS_SUCCESS) { if (!strcmp(type, "attr")) { From anthm at freeswitch.org Wed Mar 25 14:01:53 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 16:01:53 -0500 Subject: [Freeswitch-svn] [commit] r12787 - freeswitch/trunk/src/mod/applications/mod_conference Message-ID: Author: anthm Date: Wed Mar 25 16:01:53 2009 New Revision: 12787 Log: add lock caller_control Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Mar 25 16:01:53 2009 @@ -93,7 +93,8 @@ CALLER_CONTROL_HANGUP, CALLER_CONTROL_MENU, CALLER_CONTROL_DIAL, - CALLER_CONTROL_EVENT + CALLER_CONTROL_EVENT, + CALLER_CONTROL_LOCK } caller_control_t; /* forward declaration for conference_obj and caller_control */ @@ -1280,6 +1281,42 @@ } } + +static void conference_loop_fn_lock_toggle(conference_member_t *member, caller_control_action_t *action) +{ + switch_event_t *event; + + if (member == NULL) + return; + + if (!switch_test_flag(member->conference, CFLAG_LOCKED)) { + if (member->conference->is_locked_sound) { + conference_play_file(member->conference, member->conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL, 0); + } + + switch_set_flag_locked(member->conference, CFLAG_LOCKED); + if (test_eflag(member->conference, EFLAG_LOCK) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_data(member->conference, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "lock"); + switch_event_fire(&event); + } + } else { + if (member->conference->is_unlocked_sound) { + conference_play_file(member->conference, member->conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL, 0); + } + + switch_clear_flag_locked(member->conference, CFLAG_LOCKED); + if (test_eflag(member->conference, EFLAG_UNLOCK) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_data(member->conference, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); + switch_event_fire(&event); + } + } + +} + static void conference_loop_fn_deafmute_toggle(conference_member_t *member, caller_control_action_t *action) { if (member == NULL) @@ -1755,7 +1792,8 @@ {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero}, {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn}, {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup}, - {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event} + {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event}, + {"lock", NULL, CALLER_CONTROL_LOCK, conference_loop_fn_lock_toggle} }; #define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0])) From mikej at freeswitch.org Wed Mar 25 19:45:05 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 21:45:05 -0500 Subject: [Freeswitch-svn] [commit] r12788 - freeswitch/trunk/build/config Message-ID: Author: mikej Date: Wed Mar 25 21:45:04 2009 New Revision: 12788 Log: fix odbc detection to not try to use odbc when no headers are installed Modified: freeswitch/trunk/build/config/odbc.m4 Modified: freeswitch/trunk/build/config/odbc.m4 ============================================================================== --- freeswitch/trunk/build/config/odbc.m4 (original) +++ freeswitch/trunk/build/config/odbc.m4 Wed Mar 25 21:45:04 2009 @@ -135,7 +135,7 @@ fi AC_MSG_CHECKING(whether to include odbc) - if test "X$ac_cv_odbc_where_lib" = "X" -a "X$ac_cv_odbc_where_inc" = "X"; then + if test "X$ac_cv_odbc_where_lib" = "X" -o "X$ac_cv_odbc_where_inc" = "X"; then ac_cv_found_odbc=no AC_MSG_RESULT(no) else From nmartin at freeswitch.org Wed Mar 25 20:38:22 2009 From: nmartin at freeswitch.org (FreeSWITCH SVN) Date: Wed, 25 Mar 2009 22:38:22 -0500 Subject: [Freeswitch-svn] [commit] r12789 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial Message-ID: Author: nmartin Date: Wed Mar 25 22:38:22 2009 New Revision: 12789 Log: for some reason, Address Book started adding "-" between numbers added replace function to clean up phone numbers before passing to FS Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt ============================================================================== Binary files. No diff available. From gmaruzz at freeswitch.org Thu Mar 26 03:29:28 2009 From: gmaruzz at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 05:29:28 -0500 Subject: [Freeswitch-svn] [commit] r12790 - freeswitch/trunk/src/mod/endpoints/mod_skypiax Message-ID: Author: gmaruzz Date: Thu Mar 26 05:29:28 2009 New Revision: 12790 Log: skypiax: fixed transferred call to skype user busy in another call: was transferring using the interface name, not the skype_user. Fixed as per Jira: MODSKYPIAX-28 Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Thu Mar 26 05:29:28 2009 @@ -245,11 +245,11 @@ if (available_skypiax_interface) { /* there is a skypiax interface idle, let's transfer the call to it */ DEBUGA_SKYPE - ("Let's transfer the skype_call %s to %s interface, because we are already in a skypiax call(%s)\n", + ("Let's transfer the skype_call %s to %s interface (with skype_user: %s), because we are already in a skypiax call(%s)\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id, - available_skypiax_interface->name, id); + available_skypiax_interface->name, available_skypiax_interface->skype_user, id); sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, - available_skypiax_interface->name); + available_skypiax_interface->skype_user); } else { /* no skypiax interfaces idle, let's refuse the call */ DEBUGA_SKYPE From anthm at freeswitch.org Thu Mar 26 08:07:44 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 10:07:44 -0500 Subject: [Freeswitch-svn] [commit] r12791 - freeswitch/trunk/src/mod/applications/mod_fifo Message-ID: Author: anthm Date: Thu Mar 26 10:07:44 2009 New Revision: 12791 Log: fire events on bridge in fifo Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 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 Thu Mar 26 10:07:44 2009 @@ -1255,6 +1255,18 @@ switch_core_media_bug_resume(other_session); switch_process_import(session, other_channel, "fifo_caller_consumer_import"); switch_process_import(other_session, channel, "fifo_consumer_caller_import"); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Action", "bridge-consumer"); + switch_event_fire(&event); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(other_channel, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Action", "bridge-caller"); + switch_event_fire(&event); + } switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); switch_core_media_bug_pause(session); switch_core_media_bug_pause(other_session); From anthm at freeswitch.org Thu Mar 26 09:06:25 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 11:06:25 -0500 Subject: [Freeswitch-svn] [commit] r12792 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Thu Mar 26 11:06:25 2009 New Revision: 12792 Log: MODENDP-207 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Thu Mar 26 11:06:25 2009 @@ -210,7 +210,8 @@ if ((sql = switch_mprintf( "select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name" - ",-1,'unavailable','unavailable' from sip_subscriptions where event='presence'"))) { + ",-1,'unavailable','unavailable' from sip_subscriptions where event='presence' and hostname='%q'", + mod_sofia_globals.hostname))) { switch_mutex_lock(mod_sofia_globals.hash_mutex); for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Mar 26 11:06:25 2009 @@ -597,8 +597,11 @@ if (now) { - switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" - " from sip_registrations where status like '%%AUTO-NAT%%' or status like '%%UDP-NAT%%'"); + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid," + "expires,user_agent,server_user,server_host,profile_name" + " from sip_registrations where (status like '%%AUTO-NAT%%' " + "or status like '%%UDP-NAT%%') and hostname='%s'", mod_sofia_globals.hostname); + sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_nat_callback, profile); } From mikej at freeswitch.org Thu Mar 26 10:02:31 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 12:02:31 -0500 Subject: [Freeswitch-svn] [commit] r12793 - freeswitch/trunk/libs/esl/php Message-ID: Author: mikej Date: Thu Mar 26 12:02:30 2009 New Revision: 12793 Log: work around broken php-config that only takes one option at a time Modified: freeswitch/trunk/libs/esl/php/Makefile Modified: freeswitch/trunk/libs/esl/php/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/php/Makefile (original) +++ freeswitch/trunk/libs/esl/php/Makefile Thu Mar 26 12:02:30 2009 @@ -1,5 +1,7 @@ LOCAL_CFLAGS=$(shell php-config --includes) -LOCAL_LDFLAGS=$(shell php-config --ldflags --libs) +PHP_LDFLAGS=$(shell php-config --ldflags) +PHP_LIBS=$(shell php-config --libs) +LOCAL_LDFLAGS=$(PHP_LDFLAGS) $(PHP_LIBS) WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function all: ESL.so From intralanman at freeswitch.org Thu Mar 26 12:00:00 2009 From: intralanman at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 14:00:00 -0500 Subject: [Freeswitch-svn] [commit] r12794 - freeswitch/trunk/scripts/contrib/jtregunna Message-ID: Author: intralanman Date: Thu Mar 26 14:00:00 2009 New Revision: 12794 Log: adding contrib dir for jer Added: freeswitch/trunk/scripts/contrib/jtregunna/ From jtregunna at freeswitch.org Thu Mar 26 12:12:45 2009 From: jtregunna at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 14:12:45 -0500 Subject: [Freeswitch-svn] [commit] r12795 - freeswitch/trunk/scripts/contrib/jtregunna Message-ID: Author: jtregunna Date: Thu Mar 26 14:12:45 2009 New Revision: 12795 Log: Added a simple TTS weather reporting agent. Primitive at the moment, no searching capabilities, location is fixed to Waterloo, Ontario, Canada. TODO: Create an ASR, and have it search major city centers in North America, maybe the world if I can find an easy way of doing that. Added: freeswitch/trunk/scripts/contrib/jtregunna/weather.js Added: freeswitch/trunk/scripts/contrib/jtregunna/weather.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/weather.js Thu Mar 26 14:12:45 2009 @@ -0,0 +1,123 @@ +/* + * Weather application + * Copyright (c) 2009, Jeremy Tregunna, All Rights Reserved. + * Redistributable under any terms you like! + * + * Uses the Yahoo! Weather forecasting engine. http://weather.yahoo.com/ + * + * Makes use of mod_flite, should be easy to adapt to any other TTS engine. + */ +var yweather = new Namespace("http://xml.weather.yahoo.com/ns/rss/1.0"); + +var rssFile = "/usr/local/freeswitch/rss/weather.rss"; +var currentConditions = "Unknown"; +var highTemperature = lowTemperature = currentTemperature = "0"; +var doc = null; + +// XXX: Big and nasty, but the values Yahoo! Weather's RSS feed gives out for "text" attributes on yweather:condition +// really don't fit in well with any method of saying things. That is, "You can expect conditions" works for +// most cases, but falls down or reads weird, when things like "tornado conditions" are inserted into . If you +// don't mind that awkwardness, you can get rid of the conditions object, and just change the code in sayWeather() +// replacing occurences of @code with @text, of course, first removing the conditions[...] that surround fc. at code. +var conditions = new Object(); +conditions[0] = "a tornado"; +conditions[1] = "tropical storm conditions"; +conditions[2] = "hurricane conditions"; +conditions[3] = "severe thunderstorms"; +conditions[4] = "thunderstorms"; +conditions[5] = "mixture of rain and snow"; +conditions[6] = "mixture of rain and sleet"; +conditions[7] = "mixture of snow and sleet"; +conditions[8] = "freezing drizzle"; +conditions[9] = "some drizzle"; +conditions[10] = "freezing rain"; +conditions[11] = "rain showers"; +conditions[12] = "light rain showers"; +conditions[13] = "snow flurries"; +conditions[14] = "light snow"; +conditions[15] = "blowing snow"; +conditions[16] = "snow"; +conditions[17] = "periods of hail"; +conditions[18] = "sleet"; +conditions[19] = "dusty conditions"; +conditions[20] = "foggy conditions"; +conditions[21] = "hazy conditions"; +conditions[22] = "smokey conditions"; +conditions[23] = "high winds"; +conditions[24] = "windy"; +conditions[25] = "cold conditions"; +conditions[26] = "overcast conditions"; +conditions[27] = "mostly cloudy conditions"; // Night time +conditions[28] = "mostly cloudy conditions"; // Day time +conditions[29] = "partly cloudy conditions"; // Night time +conditions[30] = "partly cloudy conditions"; // Day time +conditions[31] = "clear conditions"; // Night time +conditions[32] = "sunny conditions"; // Day time +conditions[33] = "fair conditions"; // Night time +conditions[34] = "fair conditions"; // Day time +conditions[35] = "periods of mixed rain and hail"; +conditions[36] = "hot conditions"; +conditions[37] = "isolated thunderstorms"; +conditions[38] = "scattered thunderstorms"; +conditions[39] = "scattered thunderstorms"; +conditions[40] = "scattered showers"; +conditions[41] = "heavy snow"; +conditions[42] = "scattered snow flurries"; +conditions[43] = "heavy snow"; +conditions[44] = "partly cloudy conditions"; +conditions[45] = "thundershowers"; +conditions[46] = "snow flurries"; +conditions[47] = "isolated thunderstorms"; +conditions[3200] = "conditions are not available at this time"; + +/********** Say something **********/ +say = function(something) { + session.speak("flite", "rms", something); +} + +/********** Load the XML **********/ +loadXML = function(url) { + fetchURLFile(url, rssFile); + var fd = new FileIO(rssFile, "r"); + fd.read(3072); + // Need to strip out the tag otherwise we get a syntax error, silly E4X + doc = new XML(fd.data().replace(/^<\?xml\s+version\s*=\s*(["'])[^\1]+\1[^?]*\?>/, "")); +} + +/********** Say the weather **********/ +sayWeather = function() { + var currentCondition = doc.channel.item.yweather::condition. at text; + var currentTemperature = doc.channel.item.yweather::condition. at temp; + var firstLoop = true; + var forecast = "The current conditions are: "; + forecast += conditions[doc.channel.item.yweather::condition. at code]; + forecast += " and it is " + currentTemperature + " degree" + ((currentTemperature != 1) ? "s" : "") + " out.\n"; + for each(var fc in doc.channel.item.yweather::forecast) { + // XXX: Figure out why day.replace("Sun", "Sunday") et. al., doesn't actually replace the date when used here + // but when using the "js" spidermonkey executable, it does. + var day = fc. at day; + if (day == "Sun") + day = "Sunday"; + else if (day == "Mon") + day = "Monday"; + else if (day == "Tue") + day = "Tuesday"; + else if (day == "Wed") + day = "Wednesday"; + else if (day == "Thu") + day = "Thursday"; + else if (day == "Fri") + day = "Friday"; + else if (day == "Sat") + day = "Saturday"; + forecast += day + "'s forecast calls for " + conditions[fc. at code] + ", with a daytime high of "; + forecast += fc. at high + " degree" + ((fc. at high != 1) ? "s" : "") + " and a low of " + fc. at low + " degree" + ((fc. at low != 1) ? "s" : "") + ".\n"; + } + say(forecast); +} + +if (session.ready()) { + session.answer(); + loadXML("http://weather.yahooapis.com/forecastrss?p=CAXX0531&u=c"); + sayWeather(); +} From gmaruzz at freeswitch.org Thu Mar 26 12:37:10 2009 From: gmaruzz at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 14:37:10 -0500 Subject: [Freeswitch-svn] [commit] r12796 - freeswitch/trunk/src/mod/endpoints/mod_skypiax Message-ID: Author: gmaruzz Date: Thu Mar 26 14:37:10 2009 New Revision: 12796 Log: skypiax: added SWITCH_API_COMMANDS: list || console || skype_API_msg Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Mar 26 14:37:10 2009 @@ -39,6 +39,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown); SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL); +SWITCH_STANDARD_API(sk_function); +#define SK_SYNTAX "list || console || skype_API_msg" static struct { int debug; @@ -59,6 +61,7 @@ char hold_music[256]; private_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES]; switch_mutex_t *mutex; + private_t *sk_console; } globals; switch_endpoint_interface_t *skypiax_endpoint_interface; @@ -1021,6 +1024,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { skypiax_module_pool = pool; + switch_api_interface_t *commands_api_interface; memset(&globals, '\0', sizeof(globals)); @@ -1038,9 +1042,12 @@ skypiax_endpoint_interface->io_routines = &skypiax_io_routines; skypiax_endpoint_interface->state_handler = &skypiax_state_handlers; - if (running) + if (running){ + + SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax commands", sk_function, SK_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; + } else return SWITCH_STATUS_FALSE; } @@ -1335,6 +1342,83 @@ return NULL; } +SWITCH_STANDARD_API(sk_function) +{ + char *mycmd = NULL, *argv[10] = { 0 }; + int argc = 0; + + if(globals.sk_console) + stream->write_function(stream,"sk console is: |||%s|||\n", globals.sk_console->name); + else + stream->write_function(stream,"sk console is NOT yet assigned\n"); + + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (!argc) { + stream->write_function(stream, "%s", SK_SYNTAX); + goto end; + } + + if (!strcasecmp(argv[0], "list")) { + int i; + for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) { + if (strlen(globals.SKYPIAX_INTERFACES[i].name)) { + if (strlen(globals.SKYPIAX_INTERFACES[i].session_uuid_str)) { + stream->write_function(stream,"globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tBUSY, session_uuid_str=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name, globals.SKYPIAX_INTERFACES[i].session_uuid_str); + } else { + stream->write_function(stream,"globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tIDLE\n", i, globals.SKYPIAX_INTERFACES[i].name); + } + } + } + } else if (!strcasecmp(argv[0], "console")) { + int i; + int found =0; + + if (argc == 2) { + for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { + /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */ + if (strlen(globals.SKYPIAX_INTERFACES[i].name) + && + (strncmp + (globals.SKYPIAX_INTERFACES[i].name, argv[1], + strlen(argv[1])) == 0)) { + globals.sk_console=&globals.SKYPIAX_INTERFACES[i]; + stream->write_function(stream,"sk console is now: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name); + stream->write_function(stream,"sk console is: |||%s|||\n", globals.sk_console->name); + found = 1; + break; + } + + } + if(!found) + stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[1]); + } else { + + stream->write_function(stream, "-ERR Usage: sk console interface_name\n"); + goto end; + } + + + } else if (!strcasecmp(argv[0], "ciapalino")) { + + } else { + if(globals.sk_console) + skypiax_signaling_write(globals.sk_console, (char *)cmd); + else + stream->write_function(stream,"sk console is NOT yet assigned\n"); + } +end: + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; +} + + + + /* For Emacs: * Local Variables: * mode:c From anthm at freeswitch.org Thu Mar 26 13:08:30 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 15:08:30 -0500 Subject: [Freeswitch-svn] [commit] r12797 - freeswitch/trunk/src Message-ID: Author: anthm Date: Thu Mar 26 15:08:30 2009 New Revision: 12797 Log: update Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 26 15:08:30 2009 @@ -1590,6 +1590,8 @@ static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) { struct system_thread_handle *sth = (struct system_thread_handle *)obj; + +#if 0 // if we are a luser we can never turn this back down, didn't we already set the stack size? #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) struct rlimit rlim; @@ -1599,9 +1601,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); } #endif +#endif sth->ret = system(sth->cmd); +#if 0 #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; @@ -1610,6 +1614,7 @@ } #endif +#endif switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond); From silik0n at freeswitch.org Thu Mar 26 15:01:48 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 17:01:48 -0500 Subject: [Freeswitch-svn] [commit] r12798 - freeswitch/trunk/scripts/contrib/swk/php/amfphp Message-ID: Author: silik0n Date: Thu Mar 26 17:01:48 2009 New Revision: 12798 Log: the start of merging the xml_curl fork to the amf fork Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Thu Mar 26 17:01:48 2009 @@ -272,6 +272,13 @@ return $results; } + public function getDirDomainbyName($domain_name){ + $query = sprintf("select * from domains where name = '%s'", $domain_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + public function getDirDomain($domains_uid){ $dbh = $this->getDbh(); $query = sprintf("select * from domain_params where domains_uid = $domains_uid"); @@ -327,6 +334,13 @@ /* Directory User Methods */ + public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ + $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + public function getDirUser($user_uid){ $dbh = $this->getDbh(); $query = sprintf("select * from user_params where users_uid = $user_uid"); @@ -399,6 +413,13 @@ return $results; } + public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ + $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + public function getDirGroup($groups_uid){ $dbh = $this->getDbh(); $query = sprintf("select a.uid as groupMemberUid, a.users_uid as usersUid, b.username as usersUsername from group_members as a, users as b where a.groups_uid = $groups_uid and a.users_uid = b.uid") ; From gmaruzz at freeswitch.org Thu Mar 26 15:02:32 2009 From: gmaruzz at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 17:02:32 -0500 Subject: [Freeswitch-svn] [commit] r12799 - freeswitch/trunk/src/mod/endpoints/mod_skypiax Message-ID: Author: gmaruzz Date: Thu Mar 26 17:02:32 2009 New Revision: 12799 Log: skypiax: added another SWITCH_API_COMMANDS to send skype_api command to the named client: skypiax interface_name skype_API_msg Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Mar 26 17:02:32 2009 @@ -41,6 +41,8 @@ SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL); SWITCH_STANDARD_API(sk_function); #define SK_SYNTAX "list || console || skype_API_msg" +SWITCH_STANDARD_API(skypiax_function); +#define SKYPIAX_SYNTAX "interface_name skype_API_msg" static struct { int debug; @@ -1044,7 +1046,8 @@ if (running){ - SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax commands", sk_function, SK_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax console commands", sk_function, SK_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "skypiax", "Skypiax interface commands", skypiax_function, SKYPIAX_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -1416,6 +1419,62 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(skypiax_function) +{ + char *mycmd = NULL, *argv[10] = { 0 }; + int argc = 0; + private_t *tech_pvt=NULL; + + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (!argc) { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + goto end; + } + + if (argc < 2) { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + goto end; + } + + if (argv[0]) { + int i; + int found =0; + + for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { + /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */ + if (strlen(globals.SKYPIAX_INTERFACES[i].name) + && + (strncmp + (globals.SKYPIAX_INTERFACES[i].name, argv[0], + strlen(argv[0])) == 0)) { + tech_pvt=&globals.SKYPIAX_INTERFACES[i]; + stream->write_function(stream,"Using interface: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name); + found = 1; + break; + } + + } + if(!found){ + stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[0]); + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; + } else { + skypiax_signaling_write(tech_pvt, (char *)&cmd[ strlen(argv[0]) + 1 ] ); + } + } else { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + } +end: + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; +} + From silik0n at freeswitch.org Thu Mar 26 16:06:23 2009 From: silik0n at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 18:06:23 -0500 Subject: [Freeswitch-svn] [commit] r12800 - freeswitch/trunk/scripts/contrib/swk/php/amfphp Message-ID: Author: silik0n Date: Thu Mar 26 18:06:23 2009 New Revision: 12800 Log: fix some errors on generic DB handler Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Thu Mar 26 18:06:23 2009 @@ -274,7 +274,8 @@ public function getDirDomainbyName($domain_name){ $query = sprintf("select * from domains where name = '%s'", $domain_name); - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results[0]; } @@ -336,7 +337,8 @@ /* Directory User Methods */ public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results[0]; } @@ -360,6 +362,13 @@ return $results; } + public function addDirDomainUser($domains_uid, $username, $mailbox, $cidr, $enabled) { + $dbh = $this->getDbh(); + $query = sprintf('insert into users (domains_uid, username, mailbox, cidr, enabled) values (%s, "%s", "%s", "%s", %s)', + $domain_uid, $username, $mailbox, $cidr, $enabled); + return $dbh->exec($query); + } + public function addDirDomainUserParam($users_uid, $name, $value) { $dbh = $this->getDbh(); $query = sprintf('insert into user_params (users_uid, name, value) values (%s, "%s", "%s")', $users_uid, $name, $value); @@ -415,7 +424,8 @@ public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results; } From anthm at freeswitch.org Thu Mar 26 17:27:07 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 19:27:07 -0500 Subject: [Freeswitch-svn] [commit] r12801 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Thu Mar 26 19:27:07 2009 New Revision: 12801 Log: reduce exponential mwi notifies Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Thu Mar 26 19:27:07 2009 @@ -477,6 +477,8 @@ sofia_presence_handle_sip_i_publish(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_register: + //nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), NUTAG_WITH_THIS(nua), TAG_END()); + //nua_handle_destroy(nh); sofia_reg_handle_sip_i_register(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_state: 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 Thu Mar 26 19:27:07 2009 @@ -283,6 +283,8 @@ switch_event_header_t *hp; struct mwi_helper h = { 0 }; char *pname = NULL; + const char *call_id; + const char *sub_call_id; switch_assert(event != NULL); @@ -296,6 +298,9 @@ return; } + call_id = switch_event_get_header(event, "call-id"); + sub_call_id = switch_event_get_header(event, "sub-call-id"); + dup_account = strdup(account); switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); @@ -339,30 +344,39 @@ stream.write_function(&stream, "\r\n"); - sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," - "full_via,expires,user_agent,accept,profile_name" - ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - stream.data, host, user, host, host); - - switch_assert(sql != NULL); - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); - - switch_safe_free(sql); - - sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", - stream.data, user, host); - + sql = NULL; + if (sub_call_id) { + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", + stream.data, host, user, host, host, sub_call_id); + } else if (!call_id) { + sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," + "full_via,expires,user_agent,accept,profile_name" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + stream.data, host, user, host, host); + } + + if (sql) { + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); + switch_safe_free(sql); + + } else if (call_id) { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " + "from sip_registrations where sip_user='%q' and sip_host='%q' and call_id='%q'", + stream.data, user, host, call_id); + switch_assert(sql != NULL); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); + } - switch_assert(sql != NULL); - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); switch_safe_free(sql); - switch_safe_free(stream.data); - switch_safe_free(dup_account); + if (profile) { sofia_glue_release_profile(profile); } @@ -791,6 +805,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", user, host); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "VM-sub-call-id", argv[7]); switch_event_fire(&event); } return 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Mar 26 19:27:07 2009 @@ -1137,6 +1137,7 @@ if (switch_event_create(&s_event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, reg_host); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "VM-Call-ID", call_id); } } else { if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) { From mikej at freeswitch.org Thu Mar 26 18:44:28 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Thu, 26 Mar 2009 20:44:28 -0500 Subject: [Freeswitch-svn] [commit] r12802 - in freeswitch/trunk/conf: . directory/default Message-ID: Author: mikej Date: Thu Mar 26 20:44:28 2009 New Revision: 12802 Log: You can lead a horse to water But you can't make him drink You can send a kid to college But you can't make him think PLEASE THINK! /b Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ - + Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Thu Mar 26 20:44:28 2009 @@ -43,8 +43,8 @@ - - + + Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,20 @@ + + + WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + + YOU SHOULD CHANGE THIS default_password value if you don't want to be subject to any + toll fraud in the future. It's your responsibility to secure your own system. + + This default config is used to demonstrate the feature set of FreeSWITCH. + + WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + --> + + + - + From jtregunna at freeswitch.org Mon Mar 30 08:07:38 2009 From: jtregunna at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 10:07:38 -0500 Subject: [Freeswitch-svn] [commit] r12839 - freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms Message-ID: Author: jtregunna Date: Mon Mar 30 10:07:38 2009 New Revision: 12839 Log: Updated do_config() to strdup() three variables, and shutdown func to release that memory again. Modified: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c Modified: freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c ============================================================================== --- freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c (original) +++ freeswitch/trunk/scripts/contrib/jtregunna/mod_fastsms/mod_fastsms.c Mon Mar 30 10:07:38 2009 @@ -29,9 +29,9 @@ if ((settings = switch_xml_child(cfg, "settings"))) { auth = switch_xml_child(settings, "auth"); - companyid = (char*)switch_xml_attr_soft(auth, "companyid"); - userid = (char*)switch_xml_attr_soft(auth, "userid"); - password = (char*)switch_xml_attr_soft(auth, "password"); + companyid = strdup(switch_xml_attr_soft(auth, "companyid")); + userid = strdup(switch_xml_attr_soft(auth, "userid")); + password = strdup(switch_xml_attr_soft(auth, "password")); } if (xml) @@ -129,6 +129,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fastsms_shutdown) { curl_easy_cleanup(curl); + free(companyid); + free(userid); + free(password); return SWITCH_STATUS_SUCCESS; } From anthm at freeswitch.org Mon Mar 30 09:48:44 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 11:48:44 -0500 Subject: [Freeswitch-svn] [commit] r12840 - in freeswitch/trunk/src: . include Message-ID: Author: anthm Date: Mon Mar 30 11:48:44 2009 New Revision: 12840 Log: add read_terminator_used var Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 30 11:48:44 2009 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_READ_TERMINATOR_USED_VARIABLE "read_terminator_used" #define SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE "send_silence_when_idle" #define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" #define SWITCH_CURRENT_APPLICATION_DATA_VARIABLE "current_application_data" Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Mar 30 11:48:44 2009 @@ -1446,8 +1446,8 @@ switch_channel_t *channel; switch_input_args_t args = { 0 }; switch_status_t status = SWITCH_STATUS_SUCCESS; - char terminator; size_t len = 0; + char tb[2] = ""; switch_assert(session); @@ -1488,7 +1488,12 @@ if ((min_digits && len < min_digits) || len < max_digits) { args.buf = digit_buffer + len; args.buflen = (uint32_t) (digit_buffer_length - len); - status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout, 0, 0); + status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &tb[0], timeout, 0, 0); + } + + + if (tb[0]) { + switch_channel_set_variable(channel, SWITCH_READ_TERMINATOR_USED_VARIABLE, tb); } len = strlen(digit_buffer); From mikej at freeswitch.org Mon Mar 30 10:20:46 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 12:20:46 -0500 Subject: [Freeswitch-svn] [commit] r12841 - freeswitch/trunk/src/mod/endpoints/mod_sofia Message-ID: Author: mikej Date: Mon Mar 30 12:20:46 2009 New Revision: 12841 Log: fix mwi Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 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 Mon Mar 30 12:20:46 2009 @@ -285,6 +285,7 @@ char *pname = NULL; const char *call_id; const char *sub_call_id; + int for_everyone = 0; switch_assert(event != NULL); @@ -301,6 +302,11 @@ call_id = switch_event_get_header(event, "call-id"); sub_call_id = switch_event_get_header(event, "sub-call-id"); + if (!call_id && !sub_call_id) { + for_everyone = 1; + } + + dup_account = strdup(account); switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); @@ -346,34 +352,45 @@ sql = NULL; - if (sub_call_id) { + if (for_everyone) { sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name" ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", - stream.data, host, user, host, host, sub_call_id); - } else if (!call_id) { + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + stream.data, host, user, host, host); + } else if (sub_call_id) { sql = switch_mprintf("select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name" ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - stream.data, host, user, host, host); + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", + stream.data, host, user, host, host, sub_call_id); } + if (sql) { sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); - switch_safe_free(sql); + free(sql); + sql = NULL; + + } + if (for_everyone) { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " + "from sip_registrations where sip_user='%q' and sip_host='%q'", + stream.data, user, host); } else if (call_id) { sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " "from sip_registrations where sip_user='%q' and sip_host='%q' and call_id='%q'", stream.data, user, host, call_id); + } + + if (sql) { switch_assert(sql != NULL); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); + free(sql); + sql = NULL; } - - switch_safe_free(sql); switch_safe_free(stream.data); switch_safe_free(dup_account); From mrene at freeswitch.org Mon Mar 30 10:48:25 2009 From: mrene at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 12:48:25 -0500 Subject: [Freeswitch-svn] [commit] r12842 - freeswitch/trunk/src Message-ID: Author: mrene Date: Mon Mar 30 12:48:25 2009 New Revision: 12842 Log: Fix Solaris build Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Mon Mar 30 12:48:25 2009 @@ -336,7 +336,7 @@ case SWITCH_CONFIG_FLAGARRAY: { int8_t *dest = (int8_t*)item->ptr; - int8_t index = (int8_t)(intptr_t)item->data; + unsigned int index = (unsigned int)(intptr_t)item->data; int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); if (dest[index] != newval) { changed = SWITCH_TRUE; From mikej at freeswitch.org Mon Mar 30 11:24:16 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 13:24:16 -0500 Subject: [Freeswitch-svn] [commit] r12843 - freeswitch/trunk Message-ID: Author: mikej Date: Mon Mar 30 13:24:16 2009 New Revision: 12843 Log: add build of fs_ivrd Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Mar 30 13:24:16 2009 @@ -165,12 +165,15 @@ CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h -bin_PROGRAMS = freeswitch fs_cli +bin_PROGRAMS = freeswitch fs_cli fs_ivrd +fs_ivrd_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/ivrd.c fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) +fs_ivrd_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include +fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la From anthm at freeswitch.org Mon Mar 30 14:09:59 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 16:09:59 -0500 Subject: [Freeswitch-svn] [commit] r12844 - freeswitch/trunk/src Message-ID: Author: anthm Date: Mon Mar 30 16:09:49 2009 New Revision: 12844 Log: add warnings Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 30 16:09:49 2009 @@ -1100,7 +1100,8 @@ SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, const char *func, int line, switch_event_t **event, void *user_data) { - + int index; + switch_assert(BLOCK != NULL); switch_assert(RUNTIME_POOL != NULL); switch_assert(EVENT_QUEUE_MUTEX != NULL); @@ -1116,8 +1117,22 @@ (*event)->event_user_data = user_data; } + for (;;) { + for (index = (*event)->priority; index < 3; index++) { + if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { + if (index != (*event)->priority) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + } + goto end; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Event queue is full!\n"); + switch_yield(100000); + } + + end: - switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); *event = NULL; return SWITCH_STATUS_SUCCESS; From andrew at freeswitch.org Mon Mar 30 14:10:01 2009 From: andrew at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 16:10:01 -0500 Subject: [Freeswitch-svn] [commit] r12845 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event Message-ID: Author: andrew Date: Mon Mar 30 16:10:01 2009 New Revision: 12845 Log: Fixed registered process outbound mode (reported by rcpacheco) 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 Mon Mar 30 16:10:01 2009 @@ -417,8 +417,10 @@ 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 */ + if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) { /* XXX no unicode or character codes > 255 */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "XML fetch response contained non ASCII characters? (was type %d of size %d)\n", type, size); return NULL; + } if (!(xmlstr = malloc(size + 1))) { @@ -778,7 +780,7 @@ check_log_queue(listener); check_event_queue(listener); - if (SWITCH_STATUS_SUCCESS != check_attached_sessions(listener)) { + if (check_attached_sessions(listener) != SWITCH_STATUS_SUCCESS) { return; } } @@ -1038,6 +1040,7 @@ if (!(session_element = switch_core_session_alloc(session, sizeof(*session_element)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n"); } else { + memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH); session_element->process.type = ERLANG_REG_PROCESS; session_element->process.reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name); switch_set_flag(session_element, LFLAG_SESSION_ALIVE); From anthm at freeswitch.org Mon Mar 30 14:12:06 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 16:12:06 -0500 Subject: [Freeswitch-svn] [commit] r12846 - freeswitch/trunk/src Message-ID: Author: anthm Date: Mon Mar 30 16:12:06 2009 New Revision: 12846 Log: change blocking rtp to psuedo-blocking to avoid endlessly blocking reads and refactor jitter buffer Modified: freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Mar 30 16:12:06 2009 @@ -791,7 +791,13 @@ SWITCH_DECLARE(switch_status_t) switch_poll(switch_pollfd_t *aprset, int32_t numsock, int32_t *nsds, switch_interval_time_t timeout) { - return apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + apr_status_t st = apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + + if (st == APR_TIMEUP) { + st = SWITCH_STATUS_TIMEOUT; + } + + return st; } SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t **poll, switch_socket_t *sock, int16_t flags, switch_memory_pool_t *pool) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 30 16:12:06 2009 @@ -129,7 +129,9 @@ * used. */ switch_socket_t *sock_input, *sock_output; - + switch_pollfd_t *read_pollfd; + switch_pollfd_t *jb_pollfd; + switch_sockaddr_t *local_addr; rtp_msg_t send_msg; @@ -188,7 +190,6 @@ switch_timer_t timer; uint8_t ready; uint8_t cn; - switch_time_t last_time; stfu_instance_t *jb; uint32_t max_missed_packets; uint32_t missed_count; @@ -598,6 +599,8 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + } else { + switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); } status = SWITCH_STATUS_SUCCESS; @@ -1013,7 +1016,14 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { + if (rtp_session->read_pollfd) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't use jitterbuffer without a timer.\n"); + return SWITCH_STATUS_FALSE; + } + rtp_session->jb = stfu_n_init(queue_frames); + switch_socket_create_pollfd(&rtp_session->jb_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); + return SWITCH_STATUS_SUCCESS; } @@ -1364,11 +1374,15 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_type, switch_frame_flag_t *flags, switch_io_flag_t io_flags) { switch_size_t bytes = 0; - switch_status_t status; + switch_status_t status = SWITCH_STATUS_SUCCESS, poll_status = SWITCH_STATUS_SUCCESS; int check = 0; stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000; + int poll_sec = 5; + int poll_loop = 0; + int fdr = 0; + int from_jb = 0; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1376,8 +1390,6 @@ if (rtp_session->timer.interval) { sleep_mss = rtp_session->timer.interval * 1000; - } else { - rtp_session->last_time = switch_time_now(); } READ_INC(rtp_session); @@ -1386,13 +1398,54 @@ int do_cng = 0; if (rtp_session->timer.interval) { - switch_core_timer_next(&rtp_session->timer); + int do_sleep = 1; + if (rtp_session->jb) { + if (switch_poll(rtp_session->jb_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { + do_sleep = 0; + } + } + if (do_sleep) { + switch_core_timer_next(&rtp_session->timer); + } } recvfrom: - bytes = sizeof(rtp_msg_t); - status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + if (rtp_session->jb) { + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + rtp_session->recv_msg.header.pt = rtp_session->payload; + from_jb = 1; + goto post_read; + } + } + + + if (rtp_session->read_pollfd) { + poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); + } + + + if (poll_status == SWITCH_STATUS_SUCCESS) { + bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + } else { + if (!SWITCH_STATUS_IS_BREAK(poll_status) && poll_status != SWITCH_STATUS_TIMEOUT) { + ret = -1; + goto end; + } + + poll_loop = 1; + rtp_session->missed_count += (poll_sec * 1000 ) / (rtp_session->ms_per_packet / 1000); + bytes = 0; + } + + post_read: if (bytes < 0) { ret = (int) bytes; @@ -1427,6 +1480,10 @@ continue; } + if (!bytes && poll_loop) { + goto recvfrom; + } + if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { rtp_flush_read_buffer(rtp_session); } @@ -1517,26 +1574,16 @@ goto end; } - if (rtp_session->jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { + if (rtp_session->jb && !from_jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { if (bytes) { + if (rtp_session->recv_msg.header.m) { stfu_n_reset(rtp_session->jb); } - stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); bytes = 0; - } - - if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - rtp_session->recv_msg.header.pt = rtp_session->payload; - } else { - goto timer_check; + goto recvfrom; } } From mikej at freeswitch.org Mon Mar 30 15:17:26 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 17:17:26 -0500 Subject: [Freeswitch-svn] [commit] r12847 - freeswitch/trunk/scripts Message-ID: Author: mikej Date: Mon Mar 30 17:17:26 2009 New Revision: 12847 Log: add tag scripts Added: freeswitch/trunk/scripts/tagscript-test.sh (contents, props changed) freeswitch/trunk/scripts/tagscript.sh (contents, props changed) Added: freeswitch/trunk/scripts/tagscript-test.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/tagscript-test.sh Mon Mar 30 17:17:26 2009 @@ -0,0 +1,18 @@ +NEW_MICRO=4pre3 +rm -rf freeswitch-1.0.$(NEW_MICRO) +svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch-1.0.$(NEW_MICRO) +cd freeswitch-1.0.$(NEW_MICRO) +SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"` +FREESWITCH_VERSION=$((`svnversion .` + 1)) +cat configure.in | sed "s|$SWITCH_VERSION_MICRO|$NEW_MICRO|" | sed "s|svn-revision-here|$FREESWITCH_VERSION|" | sed "s|#AC_SUBST(SWITCH_VERSION_REVISION|AC_SUBST(SWITCH_VERSION_REVISION|" > configure.tmp +cp -f configure.tmp configure.in +rm -f configure.tmp +./bootstrap.sh +rm -f docs/AUTHORS +rm -f docs/COPYING +rm -f docs/ChangeLog +cd .. +tar -czvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.gz freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ +tar -cjvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.bz2 freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ Added: freeswitch/trunk/scripts/tagscript.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/tagscript.sh Mon Mar 30 17:17:26 2009 @@ -0,0 +1,34 @@ +NEW_MICRO=4 +rm -rf freeswitch.tag.working +svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch.tag.working +cd freeswitch.tag.working +SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"` +FREESWITCH_VERSION=$((`svnversion .` + 1)) +cat configure.in | sed "s|$SWITCH_VERSION_MICRO|$NEW_MICRO|" | sed "s|svn-revision-here|$FREESWITCH_VERSION|" | sed "s|#AC_SUBST(SWITCH_VERSION_REVISION|AC_SUBST(SWITCH_VERSION_REVISION|" > configure.tmp +cp -f configure.tmp configure.in +rm -f configure.tmp +cd libs/openzap/ +OPENZAP_VERSION=$((`svnversion .` + 1)) +svn copy . http://svn.openzap.org:81/svn/openzap/tags/v$OPENZAP_VERSION -m"tag" +cd ../.. +echo 'cat $1 | sed "s|openzap/trunk|openzap/tags/v'$OPENZAP_VERSION'|" > svn-temp-working' > externaleditor.sh +echo 'cp -f svn-temp-working $1' >> externaleditor.sh +echo 'rm -f svn-temp-working' >> externaleditor.sh +chmod a+x externaleditor.sh +svn propedit svn:externals . --editor-cmd=./externaleditor.sh +svn copy . http://svn.freeswitch.org/svn/freeswitch/tags/$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO -m"tag" +cd .. +rm -rf freeswitch.tag.working +svn co http://svn.freeswitch.org/svn/freeswitch/tags/$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO +cd freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO +./bootstrap.sh +rm -rf `find . -name .svn` +rm -f bootstrap.sh +rm -f docs/AUTHORS +rm -f docs/COPYING +rm -f docs/ChangeLog +cd .. +tar -czvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.gz freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ +tar -cjvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.bz2 freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ From mikej at freeswitch.org Mon Mar 30 15:25:08 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Mon, 30 Mar 2009 17:25:08 -0500 Subject: [Freeswitch-svn] [commit] r12848 - freeswitch/trunk/scripts Message-ID: Author: mikej Date: Mon Mar 30 17:25:08 2009 New Revision: 12848 Log: typo Modified: freeswitch/trunk/scripts/tagscript-test.sh Modified: freeswitch/trunk/scripts/tagscript-test.sh ============================================================================== --- freeswitch/trunk/scripts/tagscript-test.sh (original) +++ freeswitch/trunk/scripts/tagscript-test.sh Mon Mar 30 17:25:08 2009 @@ -1,7 +1,7 @@ NEW_MICRO=4pre3 -rm -rf freeswitch-1.0.$(NEW_MICRO) -svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch-1.0.$(NEW_MICRO) -cd freeswitch-1.0.$(NEW_MICRO) +rm -rf freeswitch-1.0.$NEW_MICRO +svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch-1.0.$NEW_MICRO +cd freeswitch-1.0.$NEW_MICRO SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"` From anthm at freeswitch.org Tue Mar 31 06:08:43 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 08:08:43 -0500 Subject: [Freeswitch-svn] [commit] r12849 - freeswitch/trunk/src/mod/languages/mod_python Message-ID: Author: anthm Date: Tue Mar 31 08:08:43 2009 New Revision: 12849 Log: MODLANG-109 Modified: freeswitch/trunk/src/mod/languages/mod_python/hack.diff freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Modified: freeswitch/trunk/src/mod/languages/mod_python/hack.diff ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/hack.diff (original) +++ freeswitch/trunk/src/mod/languages/mod_python/hack.diff Tue Mar 31 08:08:43 2009 @@ -1,6 +1,26 @@ ---- mod_python_wrap.cpp 2008-07-16 17:05:18.000000000 -0400 -+++ old.cpp 2008-07-16 17:05:07.000000000 -0400 -@@ -8621,20 +8621,20 @@ +--- mod_python_wrap.cpp.orig 2009-03-21 11:37:16.000000000 +0100 ++++ mod_python_wrap.cpp 2009-03-21 11:33:18.000000000 +0100 +@@ -5469,7 +5469,9 @@ + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); ++ Py_BEGIN_ALLOW_THREADS; + result = (Event *)(arg1)->pop(arg2); ++ Py_END_ALLOW_THREADS; + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); + return resultobj; + fail: +@@ -5491,7 +5493,9 @@ + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'"); + } + arg1 = reinterpret_cast< EventConsumer * >(argp1); ++ Py_BEGIN_ALLOW_THREADS; + result = (Event *)(arg1)->pop(); ++ Py_END_ALLOW_THREADS; + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); + return resultobj; + fail: +@@ -9206,20 +9210,20 @@ } @@ -24,7 +44,7 @@ PyObject *resultobj = 0; char *arg1 = (char *) 0 ; CoreSession *arg2 = (CoreSession *) 0 ; -@@ -8659,7 +8659,7 @@ +@@ -9244,7 +9248,7 @@ } arg2 = reinterpret_cast< CoreSession * >(argp2); result = (PYTHON::Session *)new PYTHON::Session(arg1,arg2); @@ -33,7 +53,7 @@ if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: -@@ -8668,7 +8668,7 @@ +@@ -9253,7 +9257,7 @@ } @@ -42,7 +62,7 @@ PyObject *resultobj = 0; char *arg1 = (char *) 0 ; PYTHON::Session *result = 0 ; -@@ -8684,7 +8684,7 @@ +@@ -9269,7 +9273,7 @@ } arg1 = reinterpret_cast< char * >(buf1); result = (PYTHON::Session *)new PYTHON::Session(arg1); @@ -51,7 +71,7 @@ if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: -@@ -8693,7 +8693,7 @@ +@@ -9278,7 +9282,7 @@ } @@ -60,7 +80,7 @@ PyObject *resultobj = 0; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; PYTHON::Session *result = 0 ; -@@ -8708,7 +8708,7 @@ +@@ -9293,7 +9297,7 @@ } arg1 = reinterpret_cast< switch_core_session_t * >(argp1); result = (PYTHON::Session *)new PYTHON::Session(arg1); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Tue Mar 31 08:08:43 2009 @@ -5469,7 +5469,9 @@ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); + Py_BEGIN_ALLOW_THREADS; result = (Event *)(arg1)->pop(arg2); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); return resultobj; fail: @@ -5491,7 +5493,9 @@ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'"); } arg1 = reinterpret_cast< EventConsumer * >(argp1); + Py_BEGIN_ALLOW_THREADS; result = (Event *)(arg1)->pop(); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); return resultobj; fail: From anthm at freeswitch.org Tue Mar 31 06:14:16 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 08:14:16 -0500 Subject: [Freeswitch-svn] [commit] r12850 - freeswitch/trunk/src/mod/applications/mod_voicemail Message-ID: Author: anthm Date: Tue Mar 31 08:14:16 2009 New Revision: 12850 Log: MODAPP-240 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Mar 31 08:14:16 2009 @@ -2997,24 +2997,34 @@ } } - switch_channel_get_variables(channel, &vars); - status = deliver_vm(profile, x_user, domain_name, file_path, message_len, read_flags, vars, - switch_core_session_get_pool(session), caller_id_name, caller_id_number, SWITCH_FALSE); - switch_event_destroy(&vars); - if (status == SWITCH_STATUS_SUCCESS) { - if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) { - char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name); - if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc); + switch_event_t *params = NULL; + + switch_event_create(¶ms, SWITCH_EVENT_REQUEST_PARAMS); + switch_assert(params); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", id); + + if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), + &x_domain_root, &x_domain, &x_user, NULL, params) == SWITCH_STATUS_SUCCESS) { + + switch_channel_get_variables(channel, &vars); + status = deliver_vm(profile, x_user, domain_name, file_path, message_len, read_flags, vars, + switch_core_session_get_pool(session), caller_id_name, caller_id_number, SWITCH_FALSE); + switch_event_destroy(&vars); + if (status == SWITCH_STATUS_SUCCESS) { + if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) { + char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name); + if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc); + } } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n"); + TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL)); } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n"); - TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL)); } - + switch_event_destroy(¶ms); end: if (x_domain_root) { From anthm at freeswitch.org Tue Mar 31 09:10:20 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 11:10:20 -0500 Subject: [Freeswitch-svn] [commit] r12851 - freeswitch/trunk/src Message-ID: Author: anthm Date: Tue Mar 31 11:10:20 2009 New Revision: 12851 Log: shutdown the queue when destroying the event consumer obj in c++ Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Mar 31 11:10:20 2009 @@ -97,6 +97,10 @@ switch_event_unbind(&node); } + if (events) { + switch_queue_interrupt_all(events); + } + switch_core_destroy_memory_pool(&pool); } From mikej at freeswitch.org Tue Mar 31 10:13:16 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 12:13:16 -0500 Subject: [Freeswitch-svn] [commit] r12852 - freeswitch/trunk/src/mod/loggers/mod_syslog Message-ID: Author: mikej Date: Tue Mar 31 12:13:16 2009 New Revision: 12852 Log: fix string scope on globals (LOGGER-1) Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Tue Mar 31 12:13:16 2009 @@ -164,15 +164,16 @@ setlogmask(LOG_UPTO(LOG_DEBUG)); switch_log_bind_logger(mod_syslog_logger, log_level, SWITCH_FALSE); - switch_safe_free(globals.ident); - switch_safe_free(globals.format); - return SWITCH_STATUS_SUCCESS; } SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown) { closelog(); + + switch_safe_free(globals.ident); + switch_safe_free(globals.format); + switch_log_unbind_logger(mod_syslog_logger); return SWITCH_STATUS_SUCCESS; From mikej at freeswitch.org Tue Mar 31 10:33:45 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 12:33:45 -0500 Subject: [Freeswitch-svn] [commit] r12853 - freeswitch/trunk/libs/win32 Message-ID: Author: mikej Date: Tue Mar 31 12:33:45 2009 New Revision: 12853 Log: Windows sphinx downloads for release mode (FSBUILD-146) Modified: freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj Modified: freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj Tue Mar 31 12:33:45 2009 @@ -85,7 +85,7 @@ Modified: freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj Tue Mar 31 12:33:45 2009 @@ -85,7 +85,7 @@ From anthm at freeswitch.org Tue Mar 31 12:10:43 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 14:10:43 -0500 Subject: [Freeswitch-svn] [commit] r12854 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia Message-ID: Author: anthm Date: Tue Mar 31 14:10:43 2009 New Revision: 12854 Log: add rtp-autoflush profile param and rtp_autoflush var to skip timer sleeps when the socket has data ready and refactor the jitter buffer code out into a different function and fix it so it works in blocking mode too Modified: freeswitch/trunk/src/include/switch_types.h 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_glue.c freeswitch/trunk/src/switch_rtp.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 31 14:10:43 2009 @@ -470,7 +470,8 @@ SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17), SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19), - SWITCH_RTP_FLAG_FLUSH = (1 << 20) + SWITCH_RTP_FLAG_FLUSH = (1 << 20), + SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21) } switch_rtp_flag_enum_t; typedef uint32_t switch_rtp_flag_t; 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 Mar 31 14:10:43 2009 @@ -181,6 +181,7 @@ PFLAG_MANAGE_SHARED_APPEARANCE, PFLAG_DISABLE_SRV, PFLAG_DISABLE_NAPTR, + PFLAG_AUTOFLUSH, /* No new flags below this line */ PFLAG_MAX 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 Mar 31 14:10:43 2009 @@ -1655,6 +1655,12 @@ } else { sofia_clear_pflag(profile, PFLAG_PASS_RFC2833); } + } else if (!strcasecmp(var, "rtp-autoflush")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFLUSH); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); + } } else if (!strcasecmp(var, "inbound-codec-negotiation")) { if (!strcasecmp(val, "greedy")) { sofia_set_pflag(profile, PFLAG_GREEDY); @@ -2181,6 +2187,12 @@ if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_PASS_RFC2833); } + } else if (!strcasecmp(var, "rtp-autoflush")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFLUSH); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); + } } else if (!strcasecmp(var, "inbound-codec-negotiation")) { if (!strcasecmp(val, "greedy")) { sofia_set_pflag(profile, PFLAG_GREEDY); 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 Tue Mar 31 14:10:43 2009 @@ -2054,6 +2054,12 @@ flags |= SWITCH_RTP_FLAG_PASS_RFC2833; } + + if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTOFLUSH) + || ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_autoflush")) && switch_true(val))) { + flags |= SWITCH_RTP_FLAG_AUTOFLUSH; + } + if (!(sofia_test_pflag(tech_pvt->profile, PFLAG_REWRITE_TIMESTAMPS) || ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_rewrite_timestamps")) && !switch_true(val)))) { flags |= SWITCH_RTP_FLAG_RAW_WRITE; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Mar 31 14:10:43 2009 @@ -599,10 +599,10 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); - } else { - switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); } + switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); + status = SWITCH_STATUS_SUCCESS; *err = "Success"; switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); @@ -1016,13 +1016,8 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { - if (rtp_session->read_pollfd) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't use jitterbuffer without a timer.\n"); - return SWITCH_STATUS_FALSE; - } rtp_session->jb = stfu_n_init(queue_frames); - switch_socket_create_pollfd(&rtp_session->jb_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); return SWITCH_STATUS_SUCCESS; } @@ -1371,18 +1366,53 @@ #define return_cng_frame() do_cng = 1; goto timer_check +static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t *bytes, switch_frame_flag_t *flags) +{ + switch_status_t status = SWITCH_STATUS_FALSE; + stfu_frame_t *jb_frame; + + switch_assert(bytes); + + *bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, bytes); + + if (rtp_session->jb && rtp_session->recv_msg.header.version == 2 && *bytes) { + if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { + stfu_n_reset(rtp_session->jb); + } + + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, *bytes - rtp_header_len); + *bytes = 0; + status = SWITCH_STATUS_FALSE; + } + + if (rtp_session->jb) { + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + *bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + rtp_session->recv_msg.header.pt = rtp_session->payload; + status = SWITCH_STATUS_SUCCESS; + } + } + + return status; +} + static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_type, switch_frame_flag_t *flags, switch_io_flag_t io_flags) { switch_size_t bytes = 0; switch_status_t status = SWITCH_STATUS_SUCCESS, poll_status = SWITCH_STATUS_SUCCESS; int check = 0; - stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000; int poll_sec = 5; int poll_loop = 0; int fdr = 0; - int from_jb = 0; + int hot_socket = 0; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1398,42 +1428,24 @@ int do_cng = 0; if (rtp_session->timer.interval) { - int do_sleep = 1; - if (rtp_session->jb) { - if (switch_poll(rtp_session->jb_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { - do_sleep = 0; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH)) { + if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { + hot_socket = 1; } } - if (do_sleep) { + if (!hot_socket) { switch_core_timer_next(&rtp_session->timer); } } recvfrom: - if (rtp_session->jb) { - if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - rtp_session->recv_msg.header.pt = rtp_session->payload; - from_jb = 1; - goto post_read; - } - } - - - if (rtp_session->read_pollfd) { + if (!rtp_session->timer.interval) { poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); } - - + if (poll_status == SWITCH_STATUS_SUCCESS) { - bytes = sizeof(rtp_msg_t); - status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + status = read_rtp_packet(rtp_session, &bytes, flags); } else { if (!SWITCH_STATUS_IS_BREAK(poll_status) && poll_status != SWITCH_STATUS_TIMEOUT) { ret = -1; @@ -1445,8 +1457,6 @@ bytes = 0; } - post_read: - if (bytes < 0) { ret = (int) bytes; goto end; @@ -1574,20 +1584,6 @@ goto end; } - if (rtp_session->jb && !from_jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { - if (bytes) { - - if (rtp_session->recv_msg.header.m) { - stfu_n_reset(rtp_session->jb); - } - - stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); - bytes = 0; - goto recvfrom; - } - } - - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV)) { int sbytes = (int) bytes; err_status_t stat = 0; @@ -1749,14 +1745,7 @@ } if (check || (bytes && !rtp_session->timer.interval)) { - if (rtp_session->jb && (jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - } else if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ + if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) { switch_cond_next(); continue; From anthm at freeswitch.org Tue Mar 31 13:30:13 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 15:30:13 -0500 Subject: [Freeswitch-svn] [commit] r12855 - freeswitch/trunk/src/mod/applications/mod_fifo Message-ID: Author: anthm Date: Tue Mar 31 15:30:13 2009 New Revision: 12855 Log: FSCORE-343 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 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 Mar 31 15:30:13 2009 @@ -56,6 +56,7 @@ switch_memory_pool_t *pool; int has_outbound; int ready; + int is_static; }; typedef struct fifo_node fifo_node_t; @@ -1756,7 +1757,7 @@ void *val; for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); - if ((node = (fifo_node_t *) val)) { + if ((node = (fifo_node_t *) val) && node->is_static) { node->ready = 0; } } @@ -1845,6 +1846,7 @@ } node->ready = 1; + node->is_static = 1; switch_mutex_unlock(node->mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s configured\n", node->name); @@ -1862,11 +1864,10 @@ for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); - if (!(node = (fifo_node_t *) val) || node->ready) { + if (!(node = (fifo_node_t *) val) || !node->is_static || node->ready) { continue; } - if (node_consumer_wait_count(node) || node->consumer_count || node_idle_consumers(node)) { node->ready = 1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s not removed, still in use.\n", node->name); From mikej at freeswitch.org Tue Mar 31 13:51:36 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 15:51:36 -0500 Subject: [Freeswitch-svn] [commit] r12856 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src src/mod/endpoints/mod_sofia Message-ID: Author: mikej Date: Tue Mar 31 15:51:35 2009 New Revision: 12856 Log: linux... how did that not crash every time Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c 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 31 15:51:35 2009 @@ -3319,8 +3319,10 @@ msg_maxsize(msg, agent->sa_maxsize); - if (agent->sa_preload) - su_home_preload(msg_home(msg), 1, dlen + agent->sa_preload); + if (1 || agent->sa_preload) { + isize_t preload = (dlen + agent->sa_preload + 1023) & ~1023; + su_home_preload(msg_home(msg), 1, preload); + } return msg; } 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 Mar 31 15:51:35 2009 @@ -744,6 +744,7 @@ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), + NTATAG_PRELOAD(2048), TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:51:35 2009 @@ -1119,9 +1119,10 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { + int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != (*event)->priority) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + if (index != was) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); } goto end; } From mikej at freeswitch.org Tue Mar 31 13:54:32 2009 From: mikej at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 15:54:32 -0500 Subject: [Freeswitch-svn] [commit] r12857 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src src/mod/endpoints/mod_sofia Message-ID: Author: mikej Date: Tue Mar 31 15:54:31 2009 New Revision: 12857 Log: revert Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c 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 31 15:54:31 2009 @@ -3319,10 +3319,8 @@ msg_maxsize(msg, agent->sa_maxsize); - if (1 || agent->sa_preload) { - isize_t preload = (dlen + agent->sa_preload + 1023) & ~1023; - su_home_preload(msg_home(msg), 1, preload); - } + if (agent->sa_preload) + su_home_preload(msg_home(msg), 1, dlen + agent->sa_preload); return msg; } 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 Mar 31 15:54:31 2009 @@ -744,7 +744,6 @@ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), - NTATAG_PRELOAD(2048), TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:54:31 2009 @@ -1119,10 +1119,9 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { - int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != was) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); + if (index != (*event)->priority) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); } goto end; } From anthm at freeswitch.org Tue Mar 31 13:55:26 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 15:55:26 -0500 Subject: [Freeswitch-svn] [commit] r12858 - freeswitch/trunk/src Message-ID: Author: anthm Date: Tue Mar 31 15:55:26 2009 New Revision: 12858 Log: linux... how did that not crash every time Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:55:26 2009 @@ -1119,9 +1119,10 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { + int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != (*event)->priority) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + if (index != was) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); } goto end; } From stkn at freeswitch.org Tue Mar 31 16:36:35 2009 From: stkn at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 18:36:35 -0500 Subject: [Freeswitch-svn] [commit] r12859 - freeswitch/trunk/src/mod/asr_tts/mod_flite Message-ID: Author: stkn Date: Tue Mar 31 18:36:35 2009 New Revision: 12859 Log: Flite does not like the "-std=c99" flag, use the fix from mod_xml_ldap (for openldap) to remove it from CFLAGS before calling the flite configure script Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Tue Mar 31 18:36:35 2009 @@ -17,7 +17,7 @@ $(GETLIB) $(FLITE)-latest.tar.gz $(FLITE_DIR)/Makefile: $(FLITE_DIR) - cd $(FLITE_DIR) && ./configure --without-audio --with-pic --disable-shared + cd $(FLITE_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure --without-audio --with-pic --disable-shared $(TOUCH_TARGET) $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile From anthm at freeswitch.org Tue Mar 31 16:56:47 2009 From: anthm at freeswitch.org (FreeSWITCH SVN) Date: Tue, 31 Mar 2009 18:56:47 -0500 Subject: [Freeswitch-svn] [commit] r12860 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl mod_python mod_spidermonkey Message-ID: Author: anthm Date: Tue Mar 31 18:56:47 2009 New Revision: 12860 Log: remove old code Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Mar 31 18:56:47 2009 @@ -438,38 +438,11 @@ return SWITCH_STATUS_SUCCESS; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.lua", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - lua_thread(cmd); - switch_safe_free(cmd); - } - - switch_safe_free(path); - } -} - SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load) { switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Tue Mar 31 18:56:47 2009 @@ -429,24 +429,6 @@ return xml; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char path[512], *cmd; - - switch_snprintf(path, sizeof(path), "%s%smwi.pl", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - perl_thread(cmd); - switch_safe_free(cmd); - } - } -} - static switch_status_t do_config(void) { char *cf = "perl.conf"; @@ -491,12 +473,6 @@ globals.pool = pool; - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - if (!(my_perl = perl_alloc())) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate perl interpreter\n"); return SWITCH_STATUS_MEMERR; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 31 18:56:47 2009 @@ -333,26 +333,6 @@ return 0; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.py", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - py_thread(cmd); - switch_safe_free(cmd); - } - switch_safe_free(path); - } -} - SWITCH_STANDARD_API(launch_python) { @@ -372,12 +352,6 @@ switch_application_interface_t *app_interface; char *pp = getenv("PYTHONPATH"); - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - if (pp) { char *path = switch_mprintf("%s:%s", pp, SWITCH_GLOBAL_dirs.script_dir); setenv("PYTHONPATH", path, 1); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 31 18:56:47 2009 @@ -3695,27 +3695,6 @@ return SWITCH_STATUS_SUCCESS; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - js_thread_launch(cmd); - switch_safe_free(cmd); - } - - switch_safe_free(path); - } -} - SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load) { switch_application_interface_t *app_interface; @@ -3725,12 +3704,6 @@ return status; } - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun