- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3947 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: mikej Date: Thu Jan 11 18:44:18 2007 New Revision: 3947 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add max_forwards chanvar, maybe we should put this in caller profile and allways pass it across and decrement it to avoid loops across the switch, at least for protocols that support loop detection. 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 Thu Jan 11 18:44:18 2007 @@ -4149,8 +4149,10 @@ snprintf(uri, sizeof(uri), "%s@%s:%s", req_user, req_host, req_port); switch_channel_set_variable(channel, "sip_req_uri", uri); + snprintf(uri, sizeof(uri), "%u", sip->sip_max_forwards->mf_count); + switch_channel_set_variable(channel, "max_forwards", uri); - if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), (char *) from->a_url->url_user, profile->dialplan, displayname,

1 0

[commit] r3946 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: mikej Date: Thu Jan 11 18:04:54 2007 New Revision: 3946 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: use blank instead of null if no username 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 Thu Jan 11 18:04:54 2007 @@ -4108,11 +4108,19 @@ switch_channel_set_variable(channel, "sip_req_port", req_port); if (profile->pflags & PFLAG_FULL_ID) { - if (!(req_username = switch_mprintf("%s@%s:%s", (char *) req_user, (char *) req_host, req_port))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_safe_free(username); - return; - } + if (req_user) { + if (!(req_username = switch_mprintf("%s@%s:%s", (char *) req_user, (char *) req_host, req_port))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_safe_free(username); + return; + } + } else { + if (!(req_username = switch_mprintf("%s:%s", (char *) req_host, req_port))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_safe_free(username); + return; + } + } } contact_user = (char *) sip->sip_contact->m_url->url_user; @@ -4154,7 +4162,7 @@ (char *)modname, (profile->context && !strcasecmp(profile->context, "_domain_")) ? (char *) from->a_url->url_host : profile->context, - req_username ? req_username : (char *) req_user + req_username ? req_username : req_user ? (char *) req_user : "" )) != 0) {

1 0

[commit] r3945 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: anthm Date: Thu Jan 11 17:34:04 2007 New Revision: 3945 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add rwlock to members 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 Thu Jan 11 17:34:04 2007 @@ -115,7 +115,8 @@ MFLAG_CAN_HEAR = (1 << 2), MFLAG_KICKED = (1 << 3), MFLAG_ITHREAD = (1 << 4), - MFLAG_NOCHANNEL = (1 << 5) + MFLAG_NOCHANNEL = (1 << 5), + MFLAG_INTREE = (1 << 6) } member_flag_t; typedef enum { @@ -189,7 +190,7 @@ uint32_t interval; switch_mutex_t *mutex; conference_member_t *members; - switch_mutex_t *member_mutex; + switch_thread_rwlock_t *member_rwlock; conference_file_node_t *fnode; switch_memory_pool_t *pool; switch_thread_rwlock_t *rwlock; @@ -372,6 +373,7 @@ assert(conference != NULL); assert(id != 0); + switch_thread_rwlock_rdlock(conference->member_rwlock); for(member = conference->members; member; member = member->next) { if (switch_test_flag(member, MFLAG_NOCHANNEL)) { @@ -382,7 +384,12 @@ break; } } - + + if (member && !switch_test_flag(member, MFLAG_INTREE)) { + member = NULL; + } + + switch_thread_rwlock_unlock(conference->member_rwlock); return member; } @@ -394,14 +401,14 @@ int count = 0; assert (conference != NULL); - + switch_thread_rwlock_rdlock(conference->member_rwlock); for(member = conference->members; member; member = member->next) { if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) { switch_clear_flag_locked(member, MFLAG_RUNNING); count++; } } - + switch_thread_rwlock_unlock(conference->member_rwlock); return count; } @@ -459,7 +466,7 @@ assert(member != NULL); switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_wrlock(conference->member_rwlock); switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); @@ -467,7 +474,7 @@ member->next = conference->members; member->energy_level = conference->energy_level; conference->members = member; - + switch_set_flag(member, MFLAG_INTREE); if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { conference->count++; @@ -506,7 +513,7 @@ switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(conference->mutex); status = SWITCH_STATUS_SUCCESS; @@ -524,15 +531,13 @@ assert(conference != NULL); assert(member != NULL); - - - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_wrlock(conference->member_rwlock); switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); - + switch_clear_flag(member, MFLAG_INTREE); + for (imember = conference->members; imember; imember = imember->next) { if (imember == member ) { if (last) { @@ -606,7 +611,7 @@ switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(conference->mutex); status = SWITCH_STATUS_SUCCESS; @@ -648,6 +653,7 @@ ready = 0; /* Read one frame of audio from each member channel and save it for redistribution */ + switch_thread_rwlock_rdlock(conference->member_rwlock); for (imember = conference->members; imember; imember = imember->next) { if (imember->buflen) { memset(imember->frame, 255, imember->buflen); @@ -686,7 +692,7 @@ } switch_mutex_unlock(imember->audio_in_mutex); } - + switch_thread_rwlock_unlock(conference->member_rwlock); /* If a file or speech event is being played */ if (conference->fnode) { /* Lead in time */ @@ -719,6 +725,7 @@ if (ready) { /* Build a muxed frame for every member that contains the mixed audio of everyone else */ + switch_thread_rwlock_rdlock(conference->member_rwlock); for (omember = conference->members; omember; omember = omember->next) { omember->len = bytes; if (conference->fnode) { @@ -785,6 +792,7 @@ switch_mutex_unlock(imember->audio_out_mutex); } } + switch_thread_rwlock_unlock(conference->member_rwlock); if (conference->fnode && conference->fnode->done) { conference_file_node_t *fnode; @@ -849,6 +857,7 @@ conference->fnode = NULL; } + switch_thread_rwlock_rdlock(conference->member_rwlock); for(imember = conference->members; imember; imember = imember->next) { switch_channel_t *channel; @@ -867,6 +876,7 @@ switch_clear_flag_locked(imember, MFLAG_RUNNING); } + switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(conference->mutex); @@ -1428,7 +1438,8 @@ launch_conference_loop_input(member, switch_core_session_get_pool(member->session)); /* build a digit stream object */ - if (member->conference->dtmf_parser != NULL && switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) { + if (member->conference->dtmf_parser != NULL && + switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Warning Will Robinson, there is no digit parser stream object\n"); } @@ -1813,9 +1824,9 @@ assert(conference != NULL); switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_rdlock(conference->member_rwlock); count = conference->count; - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(conference->mutex); if (!count) { @@ -2040,15 +2051,13 @@ return SWITCH_STATUS_GENERR; } - - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_rdlock(conference->member_rwlock); count = conference->count; if (!(conference->tts_engine && conference->tts_voice)) { count = 0; } - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(conference->mutex); if (!count) { @@ -2113,13 +2122,11 @@ assert(stream != NULL); assert(pfncallback != NULL); - switch_mutex_lock(conference->member_mutex); - + switch_thread_rwlock_rdlock(conference->member_rwlock); for (member = conference->members; member; member = member->next) { pfncallback(member, stream, data); } - - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); } @@ -2130,7 +2137,7 @@ assert(conference != NULL); assert(stream != NULL); - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_rdlock(conference->member_rwlock); // stream->write_function(stream, "<pre>Current Callers:\n"); for (member = conference->members; member; member = member->next) { @@ -2152,7 +2159,7 @@ } - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); } @@ -2165,7 +2172,7 @@ assert(delim != NULL); - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_rdlock(conference->member_rwlock); for (member = conference->members; member; member = member->next) { switch_channel_t *channel; @@ -2209,7 +2216,7 @@ member->energy_level); } - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); } @@ -2785,23 +2792,17 @@ uint32_t id = atoi(argv[2]); uint32_t oid = atoi(argv[3]); - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); if ((member = conference_member_get(conference, id))) { member_del_relationship(member, oid); stream->write_function(stream, "relationship %u->%u cleared.", id, oid); } else { stream->write_function(stream, "relationship %u->%u not found", id, oid); } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); } else if (nospeak || nohear) { conference_member_t *member = NULL, *other_member = NULL; uint32_t id = atoi(argv[2]); uint32_t oid = atoi(argv[3]); - switch_mutex_lock(conference->mutex); - switch_mutex_lock(conference->member_mutex); if ((member = conference_member_get(conference, id)) && (other_member = conference_member_get(conference, oid))) { conference_relationship_t *rel = NULL; if ((rel = member_get_relationship(member, other_member))) { @@ -2825,8 +2826,6 @@ } else { stream->write_function(stream, "relationship %u->%u not found", id, oid); } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); } } @@ -3119,7 +3118,7 @@ conference_member_t *member = NULL; conference_member_t *last_member = NULL; - switch_mutex_lock(conference->member_mutex); + switch_thread_rwlock_rdlock(conference->member_rwlock); /* find last (oldest) member */ member = conference->members; @@ -3136,7 +3135,7 @@ pfn(last_member, stream, argv[argn+2]); } - switch_mutex_unlock(conference->member_mutex); + switch_thread_rwlock_unlock(conference->member_rwlock); } else { conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; conference_member_t *member = conference_member_get(conference, id); @@ -4461,9 +4460,9 @@ /* Activate the conference mutex for exclusivity */ switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool); - switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool); switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool); switch_thread_rwlock_create(&conference->rwlock, conference->pool); + switch_thread_rwlock_create(&conference->member_rwlock, conference->pool); return conference; }

1 0

[commit] r3944 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: mikej Date: Thu Jan 11 13:25:35 2007 New Revision: 3944 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: use the request uri instead of to for primary routing 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 Thu Jan 11 13:25:35 2007 @@ -3980,7 +3980,7 @@ sip_from_t const *from = sip->sip_from; sip_to_t const *to = sip->sip_to; char *displayname; - char *username, *to_username = NULL; + char *username, *req_username = NULL; char *url_user = (char *) from->a_url->url_user; char *to_user, *to_host, *to_port; char *req_user, *req_host, *req_port; @@ -4056,14 +4056,6 @@ return; } - if (profile->pflags & PFLAG_FULL_ID) { - if (!(to_username = switch_mprintf("%s@%s:%s", (char *) to_user, (char *) to_host, to_port))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_safe_free(username); - return; - } - } - attach_private(session, profile, tech_pvt, username); @@ -4115,6 +4107,14 @@ switch_channel_set_variable(channel, "sip_req_host", req_host); switch_channel_set_variable(channel, "sip_req_port", req_port); + if (profile->pflags & PFLAG_FULL_ID) { + if (!(req_username = switch_mprintf("%s@%s:%s", (char *) req_user, (char *) req_host, req_port))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_safe_free(username); + return; + } + } + contact_user = (char *) sip->sip_contact->m_url->url_user; contact_host = (char *) sip->sip_contact->m_url->url_host; if (!(contact_port = (char *) sip->sip_contact->m_url->url_port)) { @@ -4154,7 +4154,7 @@ (char *)modname, (profile->context && !strcasecmp(profile->context, "_domain_")) ? (char *) from->a_url->url_host : profile->context, - to_username ? to_username : (char *) to_user + req_username ? req_username : (char *) req_user )) != 0) { @@ -4213,7 +4213,7 @@ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); switch_safe_free(username); - switch_safe_free(to_username); + switch_safe_free(req_username); } if (!(tech_pvt->sofia_private = malloc(sizeof(*tech_pvt->sofia_private)))) {

1 0

[commit] r3943 - in freeswitch/trunk: conf src/include src/mod/applications/mod_conference
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: anthm Date: Thu Jan 11 13:14:02 2007 New Revision: 3943 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update conference to add lock sounds, sound prefix, and use say: syntax Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Jan 11 13:14:02 2007 @@ -397,6 +397,7 @@  <profiles> +  <profile name="default">  <param name="domain" value="sub.mydomain.com"/> @@ -406,38 +407,43 @@ <param name="interval" value="20"/>  <param name="energy-level" value="300"/> -  -  +  +      -  -  - +  +  +  +   -  +   -  +   -  +   -  +   -  +   -  +   -  +   -  +   -  +  +  +  +  +   -  +   -  +     Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Jan 11 13:14:02 2007 @@ -62,6 +62,12 @@ apr_size_t *len); +#ifdef WIN32 +#define switch_is_file_path(file) (*(file +1) == ':' || *file == '/') +#else +#define switch_is_file_path(file) (*file == '/') +#endif + /*! \brief Evaluate the truthfullness of a string expression \param expr a string expression 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 Thu Jan 11 13:14:02 2007 @@ -170,9 +170,12 @@ char *muted_sound; char *unmuted_sound; char *locked_sound; + char *is_locked_sound; + char *is_unlocked_sound; char *kicked_sound; char *caller_id_name; char *caller_id_number; + char *sound_prefix; switch_ivr_digit_stream_parser_t *dtmf_parser; char *pin; char *pin_sound; @@ -1805,7 +1808,7 @@ conference_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; uint32_t count; - char *expanded = NULL; + char *dfile = NULL, *expanded = NULL; assert(conference != NULL); @@ -1828,16 +1831,22 @@ } } - if -#ifdef WIN32 - (*(file +1) != ':' && *file != '/') -#else - (*file != '/') -#endif - { - status = conference_say(conference, file, leadin); + if (!strncasecmp(file, "say:", 4)) { + status = conference_say(conference, file + 4, leadin); + goto done; + } + + if (!switch_is_file_path(file)) { + if (conference->sound_prefix) { + if (!(dfile = switch_mprintf("%s/%s", conference->sound_prefix, file))) { goto done; } + file = dfile; + } else { + status = conference_say(conference, file + 4, leadin); + goto done; + } + } /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -1884,6 +1893,7 @@ switch_safe_free(expanded); + switch_safe_free(dfile); @@ -2831,6 +2841,10 @@ assert(conference != NULL); assert(stream != NULL); + if (conference->is_locked_sound) { + conference_play_file(conference, conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL); + } + switch_set_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s locked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { @@ -2849,6 +2863,10 @@ assert(conference != NULL); assert(stream != NULL); + if (conference->is_unlocked_sound) { + conference_play_file(conference, conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL); + } + switch_clear_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s unlocked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { @@ -4187,6 +4205,7 @@ char *tts_engine = NULL; char *tts_voice = NULL; char *enter_sound = NULL; + char *sound_prefix = NULL; char *exit_sound = NULL; char *alone_sound = NULL; char *ack_sound = NULL; @@ -4194,6 +4213,8 @@ char *muted_sound = NULL; char *unmuted_sound = NULL; char *locked_sound = NULL; + char *is_locked_sound = NULL; + char *is_unlocked_sound = NULL; char *kicked_sound = NULL; char *pin = NULL; char *pin_sound = NULL; @@ -4256,6 +4277,10 @@ unmuted_sound = val; } else if (!strcasecmp(var, "locked-sound")) { locked_sound = val; + } else if (!strcasecmp(var, "is-locked-sound")) { + is_locked_sound = val; + } else if (!strcasecmp(var, "is-unlocked-sound")) { + is_unlocked_sound = val; } else if (!strcasecmp(var, "kicked-sound")) { kicked_sound = val; } else if (!strcasecmp(var, "pin")) { @@ -4272,6 +4297,8 @@ caller_id_number = val; } else if (!strcasecmp(var, "caller-controls")) { caller_controls = val; + } else if (!strcasecmp(var, "sound-prefix")) { + sound_prefix = val; } } @@ -4333,6 +4360,11 @@ conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name); conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number); + + if (sound_prefix) { + conference->sound_prefix = switch_core_strdup(conference->pool, sound_prefix); + } + if (!switch_strlen_zero(enter_sound)) { conference->enter_sound = switch_core_strdup(conference->pool, enter_sound); } @@ -4381,6 +4413,14 @@ conference->locked_sound = switch_core_strdup(conference->pool, locked_sound); } + if (!switch_strlen_zero(is_locked_sound)) { + conference->is_locked_sound = switch_core_strdup(conference->pool, is_locked_sound); + } + + if (!switch_strlen_zero(is_unlocked_sound)) { + conference->is_unlocked_sound = switch_core_strdup(conference->pool, is_unlocked_sound); + } + if (!switch_strlen_zero(energy_level)) { conference->energy_level = atoi(energy_level); }

1 0

[commit] r3942 - in freeswitch/trunk/src: include mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: mikej Date: Wed Jan 10 16:26:10 2007 New Revision: 3942 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: completely untested redirect support, need to try this from a machine that can take sip calls. Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jan 10 16:26:10 2007 @@ -302,6 +302,7 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA - indicate no-media is required SWITCH_MESSAGE_INDICATE_HOLD - indicate hold SWITCH_MESSAGE_INDICATE_UNHOLD - indicate unhold + SWITCH_MESSAGE_INDICATE_REDIRECT - indicate redirect </pre> */ typedef enum { @@ -316,6 +317,7 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA, SWITCH_MESSAGE_INDICATE_HOLD, SWITCH_MESSAGE_INDICATE_UNHOLD, + SWITCH_MESSAGE_INDICATE_REDIRECT } switch_core_session_message_types_t; 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 Wed Jan 10 16:26:10 2007 @@ -153,6 +153,20 @@ switch_channel_answer(channel); } +static void redirect_function(switch_core_session_t *session, char *data) +{ + switch_core_session_message_t msg = {0}; + + /* Tell the channel to redirect */ + msg.from = __FILE__; + msg.string_arg = data; + msg.message_id = SWITCH_MESSAGE_INDICATE_REDIRECT; + switch_core_session_receive_message(session, &msg); + +} + + + static void set_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; @@ -455,13 +469,22 @@ /*.next */ &dptools_api_interface }; +static const switch_application_interface_t redirect_application_interface = { + /*.interface_name */ "redirect", + /*.application_function */ redirect_function, + /* long_desc */ "Send a redirect message to a session.", + /* short_desc */ "Send session redirect", + /* syntax */ "<redirect_data>", + /*.next */ NULL +}; + static const switch_application_interface_t ivr_application_interface = { /*.interface_name */ "ivr", /*.application_function */ ivr_application_function, /* long_desc */ "Run an ivr menu.", /* short_desc */ "Run an ivr menu", /* syntax */ "<menu_name>", - /*.next */ NULL + /*.next */ &redirect_application_interface }; static const switch_application_interface_t detect_speech_application_interface = { 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 Jan 10 16:26:10 2007 @@ -1885,6 +1885,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-activate timed RTP!\n"); } break; + case SWITCH_MESSAGE_INDICATE_REDIRECT: + if(msg->string_arg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg); + nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); + } + break; case SWITCH_MESSAGE_INDICATE_RINGING: nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); break;

1 0

[commit] r3938 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: brian Date: Wed Jan 10 14:40:06 2007 New Revision: 3938 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: add g729a as a registered codec type. Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Wed Jan 10 14:40:06 2007 @@ -262,9 +262,51 @@ &g729_10ms_8k_implementation }; +static const switch_codec_implementation_t g729a_10ms_8k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 18, + /*.iananame */ "G729a", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 32000, + /*.microseconds_per_frame */ 10000, + /*.samples_per_frame */ 80, + /*.bytes_per_frame */ 160, + /*.encoded_bytes_per_frame */ 10, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g729_init, + /*.encode */ switch_g729_encode, + /*.decode */ switch_g729_decode, + /*.destroy */ switch_g729_destroy, + &g729_8k_implementation +}; + +static const switch_codec_implementation_t g729a_8k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 18, + /*.iananame */ "G729a", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 20000, + /*.samples_per_frame */ 160, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 20, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g729_init, + /*.encode */ switch_g729_encode, + /*.decode */ switch_g729_decode, + /*.destroy */ switch_g729_destroy, + &g729a_10ms_8k_implementation +}; + static const switch_codec_interface_t g729_codec_interface = { /*.interface_name */ "g729", - /*.implementations */ &g729_8k_implementation, + /*.implementations */ &g729a_8k_implementation, /*.next */ NULL };

