Author: mikej Date: Wed Feb 14 21:53:37 2007 New Revision: 4281 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Log: revert some useless differences from the official sofia-sip tree Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Wed Feb 14 21:53:37 2007 @@ -2043,20 +2043,8 @@ } assert(ss); -#if 1 assert(ss->ss_state != nua_callstate_calling); assert(ss->ss_state != nua_callstate_proceeding); -#else -// assert(ss->ss_state != nua_callstate_calling); -// assert(ss->ss_state != nua_callstate_proceeding); - if(ss->ss_state == nua_callstate_calling || ss->ss_state != nua_callstate_proceeding) { - /* somthing is badly wrong here. Lets kill it gracefully for now */ - sr_status(sr, SIP_500_INTERNAL_SERVER_ERROR); - signal_call_state_change(nh, NULL, status, phrase, - nua_callstate_terminated); - return retval; - } -#endif /* Update session state */ if (status < 300 || application != 0) @@ -2214,7 +2202,7 @@ ss && (ss == nua_session_usage_get(nh->nh_ds))) { nua_stack_event(nh->nh_nua, nh, cancel, nua_i_cancel, SIP_200_OK, NULL); - SR_STATUS1(sr, SIP_487_REQUEST_TERMINATED); + SR_STATUS1(sr, SIP_487_REQUEST_TERMINATED); nua_server_respond(sr, NULL); nua_server_report(sr); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Wed Feb 14 21:53:37 2007 @@ -930,10 +930,8 @@ SU_DEBUG_9(("sres_query(%p, %p, %s, \"%s\") called\n", (void *)res, (void *)context, sres_record_type(type, b), domain)); - if (res == NULL || domain == NULL) { - su_seterrno(EFAULT); - return NULL; - } + if (res == NULL || domain == NULL) + return su_seterrno(EFAULT), (void *)NULL; dlen = strlen(domain); if (dlen > SRES_MAXDNAME || @@ -945,10 +943,8 @@ /* Reread resolv.conf if needed */ sres_resolver_update(res, 0); - if (res->res_n_servers == 0) { - su_seterrno(ENETDOWN); - return NULL; - } + if (res->res_n_servers == 0) + return (void)su_seterrno(ENETDOWN), (sres_query_t *)NULL; query = sres_query_alloc(res, callback, context, type, domain);