Remove iterator corruption
Put sflphoned to libexec

configure.ac

@@ -148,6 +148,7 @@ sflphone.spec \
 sflphoned-fedora.spec \
 Makefile \
 src/Makefile \
+src/sflphone \
 src/audio/Makefile \
 src/audio/gsm/Makefile \
 src/audio/pacpp/Makefile \

src/Makefile.am

-bin_PROGRAMS = sflphoned
+libexec_PROGRAMS = sflphoned
+bin_SCRIPTS = sflphone
 
 if USE_ZEROCONF
 ZEROCONFDIR = zeroconf

src/global.h

@@ -44,10 +44,11 @@ typedef short int16;
 #define SFLPHONED_VERSION "0.5"
 #define SFLPHONED_VERSIONNUM 0x000500
 
-#define PROGNAME				"sflphoned"
-#define PROGDIR         "sflphone"
-#define RINGDIR					"ringtones"
-#define CODECDIR				"codecs"
+#define PROGNAME         "sflphoned"
+#define PROGNAME_GLOBAL  "sflphone"
+#define PROGDIR          "sflphone"
+#define RINGDIR          "ringtones"
+#define CODECDIR         "codecs"
 
 #define MONO					1
 #define CHANNELS				2

src/gui/server/request.h

@@ -71,8 +71,8 @@ public:
       iter = _argList.begin();
       if (iter != _argList.end() && iter->length() != 0) {
         _callId = *iter;
-        iter++;
         // last arg is the destination
+        iter++;
         if (iter != _argList.end()) {
           _destination = *iter;
           argsAreValid = true;

src/gui/server/requestconfig.cpp

@@ -95,7 +95,7 @@ RequestConfigGet::RequestConfigGet(const std::string &sequenceId, const TokenLis
   if (iter != _argList.end()) {
     _section = *iter;
     _argList.pop_front();
-    iter++;
+    iter = _argList.begin();
     if (iter != _argList.end()) {
       _name = *iter;
       _argList.pop_front();
@@ -128,11 +128,11 @@ RequestConfigSet::RequestConfigSet(const std::string &sequenceId, const TokenLis
   if (iter != _argList.end()) {
     _section = *iter;
     _argList.pop_front();
-    iter++;
+    iter = _argList.begin();
     if (iter != _argList.end()) {
       _name = *iter;
       _argList.pop_front();
-      iter++;
+      iter = _argList.begin();
       if (iter != _argList.end()) {
         _value = *iter;
         _argList.pop_front();

src/managerimpl.cpp

@@ -816,6 +816,46 @@ ManagerImpl::peerHungupCall (CALLID id)
   return 1;
 }
 
+/**
+ * Multi Thread
+ */
+void
+ManagerImpl::callBusy(CALLID id) {
+  _debug("%10d: Call is busy\n", id);
+  playATone(Tone::TONE_BUSY);
+  ost::MutexLock m(_mutex);
+  Call* call = getCall(id);
+  if (call != 0) {
+    call->setState(Call::Busy);
+  }
+  deleteCall(id);
+  call->setState(Call::Hungup);
+
+  removeCallFromCurrent(id);
+}
+
+/**
+ * Multi Thread
+ */
+void
+ManagerImpl::callFailure(CALLID id) {
+  _debug("%10d: Call failed\n", id);
+  playATone(Tone::TONE_BUSY);
+  _mutex.enterMutex();
+  Call* call = getCall(id);
+  if (call != 0) {
+    call->setState(Call::Error);
+  }
+  _mutex.leaveMutex();
+  if (_gui) {
+    _gui->callFailure(id);
+  }
+  deleteCall(id);
+  call->setState(Call::Hungup);
+
+  removeCallFromCurrent(id);
+}
+
 /**
  * SipEvent Thread
  * for outgoing call, send by SipEvent
@@ -996,38 +1036,6 @@ ManagerImpl::ringtone()
   }
 }
 
-/**
- * Multi Thread
- */
-void
-ManagerImpl::callBusy(CALLID id) {
-  _debug("%10d: Call is busy\n", id);
-  playATone(Tone::TONE_BUSY);
-  ost::MutexLock m(_mutex);
-  Call* call = getCall(id);
-  if (call != 0) {
-    call->setState(Call::Busy);
-  }
-}
-
-/**
- * Multi Thread
- */
-void
-ManagerImpl::callFailure(CALLID id) {
-  _debug("%10d: Call failed\n", id);
-  playATone(Tone::TONE_BUSY);
-  _mutex.enterMutex();
-  Call* call = getCall(id);
-  if (call != 0) {
-    call->setState(Call::Error);
-  }
-  _mutex.leaveMutex();
-  if (_gui) {
-    _gui->callFailure(id);
-  }
-}
-
 AudioLoop*
 ManagerImpl::getTelephoneTone()
 {

src/sipvoiplink.cpp

@@ -97,7 +97,7 @@ SipVoIPLink::init(void)
    _debug("VoIP Link listen on port %d\n", DEFAULT_SIP_PORT);
   }
   // Set user agent
-  std::string tmp = std::string(PROGNAME) + "/" + std::string(SFLPHONED_VERSION);
+  std::string tmp = std::string(PROGNAME_GLOBAL) + "/" + std::string(SFLPHONED_VERSION);
   eXosip_set_user_agent(tmp.data());
 
   // If use STUN server, firewall address setup
@@ -806,6 +806,14 @@ SipVoIPLink::getEvent (void)
   case EXOSIP_CALL_RELEASED:
     if (event) {
       _debug("SIP call released: [cid = %d, did = %d]\n", event->cid, event->did);
+      id = findCallId(event);
+      if (id!=0) {
+        // not supposed to be execute on a current call...
+        _debug("send a call failure...");
+        Manager::instance().callFailure(id);
+        deleteSipCall(id);
+      }
+
     }
     //id = findCallId(event);
     //if (id!=0) {
@@ -843,10 +851,12 @@ SipVoIPLink::getEvent (void)
       //Manager::instance().displayError(event->response->reason_phrase);
       Manager::instance().displayErrorText(id, event->response->reason_phrase);
       Manager::instance().callFailure(id);
+      deleteSipCall(id);
     break;
     case BUSY_HERE:
       Manager::instance().displayErrorText(id, event->response->reason_phrase);
       Manager::instance().callBusy(id);
+      deleteSipCall(id);
       break;
     case REQ_TERMINATED:
       break;

utilspp/functor/Makefile.am

-pkginclude_HEADERS = \
-	Binder.hpp Binder.inl \
-	FunctorHandler.hpp \
-	Functor.hpp \
-	FunctorImpl.hpp \
-	Functor.inl \
-	MemFunHandler.hpp
+#pkginclude_HEADERS = \
+#	Binder.hpp Binder.inl \
+#	FunctorHandler.hpp \
+#	Functor.hpp \
+#	FunctorImpl.hpp \
+#	Functor.inl \
+#	MemFunHandler.hpp
 
-pkgincludedir=$(includedir)/utilspp/functor
+#pkgincludedir=$(includedir)/utilspp/functor

utilspp/singleton/Makefile.am

@@ -10,14 +10,14 @@ libsingleton_la_SOURCES = \
 	SingletonHolder.hpp SingletonHolder.inl 
 
 
-pkginclude_HEADERS = \
-	CreationStatic.hpp CreationStatic.inl \
-	CreationUsingNew.hpp CreationUsingNew.inl \
-	LifetimeDefault.hpp LifetimeDefault.inl \
-	LifetimeLibrary.hpp LifetimeLibrary.inl \
-	LifetimeWithLongevity.hpp LifetimeWithLongevity.inl \
-	PrivateMembers.hpp PrivateMembers.inl \
-	SingletonHolder.hpp SingletonHolder.inl 
+#pkginclude_HEADERS = \
+#	CreationStatic.hpp CreationStatic.inl \
+#	CreationUsingNew.hpp CreationUsingNew.inl \
+#	LifetimeDefault.hpp LifetimeDefault.inl \
+#	LifetimeLibrary.hpp LifetimeLibrary.inl \
+#	LifetimeWithLongevity.hpp LifetimeWithLongevity.inl \
+#	PrivateMembers.hpp PrivateMembers.inl \
+#	SingletonHolder.hpp SingletonHolder.inl 
 
-pkgincludedir=$(includedir)/utilspp/singleton
+#pkgincludedir=$(includedir)/utilspp/singleton