Author: anthm Date: Thu Mar 6 19:34:26 2008 New Revision: 7805 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 6 19:34:26 2008 @@ -1427,7 +1427,9 @@ msg.pointer_arg = switch_core_session_strdup(other_session, r_sdp); msg.pointer_arg_size = strlen(r_sdp); } - switch_core_session_receive_message(other_session, &msg); + if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { + nua_respond(tech_pvt->nh, 488, "Hangup in progress", TAG_END()); + } switch_core_session_rwunlock(other_session); } return; @@ -1768,10 +1770,13 @@ msg.from = __FILE__; msg.string_arg = (char *) r_sdp; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp); - switch_core_session_receive_message(other_session, &msg); + if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { + nua_respond(tech_pvt->nh, 488, "Hangup in progress", TAG_END()); + } switch_core_session_rwunlock(other_session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Re-INVITE to a no-media channel that is not in a bridge.\n"); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } goto done; } else { 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 Thu Mar 6 19:34:26 2008 @@ -777,7 +777,8 @@ } if (!(ip_ptr && port_ptr)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s SDP Error! [%s]\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n", + switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str); return; }