mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-13 13:07:06 +00:00
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com> * test_htable2.c: define struct before using it in prototypes Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com> * Using # in SOATAG_HOLD to set media as inactive instead of sendonly Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com * soa_tag.c: documented SOATAG_HOLD() inactive mode Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com * su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com * Makefile.am: added tests to DIST_SUBDIRS Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com * nta.c: NetModule hack re-prioritizing SRV records Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>. The hack reprioritizes the SRV records used with transaction in case a server refuses connection or it does not answer. Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com * sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>. The hack reprioritizes the SRV records used with transaction in case a server refuses connection or it does not answer. New functions sres_cache_set_srv_priority() and sres_set_cached_srv_priority(). Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com * Makefile.am: fixed dist target Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com * tport_internal.h: grammar in doc Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com * su.h: IPv6 fix for Vista SDK Patch by Michael Jerris Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com * nua: fix sf.net bug #1867753 (avoid duplicating initial route set) Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com * sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority() Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com * sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8 Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com * sofia-sip/htable2.h: marked new features for release 1.12.8 Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com * su_alloc.c: marked new features for release 1.12.8. Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com * AUTHORS: updated Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com * RELEASE: added new features and bug fixes since 1.12.7 Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com * libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8 Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * autogen.sh: use automake 1.9 unless otherwise specified Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * soa_static.c: cleaned inactive hold, added tests Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * Makefile.am: added hide_emails.sh to dist Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * nua_stack.c: removed noisy debug message from nua_client_request_sendmsg() Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com * nua: Added NUA_ERROR_AT() macro Made internally generated 900 (and 904) response phrases unique as suggested by Jerry Richards. Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich * TLS debug cleanup Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com * tport: build fixes from Freeswitch Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com * su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable) Patch from Michael Jerris. Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com * sres.c: default log level to the same as SU_DEBUG define Patch by Michael Jerris Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com * stun.c: default log level to the same as SU_DEBUG define Patch by Michael Jerris Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich * TLS debug cleanup, 2/2. Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks MikeJ). This one converts all ERR_print_errors() calls Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com * nua: removed asserts() on hairy dialog/request handling cases Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com * soa.c: using session state in soa_set_activity() The media mode bits are set using (local) session description instead of remote offer/answer when O/A has been completed. Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com * soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer The wanted media state is based on original user SDP and SOATAG_HOLD() content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter instead. Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com * nua_subnotref.c: fixed REFER re-try case REFER trashed its dialog when it got retried if there was no other dialog usages. Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com * nua_stack.c: return specific error phrases from nua_client_init_request() As suggested by Jerry Richards. Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com * sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057. Changes handling of 423 in case of SUBSCRIBE. Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com * conformance.docs: added RFC 5057 (sipping-dialogusage) Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com * test_auth_digest.c: testing empty realm Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com * test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com * nta.c: fixed memory corruption in case sending ACK failed Thanks for Fabio Margarido for reporting this problem. Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com * nua/test_refer.c: run test_challenge_refer() only if we use proxy Test case is now more deterministic, too. Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com * docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057. Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com * sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority(). Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com * nta.c: added NTATAG_GRAYLIST(). Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority(). Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com * RELEASE: updated. Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com * RELEASE: updated. Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com * sip_extra.c, sip_parser.c: updated documentation Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com * test_nta.c: fixed receiving with sink socket Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * soa_static.c: fixed signedness error Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * win32 project files: fixed slash direction Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * torture_su.c: set blocking on Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com> * test_tport.c: using blocking sockets in test_incomplete() Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com * nta.c: now using RFC3261-compliant dialog-matching Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com * nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com * nta.c: asserting in proper place when handling queue tail Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com * torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com * nua: terminate dialog when redirected and re-establish it with new request Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com * test_100rel.c: added test for redirect after 100rel response. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed
1 parent
c7b311fdcd
commit
da29143b60
75 files changed
+1976
-727
No files matched your search
@@ -70,10 +70,6 @@ static char const __func__[] = "soa";
|
||||
/* ======================================================================== */
|
||||
|
||||
/* Internal prototypes */
|
||||
void soa_set_activity(soa_session_t *ss,
|
||||
sdp_media_t const *,
|
||||
int remote);
|
||||
|
||||
su_inline int soa_media_is_ready(soa_session_t const *ss);
|
||||
|
||||
enum soa_sdp_kind {
|
||||
@@ -1171,7 +1167,7 @@ int soa_base_set_remote_sdp(soa_session_t *ss,
|
||||
if (!new_version)
|
||||
return 0;
|
||||
|
||||
soa_set_activity(ss, sdp->sdp_media, 1);
|
||||
soa_set_activity(ss, sdp->sdp_media, soa_activity_remote);
|
||||
|
||||
ss->ss_remote_version++;
|
||||
|
||||
@@ -1454,7 +1450,7 @@ int soa_base_generate_offer(soa_session_t *ss,
|
||||
if (!sdp)
|
||||
return -1;
|
||||
|
||||
soa_set_activity(ss, sdp->sdp_media, 0);
|
||||
soa_set_activity(ss, sdp->sdp_media, soa_activity_local); /* Wanted activity */
|
||||
|
||||
ss->ss_offer_sent = 1;
|
||||
ss->ss_answer_recv = 0;
|
||||
@@ -1542,8 +1538,7 @@ int soa_base_generate_answer(soa_session_t *ss,
|
||||
su_free(ss->ss_home, ss->ss_rsession);
|
||||
ss->ss_rsession = rsession;
|
||||
|
||||
soa_set_activity(ss, l_sdp->sdp_media, 0);
|
||||
soa_set_activity(ss, r_sdp->sdp_media, 1);
|
||||
soa_set_activity(ss, l_sdp->sdp_media, soa_activity_session);
|
||||
|
||||
ss->ss_offer_recv = 1;
|
||||
ss->ss_answer_sent = 1;
|
||||
@@ -1624,8 +1619,7 @@ int soa_base_process_answer(soa_session_t *ss,
|
||||
su_free(ss->ss_home, ss->ss_rsession);
|
||||
ss->ss_rsession = rsession;
|
||||
|
||||
soa_set_activity(ss, l_sdp->sdp_media, 0);
|
||||
soa_set_activity(ss, r_sdp->sdp_media, 1);
|
||||
soa_set_activity(ss, l_sdp->sdp_media, soa_activity_session);
|
||||
|
||||
ss->ss_answer_recv = 1;
|
||||
ss->ss_complete = 1;
|
||||
@@ -1692,7 +1686,7 @@ int soa_base_process_reject(soa_session_t *ss,
|
||||
if (!l_sdp)
|
||||
return -1;
|
||||
|
||||
soa_set_activity(ss, l_sdp->sdp_media, 0);
|
||||
soa_set_activity(ss, l_sdp->sdp_media, soa_activity_session);
|
||||
|
||||
ss->ss_offer_sent = 0;
|
||||
|
||||
@@ -1783,8 +1777,7 @@ void soa_base_terminate(soa_session_t *ss, char const *option)
|
||||
ss->ss_oa_rounds = 0;
|
||||
|
||||
soa_description_free(ss, ss->ss_remote);
|
||||
soa_set_activity(ss, NULL, 0);
|
||||
soa_set_activity(ss, NULL, 1);
|
||||
soa_set_activity(ss, NULL, soa_activity_session);
|
||||
}
|
||||
|
||||
/** Return true if the SDP Offer/Answer negotation is complete.
|
||||
@@ -1889,56 +1882,75 @@ int soa_media_is_ready(soa_session_t const *ss)
|
||||
|
||||
void soa_set_activity(soa_session_t *ss,
|
||||
sdp_media_t const *m,
|
||||
int remote)
|
||||
enum soa_activity activity)
|
||||
{
|
||||
struct soa_media_activity *ma;
|
||||
sdp_connection_t const *c;
|
||||
int mode;
|
||||
int ma_audio = SOA_ACTIVE_DISABLED;
|
||||
int ma_video = SOA_ACTIVE_DISABLED;
|
||||
int ma_chat = SOA_ACTIVE_DISABLED;
|
||||
int ma_image = SOA_ACTIVE_DISABLED;
|
||||
int *p;
|
||||
int mode, swap;
|
||||
int l_audio = SOA_ACTIVE_DISABLED, r_audio = SOA_ACTIVE_DISABLED;
|
||||
int l_video = SOA_ACTIVE_DISABLED, r_video = SOA_ACTIVE_DISABLED;
|
||||
int l_chat = SOA_ACTIVE_DISABLED, r_chat = SOA_ACTIVE_DISABLED;
|
||||
int l_image = SOA_ACTIVE_DISABLED, r_image = SOA_ACTIVE_DISABLED;
|
||||
|
||||
remote = !!remote;
|
||||
|
||||
ma = remote ? ss->ss_remote_activity : ss->ss_local_activity;
|
||||
int *l, *r;
|
||||
|
||||
for (; m; m = m->m_next) {
|
||||
if (m->m_type == sdp_media_audio)
|
||||
p = &ma_audio;
|
||||
l = &l_audio, r = &r_audio;
|
||||
else if (m->m_type == sdp_media_video)
|
||||
p = &ma_video;
|
||||
l = &l_video, r = &r_video;
|
||||
else if (m->m_type == sdp_media_image)
|
||||
p = &ma_image;
|
||||
l = &l_image, r = &r_image;
|
||||
else if (strcasecmp(m->m_type_name, "message") == 0)
|
||||
p = &ma_chat;
|
||||
l = &l_chat, r = &r_chat;
|
||||
else
|
||||
continue;
|
||||
|
||||
if (m->m_rejected) {
|
||||
if (*p < 0)
|
||||
*p = SOA_ACTIVE_REJECTED;
|
||||
if (*l < 0) *l = SOA_ACTIVE_REJECTED;
|
||||
if (*r < 0) *r = SOA_ACTIVE_REJECTED;
|
||||
continue;
|
||||
}
|
||||
|
||||
mode = m->m_mode;
|
||||
mode = m->m_mode, swap = ((mode << 1) & 2) | ((mode >> 1) & 1);
|
||||
|
||||
c = sdp_media_connections((sdp_media_t *)m);
|
||||
|
||||
if (remote != (c && c->c_mcast))
|
||||
mode = ((mode << 1) & 2) | ((mode >> 1) & 1);
|
||||
|
||||
if (*p < 0)
|
||||
*p = mode;
|
||||
else
|
||||
*p |= mode;
|
||||
switch (activity) {
|
||||
case soa_activity_local:
|
||||
*l &= SOA_ACTIVE_SENDRECV;
|
||||
*l |= c && c->c_mcast ? swap : mode;
|
||||
break;
|
||||
case soa_activity_remote:
|
||||
*r &= SOA_ACTIVE_SENDRECV;
|
||||
*r = c && c->c_mcast ? mode : swap;
|
||||
break;
|
||||
case soa_activity_session:
|
||||
*l &= SOA_ACTIVE_SENDRECV;
|
||||
*l |= c && c->c_mcast ? swap : mode;
|
||||
*r &= SOA_ACTIVE_SENDRECV;
|
||||
*r = c && c->c_mcast ? swap : mode;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ma->ma_audio = ma_audio;
|
||||
ma->ma_video = ma_video;
|
||||
ma->ma_image = ma_image;
|
||||
ma->ma_chat = ma_chat;
|
||||
if (activity == soa_activity_local ||
|
||||
activity == soa_activity_session) {
|
||||
ma = ss->ss_local_activity;
|
||||
ma->ma_audio = l_audio;
|
||||
ma->ma_video = l_video;
|
||||
ma->ma_image = l_image;
|
||||
ma->ma_chat = l_chat;
|
||||
}
|
||||
|
||||
if (activity == soa_activity_remote ||
|
||||
activity == soa_activity_session) {
|
||||
ma = ss->ss_remote_activity;
|
||||
ma->ma_audio = r_audio;
|
||||
ma->ma_video = r_video;
|
||||
ma->ma_image = r_image;
|
||||
ma->ma_chat = r_chat;
|
||||
}
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------------------------*/
|
||||
|
||||
Reference in new issue
Block a user