November 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10240 - freeswitch/trunk/src/include
by Freeswitch SVN 04 Nov '08

04 Nov '08

Author: brian Date: Tue Nov 4 14:31:49 2008 New Revision: 10240 Modified: freeswitch/trunk/src/include/switch_utils.h Log: tweak from Carlos Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Nov 4 14:31:49 2008 @@ -303,7 +303,7 @@ if (it) { dup = strdup(it); for(p = dup; p && *p; p++) { - *p = tolower(*p); + *p = (char) tolower(*p); } return dup; } @@ -320,7 +320,7 @@ if (it) { dup = strdup(it); for(p = dup; p && *p; p++) { - *p = toupper(*p); + *p = (char) toupper(*p); } return dup; }

1 0

[commit] r10239 - in freeswitch/trunk/src: . include mod/event_handlers/mod_event_socket
by Freeswitch SVN 04 Nov '08

04 Nov '08

Author: anthm Date: Tue Nov 4 11:46:33 2008 New Revision: 10239 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr_originate.c Log: Add ability to choose uuid from originate string (use at your own risk) [origination_uuid=someid]sofia/default/100(a)dom.com it's only valid in [], cannot be used on 2 existing calls at once and is not reccommended if you don't need it. event_socket users can use it to do api create_uuid #### (then save uuid into a local variable say $uuid) ### filter unique-id $uuid events all originate [origination_uuid=$uuid]sofia/default/100(a)dom.com Then you can get all the events in anticipation on that channel. Anything people do to cause problems misusing this will not be supported. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Nov 4 11:46:33 2008 @@ -502,9 +502,11 @@ \param pool the pool to use for the allocation (a new one will be used if NULL) \return the newly created session */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(_In_ const switch_endpoint_interface_t *endpoint_interface, - _Inout_opt_ switch_memory_pool_t **pool); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(_In_ const switch_endpoint_interface_t *endpoint_interface, + _Inout_opt_ switch_memory_pool_t **pool, _In_ const char *use_uuid); +#define switch_core_session_request(_ep, _p) switch_core_session_request_uuid(_ep, _p, NULL) +SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session_t *session, const char *use_uuid); SWITCH_DECLARE(void) switch_core_session_perform_destroy(_Inout_ switch_core_session_t **session, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Nov 4 11:46:33 2008 @@ -1038,6 +1038,7 @@ SWITCH_EVENT_CHANNEL_UNPARK - A channel has been unparked SWITCH_EVENT_CHANNEL_APPLICATION- A channel has called and event from an application SWITCH_EVENT_CHANNEL_ORIGINATE - A channel has been originated + SWITCH_EVENT_CHANNEL_UUID - A channel has changed uuid SWITCH_EVENT_API - An API call has been executed SWITCH_EVENT_LOG - A LOG event has been triggered SWITCH_EVENT_INBOUND_CHAN - A new inbound channel has been created @@ -1095,6 +1096,7 @@ SWITCH_EVENT_CHANNEL_UNPARK, SWITCH_EVENT_CHANNEL_APPLICATION, SWITCH_EVENT_CHANNEL_ORIGINATE, + SWITCH_EVENT_CHANNEL_UUID, SWITCH_EVENT_API, SWITCH_EVENT_LOG, SWITCH_EVENT_INBOUND_CHAN, 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 Nov 4 11:46:33 2008 @@ -1250,6 +1250,7 @@ listener->event_list[SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_HANGUP] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_ORIGINATE] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_UUID] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_OUTGOING] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_PARK] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_PROGRESS] = 1; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Nov 4 11:46:33 2008 @@ -1150,6 +1150,7 @@ if (switch_test_flag(channel, CF_VERBOSE_EVENTS) || event->event_id == SWITCH_EVENT_CHANNEL_ORIGINATE || + event->event_id == SWITCH_EVENT_CHANNEL_UUID || event->event_id == SWITCH_EVENT_CHANNEL_ANSWER || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA || Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Nov 4 11:46:33 2008 @@ -316,11 +316,21 @@ switch_caller_profile_t *profile = NULL, *peer_profile = NULL, *cloned_profile = NULL; switch_event_t *event; switch_channel_t *peer_channel = switch_core_session_get_channel(*new_session); + const char *use_uuid; switch_assert(peer_channel); peer_profile = switch_channel_get_caller_profile(peer_channel); - + + if ((use_uuid = switch_event_get_header(var_event, "origination_uuid"))) { + if (switch_core_session_set_uuid(*new_session, use_uuid) == SWITCH_STATUS_SUCCESS) { + switch_event_del_header(var_event, "origination_uuid"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(peer_channel), use_uuid); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s set UUID=%s FAILED\n", switch_channel_get_name(peer_channel), use_uuid); + } + } + if (channel) { const char *export_vars, *val; switch_codec_t *read_codec = switch_core_session_get_read_codec(session); @@ -917,8 +927,33 @@ } -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t - *endpoint_interface, switch_memory_pool_t **pool) +SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session_t *session, const char *use_uuid) +{ + switch_event_t *event; + + switch_assert(use_uuid); + + if (switch_core_hash_find(session_manager.session_table, use_uuid)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Duplicate UUID!\n"); + return SWITCH_STATUS_FALSE; + } + + switch_event_create(&event, SWITCH_EVENT_CHANNEL_UUID); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Unique-ID", session->uuid_str); + switch_mutex_lock(runtime.throttle_mutex); + switch_core_hash_delete(session_manager.session_table, session->uuid_str); + switch_set_string(session->uuid_str, use_uuid); + switch_core_hash_insert(session_manager.session_table, session->uuid_str, session); + switch_mutex_unlock(runtime.throttle_mutex); + switch_channel_event_set_data(session->channel, event); + switch_event_fire(&event); + + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(const switch_endpoint_interface_t + *endpoint_interface, switch_memory_pool_t **pool, const char *use_uuid) { switch_memory_pool_t *usepool; switch_core_session_t *session; @@ -926,6 +961,11 @@ uint32_t count = 0; int32_t sps = 0; + if (use_uuid && switch_core_hash_find(session_manager.session_table, use_uuid)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Duplicate UUID!\n"); + return NULL; + } + if (!switch_core_ready() || endpoint_interface == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "The system cannot create any sessions at this time.\n"); return NULL; @@ -957,7 +997,7 @@ session = switch_core_alloc(usepool, sizeof(*session)); session->pool = usepool; - + if (switch_channel_alloc(&session->channel, session->pool) != SWITCH_STATUS_SUCCESS) { abort(); } @@ -967,8 +1007,13 @@ /* The session *IS* the pool you may not alter it because you have no idea how its all private it will be passed to the thread run function */ - switch_uuid_get(&uuid); - switch_uuid_format(session->uuid_str, &uuid); + if (use_uuid) { + switch_set_string(session->uuid_str, use_uuid); + } else { + switch_uuid_get(&uuid); + switch_uuid_format(session->uuid_str, &uuid); + } + session->endpoint_interface = endpoint_interface; session->raw_write_frame.data = session->raw_write_buf; session->raw_write_frame.buflen = sizeof(session->raw_write_buf); Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Tue Nov 4 11:46:33 2008 @@ -258,6 +258,21 @@ case SWITCH_EVENT_CHANNEL_DESTROY: sql = switch_mprintf("delete from channels where uuid='%q'", switch_event_get_header_nil(event, "unique-id")); break; + case SWITCH_EVENT_CHANNEL_UUID: + { + sql = switch_mprintf( + "update channels set uuid='%q' where uuid='%q';" + "update calls set caller_uuid='%q' where caller_uuid='%q';" + "update calls set callee_uuid='%q' where callee_uuid='%q'", + switch_event_get_header_nil(event, "unique-id"), + switch_event_get_header_nil(event, "old-unique-id"), + switch_event_get_header_nil(event, "unique-id"), + switch_event_get_header_nil(event, "old-unique-id"), + switch_event_get_header_nil(event, "unique-id"), + switch_event_get_header_nil(event, "old-unique-id") + ); + break; + } case SWITCH_EVENT_CHANNEL_CREATE: sql = switch_mprintf("insert into channels (uuid,created,created_epoch, name,state,dialplan,context) values('%q','%q','%ld','%q','%q','%q','%q')", switch_event_get_header_nil(event, "unique-id"), Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Nov 4 11:46:33 2008 @@ -125,6 +125,7 @@ "CHANNEL_UNPARK", "CHANNEL_APPLICATION", "CHANNEL_ORIGINATE", + "CHANNEL_UUID", "API", "LOG", "INBOUND_CHAN", Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Nov 4 11:46:33 2008 @@ -1043,6 +1043,19 @@ myflags |= SOF_NO_EFFECTIVE_CID_NAME; } + if (vdata && (var_begin = switch_stristr("origination_uuid=", vdata))) { + char tmp[512] = ""; + var_begin += strlen("origination_uuid="); + var_end = strchr(var_begin, '|'); + if (var_end) { + strncpy(tmp, var_begin, var_end-var_begin); + } else { + strncpy(tmp, var_begin, strlen(var_begin)); + } + new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_uuid", tmp); + } + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", early_ok ? "true" : "false");

1 0

[commit] r10238 - freeswitch/trunk/src
by Freeswitch SVN 04 Nov '08

04 Nov '08

Author: mikej Date: Tue Nov 4 10:41:25 2008 New Revision: 10238 Modified: freeswitch/trunk/src/switch_core_hash.c Log: make hash case sensitive so we can have same file format both upper and lower case (.gsm vs .GSM) Modified: freeswitch/trunk/src/switch_core_hash.c ============================================================================== --- freeswitch/trunk/src/switch_core_hash.c (original) +++ freeswitch/trunk/src/switch_core_hash.c Tue Nov 4 10:41:25 2008 @@ -48,7 +48,7 @@ newhash = switch_core_alloc(pool, sizeof(*newhash)); switch_assert(newhash); - sqlite3HashInit(&newhash->table, SQLITE_HASH_STRING, 1); + sqlite3HashInit(&newhash->table, SQLITE_HASH_BINARY, 1); *hash = newhash; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r10228 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: anthm Date: Mon Nov 3 16:54:03 2008 New Revision: 10228 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: more code 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 Mon Nov 3 16:54:03 2008 @@ -73,9 +73,12 @@ { switch_channel_t *channel = switch_core_session_get_channel(session); private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_assert(tech_pvt != NULL); tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; + switch_mutex_lock(tech_pvt->sofia_mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA INIT\n", switch_channel_get_name(channel)); if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { @@ -99,14 +102,20 @@ if (sofia_glue_do_invite(session) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); assert(switch_channel_get_state(channel) != CS_INIT); - return SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_FALSE; + goto end; } } /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); assert(switch_channel_get_state(channel) != CS_INIT); - return SWITCH_STATUS_SUCCESS; + + end: + + switch_mutex_unlock(tech_pvt->sofia_mutex); + + return status; } static switch_status_t sofia_on_routing(switch_core_session_t *session) @@ -232,6 +241,8 @@ int sip_cause = hangup_cause_to_sip(cause); const char *ps_cause = NULL, *use_my_cause; + switch_mutex_lock(tech_pvt->sofia_mutex); + if (!((use_my_cause = switch_channel_get_variable(channel, "sip_ignore_remote_cause")) && switch_true(use_my_cause))) { ps_cause = switch_channel_get_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE); } @@ -325,8 +336,7 @@ } else { switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } - - switch_mutex_lock(tech_pvt->sofia_mutex); + if (switch_test_flag(tech_pvt, TFLAG_ANS)) { if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); @@ -358,7 +368,7 @@ TAG_END()); } } - switch_mutex_unlock(tech_pvt->sofia_mutex); + switch_set_flag(tech_pvt, TFLAG_BYE); switch_safe_free(stream.data); } @@ -371,6 +381,8 @@ if (tech_pvt->sofia_private) { *tech_pvt->sofia_private->uuid = '\0'; } + + switch_mutex_unlock(tech_pvt->sofia_mutex); return SWITCH_STATUS_SUCCESS; } @@ -419,13 +431,11 @@ /* This if statement check and handles the 3pcc proxy mode */ if ((tech_pvt->profile->pflags & PFLAG_3PCC_PROXY) && switch_test_flag(tech_pvt, TFLAG_3PCC)) { /* Send the 200 OK */ - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT_STR(tech_pvt->profile->url), 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()); - switch_mutex_unlock(tech_pvt->sofia_mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n"); /* Unlock the session signal to allow the ack to make it in */ @@ -494,7 +504,6 @@ } - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_AUTOANSWER(0), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), @@ -502,7 +511,6 @@ 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()); - switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag_locked(tech_pvt, TFLAG_ANS); return SWITCH_STATUS_SUCCESS; @@ -821,13 +829,48 @@ goto end; } - if (msg->message_id == SWITCH_MESSAGE_INDICATE_ANSWER || msg->message_id == SWITCH_MESSAGE_INDICATE_PROGRESS) { - const char *var; - if ((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { - switch_set_flag_locked(tech_pvt, TFLAG_SECURE); + /* ones that do not need to lock sofia mutex */ + switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY: + if (tech_pvt->rtp_session && switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot pass 2833 on a transcoded call.\n"); + switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); + } + goto end; + + case SWITCH_MESSAGE_INDICATE_BRIDGE: + /* + if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_TIMER)) { + switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "De-activate timed RTP!\n"); + } + */ + goto end; + + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + /* + if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_TIMER)) { + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-activate timed RTP!\n"); + } + */ + goto end; + + case SWITCH_MESSAGE_INDICATE_ANSWER: + case SWITCH_MESSAGE_INDICATE_PROGRESS: + { + const char *var; + if ((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { + switch_set_flag_locked(tech_pvt, TFLAG_SECURE); + } } + break; + default: + break; } + /* ones that do need to lock sofia mutex */ + switch_mutex_lock(tech_pvt->sofia_mutex); switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: { @@ -842,31 +885,23 @@ " </vc_primitive>\r\n" " </media_control>\r\n"; - switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/media_control+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } break; - case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY: - if (tech_pvt->rtp_session && switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot pass 2833 on a transcoded call.\n"); - switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); - } - break; - case SWITCH_MESSAGE_INDICATE_BROADCAST:{ + case SWITCH_MESSAGE_INDICATE_BROADCAST: + { const char *ip = NULL, *port = NULL; ip = switch_channel_get_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE); port = switch_channel_get_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE); if (ip && port) { sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } - switch_mutex_lock(tech_pvt->sofia_mutex); + nua_respond(tech_pvt->nh, SIP_200_OK, 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()); - switch_mutex_unlock(tech_pvt->sofia_mutex); switch_channel_mark_answered(channel); } break; @@ -889,6 +924,8 @@ sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), NULL, 1); } } + + if (!tech_pvt->local_sdp_str) { sofia_glue_tech_absorb_sdp(tech_pvt); } @@ -948,9 +985,7 @@ if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); - switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -962,9 +997,7 @@ if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); - switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -975,57 +1008,11 @@ sofia_glue_do_invite(session); } break; - case SWITCH_MESSAGE_INDICATE_BRIDGE: -#if 0 - if (switch_test_flag(tech_pvt, TFLAG_XFER)) { - switch_clear_flag_locked(tech_pvt, TFLAG_XFER); - if (msg->pointer_arg) { - switch_core_session_t *a_session, *b_session = msg->pointer_arg; - - if ((a_session = switch_core_session_locate(tech_pvt->xferto))) { - private_object_t *a_tech_pvt = switch_core_session_get_private(a_session); - private_object_t *b_tech_pvt = switch_core_session_get_private(b_session); - switch_set_flag_locked(a_tech_pvt, TFLAG_REINVITE); - a_tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(a_session, b_tech_pvt->remote_sdp_audio_ip); - a_tech_pvt->remote_sdp_audio_port = b_tech_pvt->remote_sdp_audio_port; - a_tech_pvt->local_sdp_audio_ip = switch_core_session_strdup(a_session, b_tech_pvt->local_sdp_audio_ip); - a_tech_pvt->local_sdp_audio_port = b_tech_pvt->local_sdp_audio_port; - if (sofia_glue_activate_rtp(a_tech_pvt, 0) != SWITCH_STATUS_SUCCESS) { - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - } - b_tech_pvt->kick = switch_core_session_strdup(b_session, tech_pvt->xferto); - switch_core_session_rwunlock(a_session); - } - - msg->pointer_arg = NULL; - status = SWITCH_STATUS_FALSE; - goto end; - } - } -#endif - - /* - if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_TIMER)) { - switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "De-activate timed RTP!\n"); - } - */ - break; - case SWITCH_MESSAGE_INDICATE_UNBRIDGE: - /* - if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_TIMER)) { - switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-activate timed RTP!\n"); - } - */ - break; case SWITCH_MESSAGE_INDICATE_REDIRECT: if (!switch_strlen_zero(msg->string_arg)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg); - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag_locked(tech_pvt, TFLAG_BYE); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for redirecting to %s, already answered\n", msg->string_arg); @@ -1042,9 +1029,7 @@ } else { switch_set_string(ref_to, msg->string_arg); } - switch_mutex_lock(tech_pvt->sofia_mutex); nua_refer(tech_pvt->nh, SIPTAG_REFER_TO_STR(ref_to), SIPTAG_REFERRED_BY_STR(tech_pvt->contact_url), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } break; @@ -1101,11 +1086,9 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, 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()); - switch_mutex_unlock(tech_pvt->sofia_mutex); if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); } @@ -1125,16 +1108,12 @@ sofia_glue_tech_patch_sdp(tech_pvt); sofia_glue_tech_proxy_remote_addr(tech_pvt); } - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, 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()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } else { - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); @@ -1146,9 +1125,7 @@ case SWITCH_MESSAGE_INDICATE_RINGING: if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); switch_channel_mark_ring_ready(channel); } break; @@ -1219,7 +1196,7 @@ switch_channel_set_variable(channel, "sip_nat_detected", "true"); } - switch_mutex_lock(tech_pvt->sofia_mutex); + nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), @@ -1229,13 +1206,13 @@ SOATAG_ORDERED_USER(1), SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); - switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; default: break; } + switch_mutex_unlock(tech_pvt->sofia_mutex); 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 Mon Nov 3 16:54:03 2008 @@ -1353,7 +1353,7 @@ const char *sipip, *format; switch_assert(tech_pvt != NULL); - + switch_mutex_lock(tech_pvt->sofia_mutex); caller_profile = switch_channel_get_caller_profile(channel); sipip = tech_pvt->profile->extsipip ? tech_pvt->profile->extsipip : tech_pvt->profile->sipip; @@ -1380,6 +1380,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); } + switch_mutex_unlock(tech_pvt->sofia_mutex); } void sofia_glue_tech_absorb_sdp(private_object_t *tech_pvt)

1 0

[commit] r10227 - in freeswitch/trunk/src: . include
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: anthm Date: Mon Nov 3 15:08:44 2008 New Revision: 10227 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_event.c Log: add hashing to event header lookup Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Nov 3 15:08:44 2008 @@ -202,6 +202,8 @@ */ SWITCH_DECLARE(unsigned int) switch_hashfunc_default(const char *key, switch_ssize_t *klen); +SWITCH_DECLARE(unsigned int) switch_ci_hashfunc_default(const char *char_key, switch_ssize_t *klen); + /** * @defgroup switch_time Time Routines Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Mon Nov 3 15:08:44 2008 @@ -67,6 +67,8 @@ char *name; /*! the header value */ char *value; + /*! hash of the header name */ + unsigned long hash; struct switch_event_header *next; }; Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Nov 3 15:08:44 2008 @@ -295,6 +295,40 @@ } +static inline char *switch_lc_strdup(const char *it) +{ + char *dup; + char *p; + + if (it) { + dup = strdup(it); + for(p = dup; p && *p; p++) { + *p = tolower(*p); + } + return dup; + } + + return NULL; +} + + +static inline char *switch_uc_strdup(const char *it) +{ + char *dup; + char *p; + + if (it) { + dup = strdup(it); + for(p = dup; p && *p; p++) { + *p = toupper(*p); + } + return dup; + } + + return NULL; +} + + /*! \brief Test if one string is inside another with extra case checking \param s the inner string Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Nov 3 15:08:44 2008 @@ -74,6 +74,30 @@ apr_pool_clear(p); } +SWITCH_DECLARE(unsigned int) switch_ci_hashfunc_default(const char *char_key, switch_ssize_t *klen) + +{ + unsigned int hash = 0; + const unsigned char *key = (const unsigned char *)char_key; + const unsigned char *p; + apr_ssize_t i; + + if (*klen == APR_HASH_KEY_STRING) { + for (p = key; *p; p++) { + hash = hash * 33 + tolower(*p); + } + *klen = p - key; + } + else { + for (p = key, i = *klen; i; i--, p++) { + hash = hash * 33 + tolower(*p); + } + } + + return hash; +} + + SWITCH_DECLARE(unsigned int) switch_hashfunc_default(const char *key, switch_ssize_t *klen) { return apr_hashfunc_default(key, klen); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Nov 3 15:08:44 2008 @@ -586,12 +586,17 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, const char *header_name) { switch_event_header_t *hp; + switch_ssize_t hlen = -1; + unsigned long hash = 0; + switch_assert(event); - if (!header_name) - return NULL; + if (!header_name) return NULL; + + hash = switch_ci_hashfunc_default(header_name, &hlen); + for (hp = event->headers; hp; hp = hp->next) { - if (!strcasecmp(hp->name, header_name)) { + if ((!hp->hash || hash == hp->hash) && !strcasecmp(hp->name, header_name) ) { return hp->value; } } @@ -608,6 +613,9 @@ switch_event_header_t *hp, *lp = NULL, *tp; switch_status_t status = SWITCH_STATUS_FALSE; int x = 0; + switch_ssize_t hlen = -1; + unsigned long hash = 0; + tp = event->headers; while (tp) { hp = tp; @@ -615,7 +623,9 @@ x++; switch_assert(x < 1000); - if (!strcasecmp(header_name, hp->name)) { + hash = switch_ci_hashfunc_default(header_name, &hlen); + + if ((!hp->hash || hash == hp->hash) && !strcasecmp(header_name, hp->name)) { if (lp) { lp->next = hp->next; } else { @@ -642,6 +652,7 @@ switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data) { switch_event_header_t *header; + switch_ssize_t hlen = -1; void *pop; if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { @@ -655,7 +666,8 @@ header->name = DUP(header_name); header->value = data; - + header->hash = switch_ci_hashfunc_default(header->name, &hlen); + if (stack == SWITCH_STACK_TOP) { header->next = event->headers; event->headers = header;

1 0

[commit] r10226 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: anthm Date: Mon Nov 3 15:07:45 2008 New Revision: 10226 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: follow on MODENDP-147 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 Nov 3 15:07:45 2008 @@ -1205,7 +1205,7 @@ id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); contact = sofia_glue_get_url_from_contact(o_contact, 1); - if ((route = strstr(o_contact, ";fs_path=")) && (route = strdup(route + 9))) { + if ((route = strstr(contact, ";fs_path=")) && (route = strdup(route + 9))) { for (p = route; p && *p ; p++) { if (*p == '>' || *p == ';') { @@ -1225,10 +1225,23 @@ } } - if (!route_uri && strstr(o_contact, ";fs_nat")) { + if (!route_uri && strstr(contact, ";fs_nat")) { route_uri = contact; } + if ((p = strstr(contact, ";fs_"))) { + *p = '\0'; + } + + if (route_uri) { + while (route_uri && *route_uri && (*route_uri == '<' || *route_uri == ' ')) { + route_uri++; + } + if ((p = strchr(route_uri, '>'))) { + *p++ = '\0'; + } + } + nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); nua_notify(nh,

1 0

[commit] r10225 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: mikej Date: Mon Nov 3 14:56:48 2008 New Revision: 10225 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: 200 OK re-invite without sdp Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Nov 3 14:56:48 2008 @@ -2495,6 +2495,9 @@ } } + } else if (tech_pvt && switch_test_flag(tech_pvt, TFLAG_SDP) && !r_sdp) { + nua_respond(tech_pvt->nh, SIP_200_OK, TAG_END()); + goto done; } else { ss_state = nua_callstate_completed; goto state_process;

1 0

[commit] r10224 - freeswitch/trunk/src
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: mikej Date: Mon Nov 3 14:56:16 2008 New Revision: 10224 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: fix msvc build Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Nov 3 14:56:16 2008 @@ -869,31 +869,31 @@ switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session)); if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) { - switch_event_t *event; + switch_event_t *execute_event; data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"); - if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); - switch_core_session_queue_private_event(session, &event); + if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", app); + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); + switch_event_add_header(execute_event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event-lock", "true"); + switch_core_session_queue_private_event(session, &execute_event); a_leg->skip_frames = DEFAULT_LEAD_FRAMES; } } if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) { - switch_event_t *event; + switch_event_t *execute_event; data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"); - if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); - switch_core_session_queue_private_event(peer_session, &event); + if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", app); + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); + switch_event_add_header(execute_event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event-lock", "true"); + switch_core_session_queue_private_event(peer_session, &execute_event); b_leg->skip_frames = DEFAULT_LEAD_FRAMES; } }

1 0

[commit] r10222 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: brian Date: Mon Nov 3 12:39:09 2008 New Revision: 10222 Modified: 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_reg.c Log: cache auth_gateway_name in sofia for challenged bye Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Mon Nov 3 12:39:09 2008 @@ -109,7 +109,8 @@ struct sofia_private { char uuid[SWITCH_UUID_FORMATTED_LENGTH + 1]; sofia_gateway_t *gateway; - char gateway_name[512]; + char gateway_name[256]; + char auth_gateway_name[256]; int destroy_nh; int destroy_me; int is_call; @@ -586,8 +587,9 @@ void sofia_reg_handle_sip_r_challenge(int status, char const *phrase, - nua_t *nua, sofia_profile_t *profile, - nua_handle_t *nh, switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]); + nua_t *nua, sofia_profile_t *profile, + nua_handle_t *nh, sofia_private_t *sofia_private, + switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]); void sofia_reg_handle_sip_r_register(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[]); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Nov 3 12:39:09 2008 @@ -182,6 +182,12 @@ tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt); channel = switch_core_session_get_channel(tech_pvt->session); + if (status >= 180 && !*sofia_private->auth_gateway_name) { + const char *gwname = switch_channel_get_variable(channel, "sip_use_gateway"); + if (!switch_strlen_zero(gwname)) { + switch_set_string(sofia_private->auth_gateway_name, gwname); + } + } if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id); switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); @@ -237,7 +243,7 @@ } if (sip && (status == 401 || status == 407)) { - sofia_reg_handle_sip_r_challenge(status, phrase, nua, profile, nh, session, gateway, sip, tags); + sofia_reg_handle_sip_r_challenge(status, phrase, nua, profile, nh, sofia_private, session, gateway, sip, tags); goto done; } @@ -3899,7 +3905,7 @@ memset(sofia_private, 0, sizeof(*sofia_private)); sofia_private->is_call++; tech_pvt->sofia_private = sofia_private; - + if ((profile->pres_type)) { sofia_presence_set_chat_hash(tech_pvt, sip); } 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 Mon Nov 3 12:39:09 2008 @@ -1097,7 +1097,7 @@ void sofia_reg_handle_sip_r_challenge(int status, char const *phrase, - nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, + nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]) { sip_www_authenticate_t const *authenticate = NULL; @@ -1110,6 +1110,10 @@ sofia_gateway_t *var_gateway = NULL; const char *gw_name = NULL; + if (sofia_private && *sofia_private->auth_gateway_name) { + gw_name = sofia_private->auth_gateway_name; + } + if (session) { private_object_t *tech_pvt; switch_channel_t *channel = switch_core_session_get_channel(session);

1 0

[commit] r10221 - freeswitch/trunk/src
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: anthm Date: Mon Nov 3 11:38:32 2008 New Revision: 10221 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: fix FSCORE-216 declinatio mortuus obfirmo Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Nov 3 11:38:32 2008 @@ -30,6 +30,7 @@ */ #include <switch.h> +#define DEFAULT_LEAD_FRAMES 50 static const switch_state_handler_table_t audio_bridge_peer_state_handlers; @@ -84,6 +85,7 @@ switch_input_callback_function_t input_callback; void *session_data; int clean_exit; + uint32_t skip_frames; }; typedef struct switch_ivr_bridge_data switch_ivr_bridge_data_t; @@ -216,7 +218,7 @@ goto end_of_bridge_loop; } - if (loop_count > 50 && switch_core_session_private_event_count(session_a)) { + if (loop_count > DEFAULT_LEAD_FRAMES && switch_core_session_private_event_count(session_a)) { switch_channel_set_flag(chan_b, CF_SUSPEND); msg.string_arg = data->b_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; @@ -246,7 +248,7 @@ } #endif - if (loop_count > 50 && bypass_media_after_bridge) { + if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge) { switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE); bypass_media_after_bridge = 0; } @@ -341,6 +343,11 @@ } } + if (data->skip_frames) { + data->skip_frames--; + continue; + } + if (status != SWITCH_STATUS_BREAK && !switch_channel_test_flag(chan_a, CF_HOLD)) { if (switch_core_session_write_frame(session_b, read_frame, SWITCH_IO_FLAG_NONE, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, @@ -862,13 +869,33 @@ switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session)); if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) { + switch_event_t *event; + data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"); - switch_core_session_execute_application(session, app, data); + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); + switch_core_session_queue_private_event(session, &event); + a_leg->skip_frames = DEFAULT_LEAD_FRAMES; + } + } if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) { + switch_event_t *event; data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"); - switch_core_session_execute_application(peer_session, app, data); + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); + switch_core_session_queue_private_event(peer_session, &event); + b_leg->skip_frames = DEFAULT_LEAD_FRAMES; + } } switch_channel_set_private(peer_channel, "_bridge_", b_leg);

1 0