From: Michael Jerris <mike@jerris.com>
Date: Thu, 4 Jun 2009 21:11:29 +0000 (+0000)
Subject: use addres, id, and version from user sdp if they exist
X-Git-Tag: v1.0.4~621
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f1333697181d15a54c730ac5b5ba2376b803c1a;p=thirdparty%2Ffreeswitch.git

use addres, id, and version from user sdp if they exist

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13621 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 6915fe71c6..0e6219555a 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Mon Jun  1 17:51:14 CDT 2009
+Thu Jun  4 16:10:50 CDT 2009
diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
index d1e734ae0a..d7e9da1ff8 100644
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@@ -1291,6 +1291,17 @@ static int offer_answer_step(soa_session_t *ss,
     if (user->sdp_origin)
       o->o_username = user->sdp_origin->o_username;
 
+	if (user->sdp_origin->o_address)
+	  o->o_address = user->sdp_origin->o_address;
+
+    if (user->sdp_origin->o_id)
+		o->o_id = user->sdp_origin->o_id;
+
+	if (user->sdp_origin->o_version && user->sdp_origin->o_version != o->o_version) {
+		o->o_version = user->sdp_origin->o_version;
+		o->o_version--;
+	}
+
     if (soa_init_sdp_origin_with_session(ss, o, c0_buffer, local) < 0) {
       phrase = "Cannot Get IP Address for Session Description";
       goto internal_error;