From c0dfd89372d824c673e4d0c6e20908ece0cffc8b Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 16 Mar 2017 23:10:37 -0400
Subject: [PATCH] Remove dead API in Call/SIPCall classes
Deadcode removal:
- waitForIce*
- isIceUsed
- localAddr_ related
Change-Id: I7360a6c2c14524de7f5ca783f60730fce9f5663f
---
src/call.cpp | 26 --------------------------
src/call.h | 22 ----------------------
src/sip/sipcall.cpp | 2 --
3 files changed, 50 deletions(-)
diff --git a/src/call.cpp b/src/call.cpp
index bfb98328f5..020b997435 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -248,13 +248,6 @@ Call::getStateStr() const
}
}
-IpAddr
-Call::getLocalIp() const
-{
- std::lock_guard<std::recursive_mutex> lock(callMutex_);
- return localAddr_;
-}
-
unsigned int
Call::getLocalAudioPort() const
{
@@ -328,24 +321,6 @@ Call::initIceTransport(bool master, unsigned channel_num)
return static_cast<bool>(iceTransport_);
}
-int
-Call::waitForIceInitialization(unsigned timeout)
-{
- return iceTransport_->waitForInitialization(timeout);
-}
-
-int
-Call::waitForIceNegotiation(unsigned timeout)
-{
- return iceTransport_->waitForNegotiation(timeout);
-}
-
-bool
-Call::isIceUsed() const
-{
- return iceTransport_ and iceTransport_->isInitialized();
-}
-
bool
Call::isIceRunning() const
{
@@ -468,7 +443,6 @@ Call::merge(const std::shared_ptr<Call>& scall)
if (peerNumber_.empty())
peerNumber_ = std::move(call.peerNumber_);
peerDisplayName_ = std::move(call.peerDisplayName_);
- localAddr_ = call.localAddr_;
localAudioPort_ = call.localAudioPort_;
localVideoPort_ = call.localVideoPort_;
setState(call.getState());
diff --git a/src/call.h b/src/call.h
index fa8ad56969..421f9c5353 100644
--- a/src/call.h
+++ b/src/call.h
@@ -192,14 +192,6 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> {
isIPToIP_ = IPToIP;
}
- /**
- * Set my IP [not protected]
- * @param ip The local IP address
- */
- void setLocalIp(const IpAddr& ip) {
- localAddr_ = ip;
- }
-
/**
* Set local audio port, as seen by me [not protected]
* @param port The local audio port
@@ -216,12 +208,6 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> {
localVideoPort_ = port;
}
- /**
- * Return my IP [mutex protected]
- * @return std::string The local IP
- */
- IpAddr getLocalIp() const;
-
/**
* Return port used locally (for my machine) [mutex protected]
* @return unsigned int The local audio port
@@ -316,11 +302,6 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> {
virtual bool initIceTransport(bool master, unsigned channel_num=4);
- int waitForIceInitialization(unsigned timeout);
-
- int waitForIceNegotiation(unsigned timeout);
-
- bool isIceUsed() const;
bool isIceRunning() const;
std::unique_ptr<IceSocket> newIceSocket(unsigned compId);
@@ -380,9 +361,6 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> {
// Informations about call socket / audio
- /** My IP address */
- IpAddr localAddr_ {};
-
/** Local audio port, as seen by me. */
unsigned int localAudioPort_ {0};
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 14008b5657..f476af3ad3 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -136,8 +136,6 @@ SIPCall::getSIPAccount() const
void
SIPCall::setCallMediaLocal(const pj_sockaddr& localIP)
{
- setLocalIp(localIP);
-
if (getLocalAudioPort() == 0
#ifdef RING_VIDEO
|| getLocalVideoPort() == 0
--
GitLab