* #7245: fixed crasher in destructor of audio_zrtp_session

daemon/src/audio/audiortp/audio_symmetric_rtp_session.h

@@ -87,12 +87,8 @@ class AudioSymmetricRtpSession : public ost::TimerPort, public ost::SymmetricRTP
         };
         SpeexEchoCancel echoCanceller;
 
-    protected:
-
+    private:
         AudioRtpThread *rtpThread_;
-
-    public:
-        friend class AudioRtpThread;
 };
 
 }

daemon/src/audio/audiortp/audio_zrtp_session.cpp

@@ -68,11 +68,17 @@ AudioZrtpSession::AudioZrtpSession(SIPCall * sipcall, const std::string& zidFile
 
 AudioZrtpSession::~AudioZrtpSession()
 {
+
+// tmatth:Oct 20 2011:FIXME:
+// This was crashing...seems like it's not necessary. Double check
+// with valgrind/helgrind
+#if 0
     try {
-        terminate();
+        ost::Thread::terminate();
     } catch (...) {
         throw;
     }
+#endif
 
     Manager::instance().getMainBuffer()->unBindAll(ca_->getCallId());
 }