From 0c7a65e6443fab8cd7a7488fda8ca99b27392454 Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Tue, 11 Oct 2005 15:37:39 +0000
Subject: [PATCH] Change sflphone bin to sflphoned Set deleted pointers to 0
Try to check to the hangupall failure
---
configure.ac | 4 +--
sflphone.spec.in | 2 +-
src/Makefile.am | 10 +++---
src/audio/audiolayer.cpp | 1 +
src/audio/audiortp.cpp | 36 +++++++++------------
src/audio/dtmfgenerator.cpp | 1 +
src/audio/ringbuffer.cpp | 10 +++---
src/audio/ringbuffer.h | 2 +-
src/audio/tonegenerator.cpp | 4 +++
src/gui/guiframework.cpp | 10 ------
src/gui/guiframework.h | 3 +-
src/gui/server/guiserverimpl.cpp | 7 ----
src/gui/server/requestfactory.cpp | 12 +++++--
src/gui/server/requestfactory.h | 1 +
src/main.cpp | 15 +++++++--
src/managerimpl.cpp | 54 ++++++++++++++++++-------------
16 files changed, 93 insertions(+), 79 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2f4b1ef02f..31339b8ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl
dnl Solaris pkgadd support definitions
PKGADD_PKG="SFLPhone"
PKGADD_NAME="SFLPhone - a SIP client"
-PKGADD_VENDOR="http://www.sflphone.org"
+PKGADD_VENDOR="http://www.sflphone.org/"
AC_SUBST(PKGADD_PKG)
AC_SUBST(PKGADD_NAME)
AC_SUBST(PKGADD_VENDOR)
@@ -30,7 +30,7 @@ dnl AC_PATH_QT
dnl KDE_USE_QT(3.3)
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(sflphone, $VERSION)
+AM_INIT_AUTOMAKE(sflphoned, $VERSION)
AM_DISABLE_LIBRARIES
AC_PROG_LIBTOOL
AC_CHECK_COMPILERS
diff --git a/sflphone.spec.in b/sflphone.spec.in
index 8a85f06bbb..a397dc7d6a 100644
--- a/sflphone.spec.in
+++ b/sflphone.spec.in
@@ -32,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
-%{prefix}/bin/sflphone
+%{prefix}/bin/sflphoned
%dir %{prefix}/share/sflphone/ringtones
%{prefix}/share/sflphone/ringtones/*
diff --git a/src/Makefile.am b/src/Makefile.am
index cc53ed1b99..9438d91446 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = sflphone
+bin_PROGRAMS = sflphoned
if USE_ZEROCONF
ZEROCONFDIR = zeroconf
@@ -12,16 +12,16 @@ endif
SUBDIRS = audio config gui $(ZEROCONFDIR)
-sflphone_SOURCES = call.cpp eventthread.cpp error.cpp main.cpp sipvoiplink.cpp voIPLink.cpp \
+sflphoned_SOURCES = call.cpp eventthread.cpp error.cpp main.cpp sipvoiplink.cpp voIPLink.cpp \
sipcall.cpp managerimpl.cpp managerimpl.h manager.h global.h \
eventthread.h error.h \
sipvoiplink.h user_cfg.h call.h voIPLink.h sipcall.h \
observer.cpp
-sflphone_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(ZEROCONFFLAGS)
+sflphoned_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(ZEROCONFFLAGS)
-sflphone_LDFLAGS = -static
-sflphone_LDADD = gui/libguiframework.la audio/libaudio.la ../stund/libstun.la ../utilspp/libutilspp.la -lpthread $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) config/libconfig.la
+sflphoned_LDFLAGS = -static
+sflphoned_LDADD = gui/libguiframework.la audio/libaudio.la ../stund/libstun.la ../utilspp/libutilspp.la -lpthread $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) config/libconfig.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/audio/pacpp/include $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(portaudio_CFLAGS)
diff --git a/src/audio/audiolayer.cpp b/src/audio/audiolayer.cpp
index d6cf0f9cf2..6fb0cedae8 100644
--- a/src/audio/audiolayer.cpp
+++ b/src/audio/audiolayer.cpp
@@ -54,6 +54,7 @@ AudioLayer::closeStream (void)
if(_stream) {
_stream->close();
delete _stream;
+ _stream = 0;
}
}
diff --git a/src/audio/audiortp.cpp b/src/audio/audiortp.cpp
index d0928e80a6..36f8b357f1 100644
--- a/src/audio/audiortp.cpp
+++ b/src/audio/audiortp.cpp
@@ -49,6 +49,7 @@ AudioRtp::AudioRtp () {
AudioRtp::~AudioRtp (void) {
delete _RTXThread;
+ _RTXThread = NULL;
}
int
@@ -84,15 +85,10 @@ AudioRtp::closeRtpSession (SipCall *ca) {
ca->enable_audio = -1;
if (_RTXThread != NULL) {
- _debug("Thread: stop AudioRTP\n");
+ _debug("Thread: stop AudioRTP for sipcall: %d\n", ca->getId());
delete _RTXThread;
_RTXThread = NULL;
}
-
- // Stop portaudio and flush ringbuffer
- Manager::instance().getAudioDriver()->stopStream();
- Manager::instance().getAudioDriver()->mainSndRingBuffer().flush();
- _debug("AudioRtp::closeRtpSession : flushing stream\n");
}
}
@@ -121,17 +117,14 @@ AudioRtpRTX::AudioRtpRTX (SipCall *sipcall,
}
AudioRtpRTX::~AudioRtpRTX () {
- _debug("Thread: stop session\n");
+ _debug("Thread: AudioRtpRTX stop session\n");
if (!_sym) {
- delete _sessionRecv;
- _sessionRecv = NULL;
- delete _sessionSend;
- _sessionSend = NULL;
+ delete _sessionRecv; _sessionRecv = NULL;
+ delete _sessionSend; _sessionSend = NULL;
} else {
- delete _session;
- _session = NULL;
+ delete _session; _session = NULL;
}
- delete time;
+ delete time; time = NULL;
}
void
@@ -297,8 +290,11 @@ AudioRtpRTX::receiveSessionForSpkr (int16* data_for_speakers,
Manager::instance().getAudioDriver()->startStream();
delete ac;
+ ac = NULL;
delete cd;
+ cd = NULL;
delete adu;
+ adu = NULL;
}
void
@@ -366,15 +362,15 @@ AudioRtpRTX::run (void) {
TimerPort::incTimer(frameSize); // 'frameSize' ms
}
- delete[] data_for_speakers_tmp;
- delete[] data_for_speakers;
- delete[] data_to_send;
- delete[] data_from_mic_tmp;
- delete[] data_from_mic;
+ delete [] data_for_speakers_tmp; data_for_speakers_tmp = 0;
+ delete [] data_for_speakers; data_for_speakers = 0;
+ delete [] data_to_send; data_to_send = 0;
+ delete [] data_from_mic_tmp; data_from_mic_tmp = 0;
+ delete [] data_from_mic; data_from_mic = 0;
+ audiolayer->stopStream();
audiolayer->mainSndRingBuffer().flush();
//audiolayer->urgentRingBuffer().flush();
- audiolayer->stopStream();
}
diff --git a/src/audio/dtmfgenerator.cpp b/src/audio/dtmfgenerator.cpp
index aaf2d68a40..84abbf717e 100644
--- a/src/audio/dtmfgenerator.cpp
+++ b/src/audio/dtmfgenerator.cpp
@@ -86,6 +86,7 @@ DTMFGenerator::DTMFGenerator(): ToneGenerator ()
DTMFGenerator::~DTMFGenerator() {
for(int i = 0; i < NUM_TONES; i++) {
delete[] samples[i];
+ samples[i] = NULL;
}
}
diff --git a/src/audio/ringbuffer.cpp b/src/audio/ringbuffer.cpp
index d5b9d9f5a5..138ae2f24c 100644
--- a/src/audio/ringbuffer.cpp
+++ b/src/audio/ringbuffer.cpp
@@ -36,16 +36,16 @@ RingBuffer::RingBuffer(int size) {
mBufferSize = (size > MIN_BUFFER_SIZE ? size : MIN_BUFFER_SIZE);
mStart = 0;
mEnd = 0;
- mBuffer = (samplePtr) malloc (mBufferSize);
- mBlank = (samplePtr) malloc (MIN_BUFFER_SIZE);
+ mBuffer = new unsigned char[mBufferSize];
+ mBlank = new unsigned char[MIN_BUFFER_SIZE];
bzero(mBlank, MIN_BUFFER_SIZE);
assert (mBuffer != NULL);
}
// Free memory on object deletion
RingBuffer::~RingBuffer() {
- free (mBuffer);
- free (mBlank);
+ delete[] mBlank; mBlank = 0;
+ delete[] mBuffer; mBuffer = 0;
}
void
@@ -69,7 +69,7 @@ RingBuffer::AvailForPut() const {
return (mBufferSize-4) - Len();
}
-int
+void
RingBuffer::PutZero(int toZero)
{
unsigned char p[toZero];
diff --git a/src/audio/ringbuffer.h b/src/audio/ringbuffer.h
index e811e69488..c18f82b08f 100644
--- a/src/audio/ringbuffer.h
+++ b/src/audio/ringbuffer.h
@@ -43,7 +43,7 @@ class RingBuffer {
//
int AvailForPut (void) const;
int Put (void*, int);
- int PutZero(int);
+ void PutZero(int);
//
// For the reader only:
diff --git a/src/audio/tonegenerator.cpp b/src/audio/tonegenerator.cpp
index 3f5b191e03..fc01b16d51 100644
--- a/src/audio/tonegenerator.cpp
+++ b/src/audio/tonegenerator.cpp
@@ -103,9 +103,13 @@ ToneGenerator::ToneGenerator () {
ToneGenerator::~ToneGenerator (void) {
delete tonethread;
+ tonethread = 0;
delete [] _dst;
+ _dst = 0;
delete [] _src;
+ _src = 0;
delete _ulaw;
+ _ulaw = 0;
}
/**
diff --git a/src/gui/guiframework.cpp b/src/gui/guiframework.cpp
index 19f122b96b..97e5af8ad6 100644
--- a/src/gui/guiframework.cpp
+++ b/src/gui/guiframework.cpp
@@ -29,16 +29,6 @@ GuiFramework::GuiFramework ()
GuiFramework::~GuiFramework (void) {}
-/**
- * This function is only to not redeclare it in old qt-gui code
- * Since isn't not virtual
- */
-int
-GuiFramework::incomingCall(short id, const std::string& accountId, const std::string& from)
-{
- return incomingCall(id);
-}
-
int
GuiFramework::outgoingCall (const string& to)
{
diff --git a/src/gui/guiframework.h b/src/gui/guiframework.h
index 2693a8b937..c4fc9f660d 100644
--- a/src/gui/guiframework.h
+++ b/src/gui/guiframework.h
@@ -33,8 +33,7 @@ public:
virtual ~GuiFramework (void);
/* Parent class to child class */
- virtual int incomingCall (short id) = 0;
- virtual int incomingCall (short id, const std::string& accountId, const std::string& from);
+ virtual int incomingCall (short id, const std::string& accountId, const std::string& from) = 0;
virtual void peerAnsweredCall (short id) = 0;
virtual int peerRingingCall (short id) = 0;
virtual int peerHungupCall (short id) = 0;
diff --git a/src/gui/server/guiserverimpl.cpp b/src/gui/server/guiserverimpl.cpp
index d84d011ab3..7fbad6455f 100644
--- a/src/gui/server/guiserverimpl.cpp
+++ b/src/gui/server/guiserverimpl.cpp
@@ -264,13 +264,6 @@ GUIServerImpl::version()
}
-int
-GUIServerImpl::incomingCall (short id)
-{
- _debug("ERROR: GUIServerImpl::incomingCall(%d) should not be call\n",id);
- return 0;
-}
-
int
GUIServerImpl::incomingCall (short id, const std::string& accountId, const std::string& from)
{
diff --git a/src/gui/server/requestfactory.cpp b/src/gui/server/requestfactory.cpp
index 4225bb82bf..1846dc704e 100644
--- a/src/gui/server/requestfactory.cpp
+++ b/src/gui/server/requestfactory.cpp
@@ -70,6 +70,16 @@ RequestFactory::create(
return pos->second->create(sequenceId, argList);
}
+RequestFactory::~RequestFactory()
+{
+ std::map< std::string, RequestCreatorBase * >::iterator iter = mRequests.begin();
+ while ( iter != mRequests.end() ) {
+ // delete RequestCreator< T >
+ delete iter->second;
+ iter++;
+ }
+}
+
template< typename T >
void
RequestFactory::registerRequest(const std::string &requestname)
@@ -113,6 +123,4 @@ RequestFactory::registerAll() {
registerRequest<RequestConfigSet> ("configset");
registerRequest<RequestConfigSave> ("configsave");
registerRequest<RequestList> ("list");
-
-
}
diff --git a/src/gui/server/requestfactory.h b/src/gui/server/requestfactory.h
index 39f74e024d..7021171c1f 100644
--- a/src/gui/server/requestfactory.h
+++ b/src/gui/server/requestfactory.h
@@ -54,6 +54,7 @@ public:
class RequestFactory
{
public:
+ ~RequestFactory();
Request *create(const std::string& requestLine);
Request *create(
const std::string& requestname,
diff --git a/src/main.cpp b/src/main.cpp
index 6733d4837b..718c2621ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,13 +22,24 @@
#include "gui/server/guiserver.h"
#include "gui/guiframework.h"
#include "manager.h"
+#include "cstring"
+#include "iostream"
int
main (int argc, char **argv) {
int exit_code = 0;
- GuiFramework *GUI;
- {
+ if (argc == 1 && strcmp(argv[0], "--help") == 0) {
+
+ std::cout << PROGNAME << " Deamon " << VERSION << ", by Savoir-Faire Linux 2004-2005" << std::endl << std::endl;
+ std::cout << "USAGE: sflphoned [--help]" << std::endl;
+ std::cout << "Parameters: " << std::endl;
+ std::cout << " --help for this message" << std::endl << std::endl;
+ std::cout << "See http://www.sflphone.org/ for more information" << std::endl;
+
+ } else {
+
+ GuiFramework *GUI;
bool initOK = false;
try {
Manager::instance().initConfigFile();
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 4088f131ac..14436a3fa0 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -99,36 +99,15 @@ ManagerImpl::ManagerImpl (void)
_codecMap = CodecDescriptorMap().getMap();
}
+// never call if we use only the singleton...
ManagerImpl::~ManagerImpl (void)
{
terminate();
- for(VoIPLinkVector::iterator pos = _voIPLinkVector.begin();
- pos != _voIPLinkVector.end();
- pos++) {
- delete *pos;
- }
-
- for(CallVector::iterator pos = _callVector.begin();
- pos != _callVector.end();
- pos++) {
- delete *pos;
- }
-
- unloadAudioCodec();
-
- delete _audiodriverPA;
- delete _tone;
- delete _error;
-
-#ifdef USE_ZEROCONF
- delete _DNSService;
-#endif
}
void
ManagerImpl::init (void)
{
- terminate();
initZeroconf();
initVolume();
@@ -188,6 +167,33 @@ void ManagerImpl::terminate()
}
_voIPLinkVector.clear();
+
+ for(VoIPLinkVector::iterator pos = _voIPLinkVector.begin();
+ pos != _voIPLinkVector.end();
+ pos++) {
+ delete *pos;
+ }
+
+ for(CallVector::iterator pos = _callVector.begin();
+ pos != _callVector.end();
+ pos++) {
+ delete *pos;
+ }
+
+ unloadAudioCodec();
+
+ delete _audiodriverPA;
+ _audiodriverPA = 0;
+ delete _tone;
+ _tone = 0;
+ delete _error;
+ _error = 0;
+
+#ifdef USE_ZEROCONF
+ delete _DNSService;
+ _DNSService = 0;
+#endif
+ _debug("ManagerImpl::terminate() was called");
}
void
@@ -696,9 +702,11 @@ ManagerImpl::playDtmf(char code)
_mutex.leaveMutex();
//setZonetone(false);
delete[] buf_ctrl_vol;
+ buf_ctrl_vol = 0;
returnValue = true;
}
delete[] _buf;
+ _buf = 0;
return returnValue;
}
@@ -1016,7 +1024,9 @@ ManagerImpl::notificationIncomingCall (void) {
getAudioDriver()->putUrgent(buf_ctrl_vol, SAMPLES_SIZE(FRAME_PER_BUFFER));
delete[] buf_ctrl_vol;
+ buf_ctrl_vol = 0;
delete[] buffer;
+ buffer = 0;
}
/**
--
GitLab