Commit c0dfd893 authored by Guillaume Roguez's avatar Guillaume Roguez

Remove dead API in Call/SIPCall classes

Deadcode removal:
- waitForIce*
- isIceUsed
- localAddr_ related

Change-Id: I7360a6c2c14524de7f5ca783f60730fce9f5663f
parent 27d77de2
......@@ -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());
......
......@@ -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};
......
......@@ -136,8 +136,6 @@ SIPCall::getSIPAccount() const
void
SIPCall::setCallMediaLocal(const pj_sockaddr& localIP)
{
setLocalIp(localIP);
if (getLocalAudioPort() == 0
#ifdef RING_VIDEO
|| getLocalVideoPort() == 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment