From 3c603465878eaae86386879362d2dd810a40db04 Mon Sep 17 00:00:00 2001 From: Pekka Pessi Date: Wed, 28 Sep 2005 22:45:41 +0300 Subject: [PATCH] Returning local and user SDP via tags. darcs-hash:20050928194541-65a35-7c6a9e57060763233dd80448109c0ddd003b266d.gz --- libsofia-sip-ua/soa/soa.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/libsofia-sip-ua/soa/soa.c b/libsofia-sip-ua/soa/soa.c index 49b24835..23e512be 100644 --- a/libsofia-sip-ua/soa/soa.c +++ b/libsofia-sip-ua/soa/soa.c @@ -473,8 +473,8 @@ int soa_base_get_params(soa_session_t const *ss, tagi_t *tags) SOATAG_CAPS_SDP(ss->ss_caps->ssd_sdp), SOATAG_CAPS_SDP_STR(ss->ss_caps->ssd_str), - SOATAG_USER_SDP(ss->ss_local->ssd_sdp), - SOATAG_USER_SDP_STR(ss->ss_local->ssd_str), + SOATAG_USER_SDP(ss->ss_user->ssd_sdp), + SOATAG_USER_SDP_STR(ss->ss_user->ssd_str), SOATAG_LOCAL_SDP(ss->ss_local->ssd_sdp), SOATAG_LOCAL_SDP_STR(ss->ss_local->ssd_str), @@ -527,12 +527,24 @@ tagi_t *soa_base_get_paramlist(soa_session_t const *ss, ta_start(ta, tag, value); params = tl_list( + TAG_IF(ss->ss_caps->ssd_sdp, + SOATAG_CAPS_SDP(ss->ss_caps->ssd_sdp)), + TAG_IF(ss->ss_caps->ssd_str, + SOATAG_CAPS_SDP_STR(ss->ss_caps->ssd_str)), - SOATAG_CAPS_SDP(ss->ss_caps->ssd_sdp), - SOATAG_CAPS_SDP_STR(ss->ss_caps->ssd_str), + TAG_IF(ss->ss_user->ssd_sdp, + SOATAG_USER_SDP(ss->ss_user->ssd_sdp)), + TAG_IF(ss->ss_user->ssd_str, + SOATAG_USER_SDP_STR(ss->ss_user->ssd_str)), + + TAG_IF(ss->ss_local->ssd_sdp, + SOATAG_LOCAL_SDP(ss->ss_local->ssd_sdp)), + TAG_IF(ss->ss_user->ssd_str, + SOATAG_LOCAL_SDP_STR(ss->ss_local->ssd_str)), SOATAG_AF(ss->ss_af), - SOATAG_ADDRESS(ss->ss_address), + TAG_IF(ss->ss_address, + SOATAG_ADDRESS(ss->ss_address)), SOATAG_SRTP_ENABLE(ss->ss_srtp_enable), SOATAG_SRTP_CONFIDENTIALITY(ss->ss_srtp_confidentiality), -- 2.21.0