From cc75ae8c808193e29980009f2360e35fed105f74 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 23 Aug 2013 12:07:43 -0400
Subject: [PATCH] * #29034: SDP: update SDP struct on STUN update
---
daemon/src/sip/sdp.cpp | 26 ++++++++++++++++++++++++++
daemon/src/sip/sdp.h | 4 +---
daemon/src/sip/sipvoiplink.cpp | 3 ++-
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/daemon/src/sip/sdp.cpp b/daemon/src/sip/sdp.cpp
index 799b47c00b..4b028d91e1 100644
--- a/daemon/src/sip/sdp.cpp
+++ b/daemon/src/sip/sdp.cpp
@@ -337,6 +337,18 @@ void Sdp::addRTCPAttribute(pjmedia_sdp_media *med)
pjmedia_sdp_attr_add(&med->attr_count, med->attr, attr);
}
+void
+Sdp::setPublishedIP(const std::string &ip_addr)
+{
+ publishedIpAddr_ = ip_addr;
+ if (localSession_) {
+ localSession_->origin.addr = pj_str((char*) publishedIpAddr_.c_str());
+ localSession_->conn->addr = localSession_->origin.addr;
+ if (not pjmedia_sdp_validate(localSession_))
+ ERROR("Could not validate SDP");
+ }
+}
+
void
Sdp::updatePorts(const std::vector<pj_sockaddr_in> &sockets)
{
@@ -344,6 +356,20 @@ Sdp::updatePorts(const std::vector<pj_sockaddr_in> &sockets)
localAudioControlPort_ = pj_ntohs(sockets[1].sin_port);
localVideoDataPort_ = pj_ntohs(sockets[2].sin_port);
localVideoControlPort_ = pj_ntohs(sockets[3].sin_port);
+
+ if (localSession_) {
+ if (localSession_->media[0]) {
+ localSession_->media[0]->desc.port = localAudioDataPort_;
+ // update RTCP attribute
+ if (pjmedia_sdp_media_remove_all_attr(localSession_->media[0], "rtcp"))
+ addRTCPAttribute(localSession_->media[0]);
+ }
+ if (localSession_->media[1])
+ localSession_->media[1]->desc.port = localVideoDataPort_;
+
+ if (not pjmedia_sdp_validate(localSession_))
+ ERROR("Could not validate SDP");
+ }
}
diff --git a/daemon/src/sip/sdp.h b/daemon/src/sip/sdp.h
index a731c14d52..f6c74f03e5 100644
--- a/daemon/src/sip/sdp.h
+++ b/daemon/src/sip/sdp.h
@@ -153,9 +153,7 @@ class Sdp {
/*
* Write accessor. Set the local IP address that will be used in the sdp session
*/
- void setPublishedIP(const std::string &ip_addr) {
- publishedIpAddr_ = ip_addr;
- }
+ void setPublishedIP(const std::string &ip_addr);
/*
* Read accessor. Get the local IP address
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index c12b55f3df..a616b4e2eb 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -226,8 +226,9 @@ void updateSDPFromSTUN(SIPCall &call, SIPAccount &account, const SipTransport &t
stunPorts.resize(4);
account.setPublishedAddress(pj_inet_ntoa(stunPorts[0].sin_addr));
- call.getLocalSDP()->updatePorts(stunPorts);
+ // published IP MUST be updated first, since RTCP depends on it
call.getLocalSDP()->setPublishedIP(account.getPublishedAddress());
+ call.getLocalSDP()->updatePorts(stunPorts);
} catch (const std::runtime_error &e) {
ERROR("%s", e.what());
}
--
GitLab