Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

sflphone-common/src/call.cpp

@@ -36,7 +36,6 @@ Call::Call (const CallID& id, Call::CallType type)
     : _callMutex()
     , _localIPAddress ("")
     , _localAudioPort (0)
-    , _localExternalAudioPort (0)
     , _id (id)
     , _confID ("")
     , _type (type)

sflphone-common/src/call.h

@@ -224,22 +224,6 @@ class Call: public Recordable
             _localAudioPort = port;
         }
 
-        /**
-         * Set the audio port that remote will see.
-         * @param port  The external audio port
-         */
-        void setLocalExternAudioPort (unsigned int port) {
-            _localExternalAudioPort = port;
-        }
-
-        /**
-         * Return the audio port seen by the remote side.
-         * @return unsigned int The external audio port
-         */
-        unsigned int getLocalExternAudioPort() const {
-            return _localExternalAudioPort;
-        }
-
         /**
          * Return my IP [mutex protected]
          * @return std::string The local IP
@@ -262,7 +246,7 @@ class Call: public Recordable
 
         virtual bool setRecording (void);
 
-    protected:
+    private:
         /** Protect every attribute that can be changed by two threads */
         ost::Mutex _callMutex;
 
@@ -274,12 +258,6 @@ class Call: public Recordable
         /** Local audio port, as seen by me. */
         unsigned int _localAudioPort;
 
-        /** Port assigned to my machine by the NAT, as seen by remote peer (he connects there) */
-        unsigned int _localExternalAudioPort;
-
-
-    private:
-
         /** Unique ID of the call */
         CallID _id;
 

sflphone-common/src/sip/sipvoiplink.cpp

@@ -4706,7 +4706,6 @@ bool setCallAudioLocal (SIPCall* call, std::string localIP)
         // Set local audio port for SIPCall(id)
         call->setLocalIp (localIP);
         call->setLocalAudioPort (callLocalAudioPort);
-        call->setLocalExternAudioPort (callLocalExternAudioPort);
 
         call->getLocalSDP()->setPortToAllMedia (callLocalExternAudioPort);