1 0

[commit] r3937 - freeswitch/trunk
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: anthm Date: Wed Jan 10 12:43:57 2007 New Revision: 3937 Modified: freeswitch/trunk/modules.conf.in Log: add mod_say_en to default modules.conf.in Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Wed Jan 10 12:43:57 2007 @@ -47,3 +47,5 @@ #languages/mod_spidermonkey_etpan timers/mod_softtimer #xml_int/mod_xml_rpc +say/mod_say_en +

1 0

[commit] r3935 - in freeswitch/trunk: libs/libetpan/build-windows libs/sofia-sip/win32 libs/win32 libs/win32/etpan libs/win32/udns src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729 src/mod/directories/mod_ldap src/mod/say/mod_say_en
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: mikej Date: Wed Jan 10 10:37:05 2007 New Revision: 3935 Modified: freeswitch/trunk/libs/libetpan/build-windows/ (props changed) freeswitch/trunk/libs/sofia-sip/win32/ (props changed) freeswitch/trunk/libs/win32/ (props changed) freeswitch/trunk/libs/win32/etpan/ (props changed) freeswitch/trunk/libs/win32/udns/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/say/mod_say_en/ (props changed) Log: svn:ignore props

1 0

[commit] r3933 - freeswitch/trunk/src
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: mikej Date: Wed Jan 10 09:42:47 2007 New Revision: 3933 Modified: freeswitch/trunk/src/switch_utils.c Log: The day before today Mike Murdock found a bug making switch_str_time return the day before, but it was already the day before today, so it returned 2 days ago, and that was just not right. Now time has all come back together. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Jan 10 09:42:47 2007 @@ -148,7 +148,7 @@ if (proceed > 3) { pcre_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace)); - tm.tm_mday = atoi(replace)-1; + tm.tm_mday = atoi(replace); } if (proceed > 4) {

1 0